Merge branch 'master' into cxh_dev
# Conflicts: # func/Module_resp_quality_label.py # ui/MainWindow/MainWindow_resp_quality_label.py # ui/MainWindow/MainWindow_resp_quality_label.ui
This commit is contained in:
@ -1032,7 +1032,7 @@ class MainWindow_resp_quality_label(QMainWindow):
|
||||
return
|
||||
else:
|
||||
PublicFunc.text_output(self.ui, result.info, Constants.TIPS_TYPE_INFO)
|
||||
if self.sender == self.ui.pushButton_valid or self.sender == self.ui.pushButton_invalid:
|
||||
if self.sender() == self.ui.pushButton_valid or self.sender() == self.ui.pushButton_invalid:
|
||||
if self.ui.checkBox_auto_next:
|
||||
self.ui.pushButton_next.click()
|
||||
|
||||
|
||||
@ -544,11 +544,11 @@ class Ui_MainWindow_bcg_quality_label(object):
|
||||
self.pushButton_save.setText(QCoreApplication.translate("MainWindow_bcg_quality_label", u"\u624b\u52a8\u4fdd\u5b58", None))
|
||||
self.groupBox_4.setTitle(QCoreApplication.translate("MainWindow_bcg_quality_label", u"\u65e5\u5fd7", None))
|
||||
self.groupBox_right.setTitle(QCoreApplication.translate("MainWindow_bcg_quality_label", u"\u6807\u7b7e\u8bb0\u5f55", None))
|
||||
self.pushButton_b1.setText(QCoreApplication.translate("MainWindow_bcg_quality_label", u"b1", None))
|
||||
self.pushButton_b2.setText(QCoreApplication.translate("MainWindow_bcg_quality_label", u"b2", None))
|
||||
self.pushButton_b1.setText(QCoreApplication.translate("MainWindow_bcg_quality_label", u"b1(O)", None))
|
||||
self.pushButton_b2.setText(QCoreApplication.translate("MainWindow_bcg_quality_label", u"b2(P)", None))
|
||||
self.pushButton_f.setText(QCoreApplication.translate("MainWindow_bcg_quality_label", u"\u5220\u9664", None))
|
||||
self.pushButton_a2.setText(QCoreApplication.translate("MainWindow_bcg_quality_label", u"a2", None))
|
||||
self.pushButton_a1.setText(QCoreApplication.translate("MainWindow_bcg_quality_label", u"a1", None))
|
||||
self.pushButton_c.setText(QCoreApplication.translate("MainWindow_bcg_quality_label", u"c", None))
|
||||
self.pushButton_a2.setText(QCoreApplication.translate("MainWindow_bcg_quality_label", u"a2(I)", None))
|
||||
self.pushButton_a1.setText(QCoreApplication.translate("MainWindow_bcg_quality_label", u"a1(U)", None))
|
||||
self.pushButton_c.setText(QCoreApplication.translate("MainWindow_bcg_quality_label", u"c(J)", None))
|
||||
# retranslateUi
|
||||
|
||||
|
||||
@ -629,7 +629,7 @@
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>b1</string>
|
||||
<string>b1(O)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -682,7 +682,7 @@
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>b2</string>
|
||||
<string>b2(P)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -731,7 +731,7 @@
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>a2</string>
|
||||
<string>a2(I)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -775,7 +775,7 @@
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>a1</string>
|
||||
<string>a1(U)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -832,7 +832,7 @@
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>c</string>
|
||||
<string>c(J)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@ -330,6 +330,13 @@ class Ui_MainWindow_resp_quality_label(object):
|
||||
self.groupBox_label_operation.setObjectName(u"groupBox_label_operation")
|
||||
self.gridLayout_7 = QGridLayout(self.groupBox_label_operation)
|
||||
self.gridLayout_7.setObjectName(u"gridLayout_7")
|
||||
self.lineEdit_current_part_num = QLineEdit(self.groupBox_label_operation)
|
||||
self.lineEdit_current_part_num.setObjectName(u"lineEdit_current_part_num")
|
||||
self.lineEdit_current_part_num.setEnabled(False)
|
||||
self.lineEdit_current_part_num.setFont(font1)
|
||||
|
||||
self.gridLayout_7.addWidget(self.lineEdit_current_part_num, 1, 1, 1, 1)
|
||||
|
||||
self.label_8 = QLabel(self.groupBox_label_operation)
|
||||
self.label_8.setObjectName(u"label_8")
|
||||
sizePolicy1.setHeightForWidth(self.label_8.sizePolicy().hasHeightForWidth())
|
||||
@ -348,13 +355,6 @@ class Ui_MainWindow_resp_quality_label(object):
|
||||
|
||||
self.gridLayout_7.addWidget(self.label_10, 2, 0, 1, 1)
|
||||
|
||||
self.lineEdit_current_part_num = QLineEdit(self.groupBox_label_operation)
|
||||
self.lineEdit_current_part_num.setObjectName(u"lineEdit_current_part_num")
|
||||
self.lineEdit_current_part_num.setEnabled(False)
|
||||
self.lineEdit_current_part_num.setFont(font1)
|
||||
|
||||
self.gridLayout_7.addWidget(self.lineEdit_current_part_num, 1, 1, 1, 1)
|
||||
|
||||
self.lineEdit_current_part_label = QLineEdit(self.groupBox_label_operation)
|
||||
self.lineEdit_current_part_label.setObjectName(u"lineEdit_current_part_label")
|
||||
self.lineEdit_current_part_label.setEnabled(False)
|
||||
|
||||
@ -567,6 +567,18 @@
|
||||
<string>标注操作</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_7">
|
||||
<item row="1" column="1">
|
||||
<widget class="QLineEdit" name="lineEdit_current_part_num">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>12</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_8">
|
||||
<property name="sizePolicy">
|
||||
@ -609,18 +621,6 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QLineEdit" name="lineEdit_current_part_num">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>12</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QLineEdit" name="lineEdit_current_part_label">
|
||||
<property name="enabled">
|
||||
|
||||
Reference in New Issue
Block a user