Index: TD_TreatmentAdjustmentsSetPoints/loader.py =================================================================== diff -u -r3a57fe707c4cba4a4f3e3b2d4d22e43e38b562d1 -r5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd --- TD_TreatmentAdjustmentsSetPoints/loader.py (.../loader.py) (revision 3a57fe707c4cba4a4f3e3b2d4d22e43e38b562d1) +++ TD_TreatmentAdjustmentsSetPoints/loader.py (.../loader.py) (revision 5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd) @@ -55,17 +55,6 @@ finds and creates widgets :return: none """ - self.tbSetPointsReset = self.find_widget(QtWidgets.QToolButton , 'tbSetPointsReset' ) - self.slSetPointsBloodFlowRate = self.find_widget(QtWidgets.QSlider , 'slSetPointsBloodFlowRate' ) - self.lbSetPointsBloodFlowRate = self.find_widget(QtWidgets.QLabel , 'lbSetPointsBloodFlowRate' ) - self.slSetPointsDialysateFlowRate = self.find_widget(QtWidgets.QSlider , 'slSetPointsDialysateFlowRate' ) - self.lbSetPointsDialysateFlowRate = self.find_widget(QtWidgets.QLabel , 'lbSetPointsDialysateFlowRate' ) - self.slSetPointsDialysateTemperature = self.find_widget(QtWidgets.QSlider , 'slSetPointsDialysateTemperature' ) - self.lbSetPointsDialysateTemperature = self.find_widget(QtWidgets.QLabel , 'lbSetPointsDialysateTemperature' ) - self.sbSetPointsAcidConcentrate = self.find_widget(QtWidgets.QSpinBox , 'sbSetPointsAcidConcentrate' ) - self.sbSetPointsBicarbConcentrate = self.find_widget(QtWidgets.QSpinBox , 'sbSetPointsBicarbConcentrate' ) - - self.tbSetPointsReqCopy = self.find_widget(QtWidgets.QToolButton , 'tbSetPointsReqCopy' ) self.tbSetPointsReqReset = self.find_widget(QtWidgets.QToolButton , 'tbSetPointsReqReset' ) self.lbSetPointsReqBloodFlowRate = self.find_widget(QtWidgets.QLabel , 'lbSetPointsReqBloodFlowRate' ) self.lbSetPointsReqDialysateFlowRate = self.find_widget(QtWidgets.QLabel , 'lbSetPointsReqDialysateFlowRate' ) @@ -77,34 +66,19 @@ self.tbSetPointsRspReset = self.find_widget(QtWidgets.QToolButton , 'tbSetPointsRspReset' ) self.sbSetPointsRspRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbSetPointsRspRejectionReason' ) - self.tbBloodFlowRateReset = self.find_widget(QtWidgets.QToolButton , 'tbBloodFlowRateReset' ) - - self.tbBloodFlowRateReqCopy = self.find_widget(QtWidgets.QToolButton , 'tbBloodFlowRateReqCopy' ) - self.tbBloodFlowRateReqReset = self.find_widget(QtWidgets.QToolButton , 'tbBloodFlowRateReqReset' ) - self.lbBloodFlowRateReq = self.find_widget(QtWidgets.QLabel , 'lbBloodFlowRateReq' ) - self.tbBloodFlowRateRspSend = self.find_widget(QtWidgets.QToolButton , 'tbBloodFlowRateRspSend' ) self.tbBloodFlowRateRspReset = self.find_widget(QtWidgets.QToolButton , 'tbBloodFlowRateRspReset' ) + self.lbBloodFlowRateReq = self.find_widget(QtWidgets.QLabel , 'lbBloodFlowRateReq' ) self.sbBloodFlowRateRspRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbBloodFlowRateRspRejectionReason' ) - self.tbDialysateFlowRateReset = self.find_widget(QtWidgets.QToolButton , 'tbDialysateFlowRateReset' ) - - self.tbDialysateFlowRateReqCopy = self.find_widget(QtWidgets.QToolButton , 'tbDialysateFlowRateReqCopy' ) - self.tbDialysateFlowRateReqReset = self.find_widget(QtWidgets.QToolButton , 'tbDialysateFlowRateReqReset' ) - self.lbDialysateFlowRateReq = self.find_widget(QtWidgets.QLabel , 'lbDialysateFlowRateReq' ) - self.tbDialysateFlowRateRspSend = self.find_widget(QtWidgets.QToolButton , 'tbDialysateFlowRateRspSend' ) self.tbDialysateFlowRateRspReset = self.find_widget(QtWidgets.QToolButton , 'tbDialysateFlowRateRspReset' ) + self.lbDialysateFlowRateReq = self.find_widget(QtWidgets.QLabel , 'lbDialysateFlowRateReq' ) self.sbDialysateFlowRateRspRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbDialysateFlowRateRspRejectionReason' ) - self.tbDialysateTemperatureReset = self.find_widget(QtWidgets.QToolButton , 'tbDialysateTemperatureReset' ) - - self.tbDialysateTemperatureReqCopy = self.find_widget(QtWidgets.QToolButton , 'tbDialysateTemperatureReqCopy' ) - self.tbDialysateTemperatureReqReset = self.find_widget(QtWidgets.QToolButton , 'tbDialysateTemperatureReqReset' ) - self.lbDialysateTemperatureReq = self.find_widget(QtWidgets.QLabel , 'lbDialysateTemperatureReq' ) - self.tbDialysateTemperatureRspSend = self.find_widget(QtWidgets.QToolButton , 'tbDialysateTemperatureRspSend' ) self.tbDialysateTemperatureRspReset = self.find_widget(QtWidgets.QToolButton , 'tbDialysateTemperatureRspReset' ) + self.lbDialysateTemperatureReq = self.find_widget(QtWidgets.QLabel , 'lbDialysateTemperatureReq' ) self.sbDialysateTemperatureRspRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbDialysateTemperatureRspRejectionReason') @@ -113,38 +87,17 @@ initializes the widgets connections :return: none """ - self.tbSetPointsReset .clicked .connect(self.do_set_points_reset ) - self.slSetPointsBloodFlowRate .valueChanged .connect(lambda value: self.lbSetPointsBloodFlowRate.setText(f"{value}") ) - self.slSetPointsDialysateFlowRate .valueChanged .connect(lambda value: self.lbSetPointsDialysateFlowRate.setText(f"{value}") ) - self.slSetPointsDialysateTemperature .valueChanged .connect(lambda value: self.lbSetPointsDialysateTemperature.setText(f"{value/10:.1f}") ) - - self.tbSetPointsReqCopy .clicked .connect(self.do_set_points_request_copy ) self.tbSetPointsReqReset .clicked .connect(self.do_set_points_request_reset ) self.tbSetPointsRspSend .clicked .connect(self.do_set_points_response_send ) self.tbSetPointsRspReset .clicked .connect(self.do_set_points_response_reset ) - self.tbBloodFlowRateReset .clicked .connect(self.do_blood_flow_rate_reset ) - - self.tbBloodFlowRateReqCopy .clicked .connect(self.do_blood_flow_rate_request_copy ) - self.tbBloodFlowRateReqReset .clicked .connect(self.do_blood_flow_rate_request_reset ) - self.tbBloodFlowRateRspSend .clicked .connect(self.do_blood_flow_rate_response_send ) self.tbBloodFlowRateRspReset .clicked .connect(self.do_blood_flow_rate_response_reset ) - self.tbDialysateFlowRateReset .clicked .connect(self.do_dialysate_flow_rate_reset ) - - self.tbDialysateFlowRateReqCopy .clicked .connect(self.do_dialysate_flow_rate_request_copy ) - self.tbDialysateFlowRateReqReset .clicked .connect(self.do_dialysate_flow_rate_request_reset ) - self.tbDialysateFlowRateRspSend .clicked .connect(self.do_dialysate_flow_rate_response_send ) self.tbDialysateFlowRateRspReset .clicked .connect(self.do_dialysate_flow_rate_response_reset ) - self.tbDialysateTemperatureReset .clicked .connect(self.do_dialysate_temperature_reset ) - - self.tbDialysateTemperatureReqCopy .clicked .connect(self.do_dialysate_temperature_request_copy ) - self.tbDialysateTemperatureReqReset .clicked .connect(self.do_dialysate_temperature_request_reset ) - self.tbDialysateTemperatureRspSend .clicked .connect(self.do_dialysate_temperature_response_send ) self.tbDialysateTemperatureRspReset .clicked .connect(self.do_dialysate_temperature_response_reset ) @@ -159,27 +112,10 @@ @Slot() def do_set_points_reset(self): - self.slSetPointsBloodFlowRate .setValue ( 0 ) - self.lbSetPointsBloodFlowRate .setText ( "--" ) - self.slSetPointsDialysateFlowRate .setValue ( 0 ) - self.lbSetPointsDialysateFlowRate .setText ( "--" ) - self.slSetPointsDialysateTemperature .setValue ( 0 ) - self.lbSetPointsDialysateTemperature .setText ( "--" ) - self.sbSetPointsAcidConcentrate .setValue ( 0 ) - self.sbSetPointsBicarbConcentrate .setValue ( 0 ) - self.do_set_points_request_reset() self.do_set_points_response_reset() @Slot() - def do_set_points_request_copy(self): - self.slSetPointsBloodFlowRate .setValue ( self.convert_to_int ( self.lbSetPointsReqBloodFlowRate.text() ) ) - self.slSetPointsDialysateFlowRate .setValue ( self.convert_to_int ( self.lbSetPointsReqDialysateFlowRate.text() ) ) - self.slSetPointsDialysateTemperature .setValue ( self.convert_to_float ( self.lbSetPointsReqDialysateTemperature.text() ) * 10 ) - self.sbSetPointsAcidConcentrate .setValue ( self.convert_to_int ( self.lbSetPointsReqAcidConcentrate.text() ) ) - self.sbSetPointsBicarbConcentrate .setValue ( self.convert_to_int ( self.lbSetPointsReqBicarbConcentrate.text() ) ) - - @Slot() def do_set_points_request_reset(self): self.lbSetPointsReqBloodFlowRate .setText("--") self.lbSetPointsReqDialysateFlowRate .setText("--") @@ -211,38 +147,21 @@ @Slot() def do_set_points_response_send(self): - self.td_interface.td_treatment_set_points_change_response( - self.sbSetPointsRspRejectionReason .value() , - self.slSetPointsBloodFlowRate .value() , - self.slSetPointsDialysateFlowRate .value() , - self.slSetPointsDialysateTemperature .value() / 10 , - self.sbSetPointsAcidConcentrate .value() , - self.sbSetPointsBicarbConcentrate .value() + self.td_interface.cmd_send_general_response( + message_id = MsgIds.MSG_ID_TD_TREATMENT_SET_POINTS_CHANGE_RESPONSE.value, + accepted = 1 if self.sbSetPointsRspRejectionReason.value() == 0 else 0, + reason = self.sbSetPointsRspRejectionReason.value(), + is_pure_data = False, + has_parameters = False, ) @Slot() def do_set_points_response_reset(self): - self.sbSetPointsRspRejectionReason .setValue(0) + self.sbSetPointsRspRejectionReason.setValue(0) @Slot() - def do_blood_flow_rate_reset(self): - self.do_blood_flow_rate_request_reset() - self.do_blood_flow_rate_response_reset() - - - @Slot() - def do_blood_flow_rate_request_copy(self): - self.slSetPointsBloodFlowRate.setValue(self.convert_to_int(self.lbBloodFlowRateReq.text())) - - - @Slot() - def do_blood_flow_rate_request_reset(self): - self.lbBloodFlowRateReq.setText("--") - - - @Slot() def handle_blood_flow_change_request(self, message, timestamp = 0.0): """ Called when the user requests blood flow rate change from UI @@ -251,39 +170,33 @@ message = message['message'] index = MsgFieldPositions.START_POS_FIELD_1 value,index = conversions.bytearray_to_integer(message, index) + print(f"*** I'm here {value}") # SQ self.lbBloodFlowRateReq.setText(f"{value}") @Slot() def do_blood_flow_rate_response_send(self): - self.td_interface.td_treatment_set_point_blood_flow_rate_change_response( - self.sbBloodFlowRateRspRejectionReason .value(), - self.slSetPointsBloodFlowRate .value() + self.td_interface.cmd_send_general_response( + message_id = MsgIds.MSG_ID_TD_TREATMENT_SET_POINT_BLOOD_FLOW_CHANGE_RESPONSE.value, + accepted = 1 if self.sbBloodFlowRateRspRejectionReason.value() == 0 else 0, + reason = self.sbBloodFlowRateRspRejectionReason.value(), + is_pure_data = False, + has_parameters = False, ) @Slot() def do_blood_flow_rate_response_reset(self): - self.sbBloodFlowRateRspRejectionReason.setValue(0) + self.lbBloodFlowRateReq .setText("--") + self.sbBloodFlowRateRspRejectionReason .setValue(0) @Slot() def do_dialysate_flow_rate_reset(self): - self.do_dialysate_flow_rate_request_reset() self.do_dialysate_flow_rate_response_reset() @Slot() - def do_dialysate_flow_rate_request_copy(self): - self.slSetPointsDialysateFlowRate.setValue(self.convert_to_int(self.lbDialysateFlowRateReq.text())) - - - @Slot() - def do_dialysate_flow_rate_request_reset(self): - self.lbDialysateFlowRateReq.setText("--") - - - @Slot() def handle_dialysate_flow_change_request(self, message, timestamp = 0.0): """ Called when the user requests dialysate flow rate change from UI @@ -297,34 +210,22 @@ @Slot() def do_dialysate_flow_rate_response_send(self): - self.td_interface.td_treatment_set_point_dialysate_flow_rate_change_response( - self.sbDialysateFlowRateRspRejectionReason .value(), - self.slSetPointsDialysateFlowRate .value() + self.td_interface.cmd_send_general_response( + message_id = MsgIds.MSG_ID_TD_TREATMENT_SET_POINT_DIALYSATE_FLOW_CHANGE_RESPONSE.value, + accepted = 1 if self.sbDialysateFlowRateRspRejectionReason.value() == 0 else 0, + reason = self.sbDialysateFlowRateRspRejectionReason.value(), + is_pure_data = False, + has_parameters = False, ) @Slot() def do_dialysate_flow_rate_response_reset(self): - self.sbDialysateFlowRateRspRejectionReason.setValue(0) + self.lbDialysateFlowRateReq .setText("--") + self.sbDialysateFlowRateRspRejectionReason .setValue(0) @Slot() - def do_dialysate_temperature_reset(self): - self.do_dialysate_temperature_request_reset() - self.do_dialysate_temperature_response_reset() - - - @Slot() - def do_dialysate_temperature_request_copy(self): - self.slSetPointsDialysateTemperature.setValue(self.convert_to_int(self.lbDialysateTemperatureReq.text()) * 10) - - - @Slot() - def do_dialysate_temperature_request_reset(self): - self.lbDialysateTemperatureReq.setText("--") - - - @Slot() def handle_dialysate_temperature_change_request(self, message, timestamp = 0.0): """ Called when the user requests dialysate temperature change from UI @@ -338,25 +239,16 @@ @Slot() def do_dialysate_temperature_response_send(self): - self.td_interface.td_treatment_set_point_dialysate_temperature_change_response( - self.sbDialysateTemperatureRspRejectionReason .value(), - self.slSetPointsDialysateTemperature .value() / 10 + self.td_interface.cmd_send_general_response( + message_id = MsgIds.MSG_ID_TD_TREATMENT_SET_POINT_DIALYSATE_TEMPERATURE_CHANGE_RESPONSE.value, + accepted = 1 if self.sbDialysateTemperatureRspRejectionReason.value() == 0 else 0, + reason = self.sbDialysateTemperatureRspRejectionReason.value(), + is_pure_data = False, + has_parameters = False, ) @Slot() def do_dialysate_temperature_response_reset(self): - self.sbDialysateTemperatureRspRejectionReason.setValue(0) - - - def convert_to_float(self, value): - try: - return float(value) - except ValueError: - return 0.0 - - def convert_to_int(self, value): - try: - return int(value) - except ValueError: - return 0 + self.lbDialysateTemperatureReq .setText("--") + self.sbDialysateTemperatureRspRejectionReason .setValue(0)