diff --git a/CU/Feeding.py b/CU/Feeding.py index dc0f507..02c2e30 100644 --- a/CU/Feeding.py +++ b/CU/Feeding.py @@ -128,19 +128,19 @@ class FeedLine: if self.feeding_to_end[i].status == FeedStatus.FTake.value: return self.feeding_to_end[i] - def set_take_position(self,position:Real_Position): + def set_take_position(self,position:Real_Position,dynamic_height=0): for i in range(len(self.feeding_to_end)): if self.feeding_to_end[i].status == FeedStatus.FTake.value: if position != None: befor_take_position = Real_Position().init_position(position.X, position.Y, - position.Z, + position.Z+dynamic_height, position.U, position.V, position.W) after_take_position = Real_Position().init_position(position.X, position.Y, - position.Z, + position.Z+dynamic_height, position.U, position.V, position.W) @@ -351,7 +351,7 @@ class Feeding(QObject): if self.detect.detect_position != None: self.log_signal.emit(logging.INFO, Constant.str_feed_takePhoto_success) - self.feedConfig.feedLine.set_take_position(self.detect.detect_position) + self.feedConfig.feedLine.set_take_position(self.detect.detect_position,dynamic_height=self.robotClient.dynamic_height) self.update_detect_image.emit(self.detect.detection_image) self.next_position() self.detect.detect_status = DetectStatus.DNone @@ -653,7 +653,7 @@ class Feeding(QObject): self.send_emergency_stop() return True def send_emergency_sound(self): - self.sendIOControl(Constant.IO_EmergencyPoint, 2) + self.sendIOControl(Constant.IO_EmergencyPoint, 1) def send_emergency_stop(self): self.sendIOControl(Constant.IO_EmergencyPoint, 0) diff --git a/MainWin.ui b/MainWin.ui index c70a879..2bd935a 100644 --- a/MainWin.ui +++ b/MainWin.ui @@ -5177,7 +5177,7 @@ border: 1px solid #122041; QFrame::Shadow::Raised - + 0 @@ -5655,7 +5655,7 @@ background-color: #499c8a; QFrame::Shadow::Raised - + diff --git a/ui_MainWin.py b/ui_MainWin.py index 47c4e29..83c7d6b 100644 --- a/ui_MainWin.py +++ b/ui_MainWin.py @@ -3682,10 +3682,10 @@ class Ui_MainWindow(object): self.gridLayout_2.addWidget(self.pushButton_onekeyfeed, 0, 0, 1, 2) - self.gridLayout_2.setRowStretch(0, 1) - self.gridLayout_2.setRowStretch(1, 1) - self.gridLayout_2.setRowStretch(2, 1) - self.gridLayout_2.setRowStretch(3, 1) + self.gridLayout_2.setRowStretch(0, 2) + self.gridLayout_2.setRowStretch(1, 2) + self.gridLayout_2.setRowStretch(2, 2) + self.gridLayout_2.setRowStretch(3, 2) self.gridLayout_2.setColumnStretch(0, 1) self.gridLayout_2.setColumnStretch(1, 1) self.gridLayout_2.setRowMinimumHeight(0, 2) @@ -3832,8 +3832,8 @@ class Ui_MainWindow(object): self.verticalLayout_10.setStretch(0, 1) self.verticalLayout_10.setStretch(1, 6) - self.verticalLayout_10.setStretch(2, 4) - self.verticalLayout_10.setStretch(3, 4) + self.verticalLayout_10.setStretch(2, 6) + self.verticalLayout_10.setStretch(3, 1) self.horizontalLayout_4.addWidget(self.frame_right)