update 更新部署

main.py

@@ -617,6 +617,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         self.robotClient.feed_speed = feed_speed
         self.robotClient.reset_speed = reset_speed
         self.feeding = Feeding(self.robotClient, self.detection)  # 临时
+        self.feeding.need_origin_signal.connect(self.show_infomessage_box)
+        self.feeding.take_no_photo_sigal.emit(self.show_no_photo_message_box)
         self.last_time = time.time()
         self.remain_lineName = self.configReader.get('Robot_Feed', 'remain_lineName')
         self.remain_Count = int(self.configReader.get('Robot_Feed', 'remain_Count'))
@@ -870,7 +872,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         line_head = self.comboBox_lineIndex.currentData()
 
         self.command_quene.put(FeedCommand(FeedingConfig(num, FeedLine(self.feedLine_dict[line_head].id,self.feedLine_dict[line_head].name,self.feedLine_dict[line_head].positions), self.feeding.robotClient.photo_locs[:])))
-        self.stackedWidget_num.setCurrentIndex(1)
+        # self.stackedWidget_num.setCurrentIndex(1)
         self.set_run_status_button(True)
         self.feeding.pause = False
         log.log_message(logging.INFO, f'{self.feedLine_dict[line_head].name}:{Constant.str_feed_start}')
@@ -1157,8 +1159,16 @@ class MainWindow(QMainWindow, Ui_MainWindow):
     def send_reset_button_click(self):
         # TODO 清楚痕迹
         # TODO 开启自动
+        # 触发自动运行
+        if self.robotClient.status_model.curMode != 7:
+            self.send_switch_tool_command()
+            log.log_message(logging.INFO, Constant.str_sys_switch_tool)
+            self.send_start_tool_command()
+            log.log_message(logging.INFO, Constant.str_sys_start_tool)
+
 
         line_head = self.comboBox_lineIndex.currentData()
+        self.send_clear_auto_command()
         #safe_position = self.feedLine_dict[line_head].safe_position
         # self.send_position_command(safe_position.X, safe_position.Y, safe_position.Z, safe_position.U, safe_position.V, safe_position.W,move_type=MoveType.WORLD)
         if self.remain_lineName != '':
@@ -1272,10 +1282,11 @@ class MainWindow(QMainWindow, Ui_MainWindow):
                         position_origin.init_position(self.robotClient.origin_position)
                         position_origin.status = 1
                         command.feed_config.feedLine.feed_positions.insert(0,position_origin)
-                        self.feeding.feedConfig = command.feed_config
+
                         self.robotClient.send_emergency_sound()
                         time.sleep(5)
                         self.robotClient.send_emergency_stop()
+                        self.feeding.feedConfig = command.feed_config
                         self.feeding.feedStatus = FeedStatus.FStart
                         # self.feeding.feed_Mid_Status = FeedMidStatus.FMid_Start
                         command.status = Status.Runing
@@ -1283,7 +1294,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
 
             try:
                 self.feeding.run()
-                self.feeding.run_reseet()
+                self.feeding.run_reset()
             except:
                 print(Error_Code.SYS_NONEPoint)
 
@@ -1338,7 +1349,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
             self.updateUI_label_status()
             self.updateUI_frame_sign(self.feeding.feedStatus)
             self.updateUI_IOPanel()
-            self.updateUI_InfoMB()
+
 
 
     def updateRobotSeting(self):
@@ -1349,11 +1360,20 @@ class MainWindow(QMainWindow, Ui_MainWindow):
         self.lineEdit_origin_v.setText(str(self.robotClient.origin_position.V))
         self.lineEdit_origin_w.setText(str(self.robotClient.origin_position.W))
 
-    def updateUI_InfoMB(self):
-        if self.cton_take_no_photo.Q(self.feeding.take_no_photo,True):
-            self.show_infomessage_box("未识别到料袋报警，请重新放料后，点击继续")
-            self.send_pause_command(pause=1)
-            self.feeding.pause = True
+    def show_no_photo_message_box(self):
+        self.feeding.pause = True
+        self.send_pause_command(pause=1)
+        msg_box_person = QMessageBox()
+        msg_box_person.setIcon(QMessageBox.Icon.Warning)
+        msg_box_person.setText("未识别到料袋报警，请重新放料后，点击继续")
+        msg_box_person.setWindowTitle("提示")
+        msg_box_person.setStandardButtons(QMessageBox.StandardButton.Ok)
+        result = msg_box_person.exec()
+        if result == QMessageBox.StandardButton.Cancel:
+            return
+        # self.show_infomessage_box("")
+
+
 
     def updateUI_IOPanel(self):
         try: