Index: TD_TreatmentAdjustmentsDuration/loader.py =================================================================== diff -u -r3a57fe707c4cba4a4f3e3b2d4d22e43e38b562d1 -r5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd --- TD_TreatmentAdjustmentsDuration/loader.py (.../loader.py) (revision 3a57fe707c4cba4a4f3e3b2d4d22e43e38b562d1) +++ TD_TreatmentAdjustmentsDuration/loader.py (.../loader.py) (revision 5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd) @@ -49,7 +49,6 @@ """ self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' ) - self.tbEditReqReset = self.find_widget(QtWidgets.QToolButton , 'tbEditReqReset' ) self.lbEditReqDuration = self.find_widget(QtWidgets.QLabel , 'lbEditReqDuration' ) self.tbEditRspSend = self.find_widget(QtWidgets.QToolButton , 'tbEditRspSend' ) self.tbEditRspCopy = self.find_widget(QtWidgets.QToolButton , 'tbEditRspCopy' ) @@ -62,18 +61,10 @@ self.slEditRspUfRate = self.find_widget(QtWidgets.QSlider , 'slEditRspUfRate' ) self.lbEditRspUfRate = self.find_widget(QtWidgets.QLabel , 'lbEditRspUfRate' ) - self.tbConfirmReqReset = self.find_widget(QtWidgets.QToolButton , 'tbConfirmReqReset' ) - self.lbConfirmReqDuration = self.find_widget(QtWidgets.QLabel , 'lbConfirmReqDuration' ) self.tbConfirmRspSend = self.find_widget(QtWidgets.QToolButton , 'tbConfirmRspSend' ) - self.tbConfirmRspCopy = self.find_widget(QtWidgets.QToolButton , 'tbConfirmRspCopy' ) self.tbConfirmRspReset = self.find_widget(QtWidgets.QToolButton , 'tbConfirmRspReset' ) + self.lbConfirmReqDuration = self.find_widget(QtWidgets.QLabel , 'lbConfirmReqDuration' ) self.sbConfirmRspRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbConfirmRspRejectionReason' ) - self.slConfirmRspDuration = self.find_widget(QtWidgets.QSlider , 'slConfirmRspDuration' ) - self.lbConfirmRspDuration = self.find_widget(QtWidgets.QLabel , 'lbConfirmRspDuration' ) - self.slConfirmRspUfVolumeGoal = self.find_widget(QtWidgets.QSlider , 'slConfirmRspUfVolumeGoal' ) - self.lbConfirmRspUfVolumeGoal = self.find_widget(QtWidgets.QLabel , 'lbConfirmRspUfVolumeGoal' ) - self.slConfirmRspUfRate = self.find_widget(QtWidgets.QSlider , 'slConfirmRspUfRate' ) - self.lbConfirmRspUfRate = self.find_widget(QtWidgets.QLabel , 'lbConfirmRspUfRate' ) def _init_connections(self): @@ -83,40 +74,27 @@ """ self.tbReset .clicked .connect(self._init_widgets ) - self.tbEditReqReset .clicked .connect(self.init_edit_request ) self.tbEditRspSend .clicked .connect(self.do_send_edit_response ) self.tbEditRspCopy .clicked .connect(self.do_copy_edit_response ) self.tbEditRspReset .clicked .connect(self.init_edit_response ) self.slEditRspDuration .valueChanged .connect(lambda value: self.lbEditRspDuration.setText(f"{value}") ) self.slEditRspUfVolumeGoal .valueChanged .connect(lambda value: self.lbEditRspUfVolumeGoal.setText(f"{value/1000:.2f}") ) self.slEditRspUfRate .valueChanged .connect(lambda value: self.lbEditRspUfRate.setText(f"{value/1000:.2f}") ) - self.tbConfirmReqReset .clicked .connect(self.init_confirm_request ) self.tbConfirmRspSend .clicked .connect(self.do_send_confirm_response ) - self.tbConfirmRspCopy .clicked .connect(self.do_copy_confirm_response ) self.tbConfirmRspReset .clicked .connect(self.init_confirm_response ) - self.slConfirmRspDuration .valueChanged .connect(lambda value: self.lbConfirmRspDuration.setText(f"{value}") ) - self.slConfirmRspUfVolumeGoal .valueChanged .connect(lambda value: self.lbConfirmRspUfVolumeGoal.setText(f"{value/1000:.2f}") ) - self.slConfirmRspUfRate .valueChanged .connect(lambda value: self.lbConfirmRspUfRate.setText(f"{value/1000:.2f}") ) def _init_widgets(self): """ initializes the widgets' properties :return: none """ - self.init_edit_request() self.init_edit_response() - self.init_confirm_request() self.init_confirm_response() @Slot() - def init_edit_request(self): - self.lbEditReqDuration.setText("--") - - - @Slot() def handle_duration_edit_request(self, message, timestamp = 0.0): """ Called when the user requests duration edit from UI @@ -130,8 +108,8 @@ @Slot() def init_edit_response(self): + self.lbEditReqDuration.setText("--") self.sbEditRspRejectionReason .setValue(0) - self.slEditRspDuration .setValue(0) self.lbEditRspDuration .setText("{0}".format(self.slEditRspDuration.value())) self.slEditRspUfVolumeGoal .setValue(0) @@ -165,11 +143,6 @@ @Slot() - def init_confirm_request(self): - self.lbConfirmReqDuration.setText("--") - - - @Slot() def handle_duration_confirm_request(self, message, timestamp = 0.0): """ Called when the user requests duration confirm from UI @@ -183,35 +156,20 @@ @Slot() def init_confirm_response(self): + self.lbConfirmReqDuration .setText("--") self.sbConfirmRspRejectionReason .setValue(0) - self.slConfirmRspDuration .setValue(0) - self.lbConfirmRspDuration .setText("{0}".format(self.slConfirmRspDuration.value())) - self.slConfirmRspUfVolumeGoal .setValue(0) - self.lbConfirmRspUfVolumeGoal .setText("{0:.2f}".format(self.slConfirmRspUfVolumeGoal.value() / 1000)) - self.slConfirmRspUfRate .setValue(0) - self.lbConfirmRspUfRate .setText("{0:.2f}".format(self.slConfirmRspUfRate.value() / 1000)) - @Slot() def do_send_confirm_response(self): """ the slot for sending duration confirm response :return: none """ - self.td_interface.td_duration_confirm_response( - self.sbConfirmRspRejectionReason .value(), - self.slConfirmRspDuration .value(), - self.slConfirmRspUfVolumeGoal .value(), - self.slConfirmRspUfRate .value() / 1000 + self.td_interface.cmd_send_general_response( + message_id = MsgIds.MSG_ID_TD_DURATION_CONFIRM_RESPONSE.value, + accepted = 1 if self.sbConfirmRspRejectionReason.value() == 0 else 0, + reason = self.sbConfirmRspRejectionReason.value(), + is_pure_data = False, + has_parameters = False, ) - - - @Slot() - def do_copy_confirm_response(self): - """ - the slot for copying duration confirm request data to confirm response - :return: none - """ - convert_to_int = lambda value : int(value) if value.isdigit() else 0 - self.slConfirmRspDuration.setValue(convert_to_int(self.lbConfirmReqDuration.text()))