Index: TD_TreatmentAdjustmentsPressures/loader.py =================================================================== diff -u -r8f738af4e021a2ccd0f3f360489c3263a4c96631 -r5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd --- TD_TreatmentAdjustmentsPressures/loader.py (.../loader.py) (revision 8f738af4e021a2ccd0f3f360489c3263a4c96631) +++ TD_TreatmentAdjustmentsPressures/loader.py (.../loader.py) (revision 5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd) @@ -50,13 +50,8 @@ self.lbTmpWindowValue = self.find_widget(QtWidgets.QLabel , 'lbTmpWindowValue' ) self.tbRspSend = self.find_widget(QtWidgets.QToolButton , 'tbRspSend' ) - self.tbRspCopy = self.find_widget(QtWidgets.QToolButton , 'tbRspCopy' ) self.tbRspReset = self.find_widget(QtWidgets.QToolButton , 'tbRspReset' ) self.sbRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbRejectionReason' ) - self.sbArterialWindow = self.find_widget(QtWidgets.QSpinBox , 'sbArterialWindow' ) - self.sbVenousWindow = self.find_widget(QtWidgets.QSpinBox , 'sbVenousWindow' ) - self.sbVenousAsymmetricWindow = self.find_widget(QtWidgets.QSpinBox , 'sbVenousAsymmetricWindow') - self.sbTmpWindow = self.find_widget(QtWidgets.QSpinBox , 'sbTmpWindow' ) def _init_connections(self): @@ -66,7 +61,6 @@ """ self.tbReqReset .clicked .connect(self.init_pressure_adjustments_request ) self.tbRspSend .clicked .connect(self.do_pressure_adjustments_response ) - self.tbRspCopy .clicked .connect(self.do_copy_pressure_adjustments_request ) self.tbRspReset .clicked .connect(self.init_pressure_adjustments_response ) @@ -109,32 +103,18 @@ @Slot() def init_pressure_adjustments_response(self): self.sbRejectionReason .setValue(0) - self.sbArterialWindow .setValue(0) - self.sbVenousWindow .setValue(0) - self.sbVenousAsymmetricWindow .setValue(0) - self.sbTmpWindow .setValue(0) @Slot() - def do_copy_pressure_adjustments_request(self): - convert_to_int = lambda value : int(value) if value.isdigit() else 0 - - self.sbArterialWindow .setValue(convert_to_int(self.lbArterialWindowValue.text()) ) - self.sbVenousWindow .setValue(convert_to_int(self.lbVenousWindowValue.text()) ) - self.sbVenousAsymmetricWindow .setValue(convert_to_int(self.lbVenousAsymmetricValue.text()) ) - self.sbTmpWindow .setValue(convert_to_int(self.lbTmpWindowValue.text()) ) - - - @Slot() def do_pressure_adjustments_response(self): """ the slot for sending pressure adjustments response :return: none """ - self.td_interface.td_pressure_limits_adjustment_response( - self.sbRejectionReason .value(), - self.sbArterialWindow .value(), - self.sbVenousWindow .value(), - self.sbVenousAsymmetricWindow .value(), - self.sbTmpWindow .value() + self.td_interface.cmd_send_general_response( + message_id = MsgIds.MSG_ID_TD_PRESSURE_LIMITS_CHANGE_RESPONSE.value, + accepted = 1 if self.sbRejectionReason.value() == 0 else 0, + reason = self.sbRejectionReason.value(), + is_pure_data = False, + has_parameters = False, )