Index: TD_Recirculate/interface.ui =================================================================== diff -u -r6ce38e97779ae1fd01397438d8e8fd05e5232047 -r6c34ddad466a250ba7a0d66091c372c37897a629 --- TD_Recirculate/interface.ui (.../interface.ui) (revision 6ce38e97779ae1fd01397438d8e8fd05e5232047) +++ TD_Recirculate/interface.ui (.../interface.ui) (revision 6c34ddad466a250ba7a0d66091c372c37897a629) @@ -39,66 +39,71 @@ - - + + - 40 + 200 0 - - 0 + + 480 - - Qt::AlignCenter + + Qt::Horizontal - - + + - Rejection Reason + Timeout - - - - - 40 - 0 - + + + + color: rgb(238, 238, 236); +background-color: #0E4C92; + - 0 + 168 : [0xA800] : Recirculation Data Qt::AlignCenter - - - - Qt::AlignCenter + + + + + 200 + 0 + - 100 + 480 + + Qt::Horizontal + - - + + Reset - - + + - Timeout + Send @@ -109,17 +114,26 @@ - - + + + + QFrame::Box + + + QFrame::Sunken + - Req [0xA600] + -- + + Qt::AlignCenter + - - + + - Send + Reset @@ -138,11 +152,20 @@ - - + + + + + 40 + 0 + + - Reset + 0 + + Qt::AlignCenter + @@ -152,67 +175,51 @@ - - - - color: rgb(238, 238, 236); -background-color: #0E4C92; - - + + - 168 : [0xA800] : Recirculation Data + Req [0xA600] - - Qt::AlignCenter - - - + + - 200 + 40 0 - - 480 + + 0 - - Qt::Horizontal + + Qt::AlignCenter - - - - - 200 - 0 - + + + + Rejection Reason - - 480 - - - Qt::Horizontal - - - - - QFrame::Box + + + + Qt::AlignCenter - - QFrame::Sunken + + 100 + + + + - -- + Accepted - - Qt::AlignCenter - Index: TD_Recirculate/loader.py =================================================================== diff -u -r6ce38e97779ae1fd01397438d8e8fd05e5232047 -r6c34ddad466a250ba7a0d66091c372c37897a629 --- TD_Recirculate/loader.py (.../loader.py) (revision 6ce38e97779ae1fd01397438d8e8fd05e5232047) +++ TD_Recirculate/loader.py (.../loader.py) (revision 6c34ddad466a250ba7a0d66091c372c37897a629) @@ -60,6 +60,7 @@ self.tbRspReset = self.find_widget(QtWidgets.QToolButton , 'tbRspReset' ) self.tbRspSend = self.find_widget(QtWidgets.QToolButton , 'tbRspSend' ) self.sbRspRejectReason = self.find_widget(QtWidgets.QSpinBox , 'sbRspRejectReason' ) + self.cbAccepted = self.find_widget(QtWidgets.QCheckBox , 'cbAccepted' ) def _init_connections(self): @@ -98,6 +99,7 @@ @Slot() def init_cmd_response(self): self.lbReqCommand .setText ("-- --") + self.cbAccepted .setChecked ( True ) self.sbRspRejectReason .setValue (0) @@ -107,14 +109,12 @@ the slot for sending rinseback progress data :return: none """ - print("do_recirculate_progress") + self.td_interface.td_recirculate_progress( + self.slTimeout .value(), + self.slCountdown .value(), + ) - # self.td_interface.td_recirculate_progress( - # self.slTimeout .value(), - # self.slCountdown .value(), - # ) - @Slot() def handle_recirculate_cmd_request(self, message, timestamp = 0.0): """ @@ -130,5 +130,4 @@ @Slot() def do_recirculate_cmd_response(self): - print("do_recirculate_cmd_response") - # self.td_interface.td_recirculate_cmd_response(self.sbRspRejectReason.value()) + self.td_interface.td_recirculate_cmd_response(self.cbAccepted.isChecked(), self.sbRspRejectReason.value())