Index: TD_TreatmentAdjustmentsBolusVolume/loader.py =================================================================== diff -u -rf130aeba8b9749645bf7c1f8b00c68268ad3bbc0 -r5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd --- TD_TreatmentAdjustmentsBolusVolume/loader.py (.../loader.py) (revision f130aeba8b9749645bf7c1f8b00c68268ad3bbc0) +++ TD_TreatmentAdjustmentsBolusVolume/loader.py (.../loader.py) (revision 5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd) @@ -43,24 +43,18 @@ finds and creates widgets :return: none """ - self.tbReqReset = self.find_widget(QtWidgets.QToolButton , 'tbReqReset' ) - self.lbBolusVolumeValue = self.find_widget(QtWidgets.QLabel , 'lbBolusVolumeValue' ) - 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.lbReqBolusVolume = self.find_widget(QtWidgets.QLabel , 'lbReqBolusVolume' ) self.sbRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbRejectionReason' ) - self.sbBolusVolume = self.find_widget(QtWidgets.QSpinBox , 'sbBolusVolume' ) def _init_connections(self): """ initializes the widgets connections :return: none """ - self.tbReqReset .clicked .connect(self.init_bolus_adjustments_request ) self.tbRspSend .clicked .connect(self.do_bolus_adjustments_response ) - self.tbRspCopy .clicked .connect(self.do_copy_bolus_adjustments_request ) self.tbRspReset .clicked .connect(self.init_bolus_adjustments_response ) @@ -75,7 +69,7 @@ @Slot() def init_bolus_adjustments_request(self): - self.lbBolusVolumeValue.setText("--") + self.lbReqBolusVolume.setText("--") @Slot() @@ -88,29 +82,24 @@ index = MsgFieldPositions.START_POS_FIELD_1 value,index = conversions.bytearray_to_integer(message, index) - self.lbBolusVolumeValue.setText("{0}".format(value)) + self.lbReqBolusVolume.setText("{0}".format(value)) @Slot() def init_bolus_adjustments_response(self): - self.sbRejectionReason .setValue(0) - self.sbBolusVolume .setValue(0) + self.sbRejectionReason.setValue(0) @Slot() - def do_copy_bolus_adjustments_request(self): - convert_to_int = lambda value : int(value) if value.isdigit() else 0 - - self.sbBolusVolume.setValue(convert_to_int(self.lbBolusVolumeValue.text())) - - - @Slot() def do_bolus_adjustments_response(self): """ the slot for sending pressure adjustments response :return: none """ - self.td_interface.td_bolus_volume_adjustment_response( - self.sbRejectionReason .value(), - self.sbBolusVolume .value() + self.td_interface.cmd_send_general_response( + message_id = MsgIds.MSG_ID_TD_BOLUS_VOLUME_CHANGE_RESPONSE.value, + accepted = 1 if self.sbRejectionReason.value() == 0 else 0, + reason = self.sbRejectionReason.value(), + is_pure_data = False, + has_parameters = False, )