Merge branch 'master' into cxh_dev
This commit is contained in:
@ -705,7 +705,7 @@ class MainWindow_bcg_quality_label(QMainWindow):
|
|||||||
else:
|
else:
|
||||||
info = result.info
|
info = result.info
|
||||||
PublicFunc.text_output(self.ui, info, Constants.TIPS_TYPE_INFO)
|
PublicFunc.text_output(self.ui, info, Constants.TIPS_TYPE_INFO)
|
||||||
if self.ui.checkBox_auto_next:
|
if self.ui.checkBox_auto_next.isChecked():
|
||||||
self.ui.pushButton_next.click()
|
self.ui.pushButton_next.click()
|
||||||
|
|
||||||
PublicFunc.finish_operation(self, ButtonState)
|
PublicFunc.finish_operation(self, ButtonState)
|
||||||
@ -910,11 +910,11 @@ class MainWindow_bcg_quality_label(QMainWindow):
|
|||||||
self.ui.pushButton_b2.hide()
|
self.ui.pushButton_b2.hide()
|
||||||
self.ui.pushButton_c.show()
|
self.ui.pushButton_c.show()
|
||||||
self.ui.pushButton_f.show()
|
self.ui.pushButton_f.show()
|
||||||
self.ui.pushButton_a1.setText("a")
|
self.ui.pushButton_a1.setText("a1(U)")
|
||||||
self.ui.pushButton_a2.setText("a2")
|
self.ui.pushButton_a2.setText("a2(I)")
|
||||||
self.ui.pushButton_b1.setText("b")
|
self.ui.pushButton_b1.setText("b1(O)")
|
||||||
self.ui.pushButton_b2.setText("b2")
|
self.ui.pushButton_b2.setText("b2(P)")
|
||||||
self.ui.pushButton_c.setText("c")
|
self.ui.pushButton_c.setText("c(J)")
|
||||||
self.ui.pushButton_f.setText("删除")
|
self.ui.pushButton_f.setText("删除")
|
||||||
self.ui.tableWidget_a1.show()
|
self.ui.tableWidget_a1.show()
|
||||||
self.ui.tableWidget_a2.hide()
|
self.ui.tableWidget_a2.hide()
|
||||||
@ -935,11 +935,11 @@ class MainWindow_bcg_quality_label(QMainWindow):
|
|||||||
self.ui.pushButton_b2.show()
|
self.ui.pushButton_b2.show()
|
||||||
self.ui.pushButton_c.show()
|
self.ui.pushButton_c.show()
|
||||||
self.ui.pushButton_f.show()
|
self.ui.pushButton_f.show()
|
||||||
self.ui.pushButton_a1.setText("a1")
|
self.ui.pushButton_a1.setText("a1(U)")
|
||||||
self.ui.pushButton_a2.setText("a2")
|
self.ui.pushButton_a2.setText("a2(I)")
|
||||||
self.ui.pushButton_b1.setText("b1")
|
self.ui.pushButton_b1.setText("b1(O)")
|
||||||
self.ui.pushButton_b2.setText("b2")
|
self.ui.pushButton_b2.setText("b2(P)")
|
||||||
self.ui.pushButton_c.setText("c")
|
self.ui.pushButton_c.setText("c(J)")
|
||||||
self.ui.pushButton_f.setText("删除")
|
self.ui.pushButton_f.setText("删除")
|
||||||
self.ui.tableWidget_a1.show()
|
self.ui.tableWidget_a1.show()
|
||||||
self.ui.tableWidget_a2.show()
|
self.ui.tableWidget_a2.show()
|
||||||
|
|||||||
@ -1033,7 +1033,7 @@ class MainWindow_resp_quality_label(QMainWindow):
|
|||||||
else:
|
else:
|
||||||
PublicFunc.text_output(self.ui, result.info, Constants.TIPS_TYPE_INFO)
|
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:
|
if self.ui.checkBox_auto_next.isChecked():
|
||||||
self.ui.pushButton_next.click()
|
self.ui.pushButton_next.click()
|
||||||
|
|
||||||
def __slot_lineEdit_filter__(self, filter_text):
|
def __slot_lineEdit_filter__(self, filter_text):
|
||||||
|
|||||||
@ -301,6 +301,7 @@ class Ui_MainWindow_bcg_quality_label(object):
|
|||||||
self.checkBox_auto_next = QCheckBox(self.groupBox_operation)
|
self.checkBox_auto_next = QCheckBox(self.groupBox_operation)
|
||||||
self.checkBox_auto_next.setObjectName(u"checkBox_auto_next")
|
self.checkBox_auto_next.setObjectName(u"checkBox_auto_next")
|
||||||
self.checkBox_auto_next.setFont(font1)
|
self.checkBox_auto_next.setFont(font1)
|
||||||
|
self.checkBox_auto_next.setChecked(True)
|
||||||
|
|
||||||
self.gridLayout_7.addWidget(self.checkBox_auto_next, 1, 1, 1, 1)
|
self.gridLayout_7.addWidget(self.checkBox_auto_next, 1, 1, 1, 1)
|
||||||
|
|
||||||
|
|||||||
@ -527,6 +527,9 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string>自动下一页</string>
|
<string>自动下一页</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
|
|||||||
@ -416,6 +416,7 @@ class Ui_MainWindow_resp_quality_label(object):
|
|||||||
self.checkBox_auto_next = QCheckBox(self.groupBox_label_operation)
|
self.checkBox_auto_next = QCheckBox(self.groupBox_label_operation)
|
||||||
self.checkBox_auto_next.setObjectName(u"checkBox_auto_next")
|
self.checkBox_auto_next.setObjectName(u"checkBox_auto_next")
|
||||||
self.checkBox_auto_next.setFont(font1)
|
self.checkBox_auto_next.setFont(font1)
|
||||||
|
self.checkBox_auto_next.setChecked(True)
|
||||||
|
|
||||||
self.gridLayout_7.addWidget(self.checkBox_auto_next, 0, 0, 1, 1)
|
self.gridLayout_7.addWidget(self.checkBox_auto_next, 0, 0, 1, 1)
|
||||||
|
|
||||||
|
|||||||
@ -749,6 +749,9 @@
|
|||||||
<property name="text">
|
<property name="text">
|
||||||
<string>自动下一段</string>
|
<string>自动下一段</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="checked">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
|
|||||||
Reference in New Issue
Block a user