Index: TD_OpMode/loader.py
===================================================================
diff -u -rb8705aa1e0402a49cc266c642facb833888116bd -r980818b4ab695268a45204f6b4a226a2b8ae8c24
--- TD_OpMode/loader.py (.../loader.py) (revision b8705aa1e0402a49cc266c642facb833888116bd)
+++ TD_OpMode/loader.py (.../loader.py) (revision 980818b4ab695268a45204f6b4a226a2b8ae8c24)
@@ -45,7 +45,7 @@
"""
self.tbReset.clicked.connect(self._init_widgets)
self.tbSend.clicked.connect(self.do_treatment_states)
- # self.tblOpMode.currentCellChanged.connect(self.do_treatment_states)
+ self.tblOpMode.currentCellChanged.connect(self.do_treatment_states)
# self.tblSubMode.currentCellChanged.connect(self.do_treatment_states)
@Slot()
Index: TD_Recirculate/interface.ui
===================================================================
diff -u -r6c34ddad466a250ba7a0d66091c372c37897a629 -r980818b4ab695268a45204f6b4a226a2b8ae8c24
--- TD_Recirculate/interface.ui (.../interface.ui) (revision 6c34ddad466a250ba7a0d66091c372c37897a629)
+++ TD_Recirculate/interface.ui (.../interface.ui) (revision 980818b4ab695268a45204f6b4a226a2b8ae8c24)
@@ -39,45 +39,44 @@
-
-
-
-
+
-
+
+
+ Req [0xA600]
+
+
+
+ -
+
- 200
+ 40
0
-
- 480
+
+ 0
-
- Qt::Horizontal
+
+ Qt::AlignCenter
- -
-
+
-
+
- Timeout
+ Send
- -
-
-
- color: rgb(238, 238, 236);
-background-color: #0E4C92;
-
-
+
-
+
- 168 : [0xA800] : Recirculation Data
+ Rejection Reason
-
- Qt::AlignCenter
-
- -
+
-
@@ -93,28 +92,7 @@
- -
-
-
- Reset
-
-
-
- -
-
-
- Send
-
-
-
- -
-
-
- Send
-
-
-
- -
+
-
QFrame::Box
@@ -130,14 +108,24 @@
- -
+
-
+
+
+ Qt::AlignCenter
+
+
+ 100
+
+
+
+ -
Reset
- -
+
-
color: rgb(238, 238, 236);
@@ -152,73 +140,46 @@
- -
-
-
-
- 40
- 0
-
-
+
-
+
- 0
+ Accepted
-
- Qt::AlignCenter
-
- -
-
+
-
+
- Countdown
+ Send
- -
-
-
- Req [0xA600]
+
-
+
+
+ color: rgb(238, 238, 236);
+background-color: #0E4C92;
+
-
-
- -
-
-
-
- 40
- 0
-
-
- 0
+ 168 : [0xA800] : Recirculation Data
Qt::AlignCenter
- -
-
+
-
+
- Rejection Reason
+ Reset
- -
-
-
- Qt::AlignCenter
-
-
- 100
-
-
-
- -
-
+
-
+
- Accepted
+ Countdown
Index: TD_Recirculate/loader.py
===================================================================
diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -r980818b4ab695268a45204f6b4a226a2b8ae8c24
--- TD_Recirculate/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09)
+++ TD_Recirculate/loader.py (.../loader.py) (revision 980818b4ab695268a45204f6b4a226a2b8ae8c24)
@@ -52,8 +52,6 @@
self.tbProgReset = self.find_widget(QtWidgets.QToolButton , 'tbProgReset' )
self.tbProgSend = self.find_widget(QtWidgets.QToolButton , 'tbProgSend' )
- self.slTimeout = self.find_widget(QtWidgets.QSlider , 'slTimeout' )
- self.lbTimeout = self.find_widget(QtWidgets.QLabel , 'lbTimeout' )
self.slCountdown = self.find_widget(QtWidgets.QSlider , 'slCountdown' )
self.lbCountdown = self.find_widget(QtWidgets.QLabel , 'lbCountdown' )
self.lbReqCommand = self.find_widget(QtWidgets.QLabel , 'lbReqCommand' )
@@ -71,8 +69,6 @@
self.tbProgReset .clicked.connect ( self.init_progress )
self.tbProgSend .clicked.connect ( self.do_recirculate_progress )
- self.slTimeout .valueChanged.connect ( self.do_recirculate_progress )
- self.slTimeout .valueChanged.connect ( lambda value: self.lbTimeout.setText(f"{value}") )
self.slCountdown .valueChanged.connect ( self.do_recirculate_progress )
self.slCountdown .valueChanged.connect ( lambda value: self.lbCountdown.setText(f"{value}") )
@@ -92,7 +88,6 @@
@Slot()
def init_progress(self):
- self.slTimeout .setValue ( 0 )
self.slCountdown .setValue ( 0 )
@@ -110,7 +105,6 @@
:return: none
"""
self.td_interface.td_recirculate_progress(
- self.slTimeout .value(),
self.slCountdown .value(),
)
Index: TD_Rinseback/interface.ui
===================================================================
diff -u -r6ce38e97779ae1fd01397438d8e8fd05e5232047 -r980818b4ab695268a45204f6b4a226a2b8ae8c24
--- TD_Rinseback/interface.ui (.../interface.ui) (revision 6ce38e97779ae1fd01397438d8e8fd05e5232047)
+++ TD_Rinseback/interface.ui (.../interface.ui) (revision 980818b4ab695268a45204f6b4a226a2b8ae8c24)
@@ -6,8 +6,8 @@
0
0
- 429
- 256
+ 415
+ 299
@@ -36,23 +36,8 @@
&3 Treatment/&A Rinseback
-
-
- 2
-
-
- 2
-
-
- 2
-
-
- 2
-
-
- 2
-
- -
+
+
-
QFrame::StyledPanel
@@ -352,12 +337,26 @@
+ -
+
+
+ Is Recirculation Allowed
+
+
+
+ -
+
+
+
+
+
+
- -
+
-
QFrame::StyledPanel
@@ -464,7 +463,7 @@
- -
+
-
Qt::Vertical
Index: TD_Rinseback/loader.py
===================================================================
diff -u -ra7779af44ced3be6e30e4d4d67125d171a641d09 -r980818b4ab695268a45204f6b4a226a2b8ae8c24
--- TD_Rinseback/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09)
+++ TD_Rinseback/loader.py (.../loader.py) (revision 980818b4ab695268a45204f6b4a226a2b8ae8c24)
@@ -68,6 +68,7 @@
self.slCountdown = self.find_widget(QtWidgets.QSlider , 'slCountdown' )
self.lbCountdown = self.find_widget(QtWidgets.QLabel , 'lbCountdown' )
self.cbCompleted = self.find_widget(QtWidgets.QCheckBox , 'cbCompleted' )
+ self.cbAllowed = self.find_widget(QtWidgets.QCheckBox , 'cbAllowed' )
self.lbReqCommand = self.find_widget(QtWidgets.QLabel , 'lbReqCommand' )
@@ -95,6 +96,7 @@
self.slCountdown .valueChanged.connect ( self.do_rinseback_progress )
self.slCountdown .valueChanged.connect ( lambda value: self.lbCountdown.setText(f"{value}") )
self.cbCompleted .stateChanged.connect ( self.do_rinseback_progress )
+ self.cbAllowed .stateChanged.connect ( self.do_rinseback_progress )
self.tbRspReset .clicked.connect ( self.init_rinseback_cmd_response )
self.tbRspSend .clicked.connect ( self.do_rinseback_cmd_response )
@@ -118,6 +120,7 @@
self.slTimeout .setValue ( 0 )
self.slCountdown .setValue ( 0 )
self.cbCompleted .setChecked ( False )
+ self.cbAllowed .setChecked ( True )
@Slot()
@@ -132,7 +135,8 @@
self.slFlowRate .value(),
self.slTimeout .value(),
self.slCountdown .value(),
- self.cbCompleted .isChecked()
+ self.cbCompleted .isChecked(),
+ self.cbAllowed .isChecked()
)