diff --git a/MainWin.ui b/MainWin.ui index 9ec037f..2df570b 100644 --- a/MainWin.ui +++ b/MainWin.ui @@ -593,7 +593,7 @@ border-image: url(:/main/Image/backgroud_leftMenu_btn_child.jpg); - + 0 @@ -939,7 +939,7 @@ background-color: rgb(13, 17, 40); - 2 + 0 diff --git a/main.py b/main.py index 55228f8..d3ebf15 100644 --- a/main.py +++ b/main.py @@ -461,6 +461,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.pushButton_AddNum.clicked.connect(self.send_addNum_button_click) self.pushButton_SubNum.clicked.connect(self.send_subNum_button_click) + self.lineEdit_j1.returnPressed.connect(self.send_position_returnPressed) self.lineEdit_j2.returnPressed.connect(self.send_position_returnPressed) self.lineEdit_j3.returnPressed.connect(self.send_position_returnPressed) @@ -515,10 +516,12 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.pushButton_sysseting.clicked.connect(self.send_click_sysmeuExpand) self.pushButton_leftmenu_produce.clicked.connect(lambda _, index=0: self.send_click_change_stackView(index)) + self.pushButton_leftmenu_robot_seting.clicked.connect( + lambda _, index=2: self.send_click_change_stackView(index)) self.pushButton_leftmenu_IO.clicked.connect(lambda _, index=1: self.send_click_change_stackView(index)) - self.pushButton_leftmenu_position.clicked.connect(lambda _, index=2: self.send_click_change_stackView(index)) + self.pushButton_leftmenu_position.clicked.connect(lambda _, index=5: self.send_click_change_stackView(index)) self.pushButton_leftmenu_baseSeting.clicked.connect(lambda _, index=3: self.send_click_change_stackView(index)) - self.pushButton_leftmenu_posDebug.clicked.connect(lambda _, index=5: self.send_click_change_stackView(index)) + self.pushButton_leftmenu_posDebug.clicked.connect(lambda _, index=4: self.send_click_change_stackView(index)) self.pushButton_exit.clicked.connect(self.send_exit_button_click) @@ -915,6 +918,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): max_num = int(self.label_maxNum.text()) + 1 self.horizontalSlider_feedingNum.setMaximum(max_num) self.label_maxNum.setText(str(max_num)) + def send_subNum_button_click(self): if self.feeding.feedConfig.num <= 1: #self.send_stopFeed_button_click() diff --git a/ui_MainWin.py b/ui_MainWin.py index c7eb6c4..31c58bb 100644 --- a/ui_MainWin.py +++ b/ui_MainWin.py @@ -376,11 +376,11 @@ class Ui_MainWindow(object): self.verticalLayout_4.addWidget(self.pushButton_leftmenu_produce) - self.pushButton_leftmenu_produce_3 = QPushButton(self.frame_10) - self.pushButton_leftmenu_produce_3.setObjectName(u"pushButton_leftmenu_produce_3") - sizePolicy5.setHeightForWidth(self.pushButton_leftmenu_produce_3.sizePolicy().hasHeightForWidth()) - self.pushButton_leftmenu_produce_3.setSizePolicy(sizePolicy5) - self.pushButton_leftmenu_produce_3.setStyleSheet(u"\n" + self.pushButton_leftmenu_robot_seting = QPushButton(self.frame_10) + self.pushButton_leftmenu_robot_seting.setObjectName(u"pushButton_leftmenu_robot_seting") + sizePolicy5.setHeightForWidth(self.pushButton_leftmenu_robot_seting.sizePolicy().hasHeightForWidth()) + self.pushButton_leftmenu_robot_seting.setSizePolicy(sizePolicy5) + self.pushButton_leftmenu_robot_seting.setStyleSheet(u"\n" "\n" " QPushButton {\n" " \n" @@ -398,7 +398,7 @@ class Ui_MainWindow(object): "}\n" "") - self.verticalLayout_4.addWidget(self.pushButton_leftmenu_produce_3) + self.verticalLayout_4.addWidget(self.pushButton_leftmenu_robot_seting) self.pushButton_leftmenu_IO = QPushButton(self.frame_10) self.pushButton_leftmenu_IO.setObjectName(u"pushButton_leftmenu_IO") @@ -3769,7 +3769,7 @@ class Ui_MainWindow(object): self.retranslateUi(MainWindow) - self.stackedWidget_view.setCurrentIndex(2) + self.stackedWidget_view.setCurrentIndex(0) self.tabWidget.setCurrentIndex(0) self.stackedWidget_num.setCurrentIndex(0) @@ -3789,7 +3789,7 @@ class Ui_MainWindow(object): self.pushButton_exit.setText(QCoreApplication.translate("MainWindow", u"\u9000\u51fa", None)) self.pushButton_sysseting.setText(QCoreApplication.translate("MainWindow", u"\u7cfb\u7edf\u8bbe\u7f6e", None)) self.pushButton_leftmenu_produce.setText(QCoreApplication.translate("MainWindow", u"\u751f\u4ea7\u754c\u9762", None)) - self.pushButton_leftmenu_produce_3.setText(QCoreApplication.translate("MainWindow", u"\u673a\u68b0\u81c2\u57fa\u7840\u8bbe\u7f6e", None)) + self.pushButton_leftmenu_robot_seting.setText(QCoreApplication.translate("MainWindow", u"\u673a\u68b0\u81c2\u57fa\u7840\u8bbe\u7f6e", None)) self.pushButton_leftmenu_IO.setText(QCoreApplication.translate("MainWindow", u"IO\u9762\u677f", None)) self.pushButton_leftmenu_position.setText(QCoreApplication.translate("MainWindow", u"\u4f4d\u7f6e\u8bbe\u5b9a", None)) self.pushButton_leftmenu_baseSeting.setText(QCoreApplication.translate("MainWindow", u"\u57fa\u7840\u8bbe\u7f6e", None))