Index: TD_Vitals/loader.py =================================================================== diff -u -r976a9362e2aaa083b5ed1926edee03be28bf2b58 -r3106c9d27f114fa3e7e435b3eeba9cfcfe178bf7 --- TD_Vitals/loader.py (.../loader.py) (revision 976a9362e2aaa083b5ed1926edee03be28bf2b58) +++ TD_Vitals/loader.py (.../loader.py) (revision 3106c9d27f114fa3e7e435b3eeba9cfcfe178bf7) @@ -30,54 +30,44 @@ self.can_interface = self.td_interface.can_interface super().__init__(os.path.dirname(__file__)) - if self.can_interface is not None: - channel_id = CAN.DenaliChannels.ui_to_td_ch_id - vitals_request_message_id = MsgIds.MSG_ID_UI_BLOOD_PRESSURE_REQUEST.value - self.can_interface.register_receiving_publication_function(channel_id, - vitals_request_message_id, - self.handle_vitals_request) def _init_loader(self): """ finds and creates widgets :return: none """ - self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) + self.tbVitalsRspSend = self.find_widget(QtWidgets.QToolButton , 'tbVitalsRspSend' ) + self.sbVitalsReason = self.find_widget(QtWidgets.QSpinBox , 'VitalsReasonSpinBox' ) + self.tbVitalsSend = self.find_widget(QtWidgets.QToolButton , 'tbVitalsSend' ) self.sbSystolic = self.find_widget(QtWidgets.QSpinBox , 'SystolicSpinBox' ) self.sbDiastolic = self.find_widget(QtWidgets.QSpinBox , 'DiastolicSpinBox' ) self.sbHeartRate = self.find_widget(QtWidgets.QSpinBox , 'HeartRateSpinBox' ) - self.sbVitalsReason = self.find_widget(QtWidgets.QSpinBox , 'VitalsReasonSpinBox' ) def _init_connections(self): """ initializes the widgets connections :return: none """ - self.tbSend .clicked .connect(self.do_send) - self.sbSystolic .valueChanged.connect(self.do_vitals_data) - self.sbDiastolic .valueChanged.connect(self.do_vitals_data) - self.sbHeartRate .valueChanged.connect(self.do_vitals_data) + self.tbVitalsRspSend.clicked .connect(self.do_vitals_rsp ) + self.tbVitalsSend .clicked .connect(self.do_vitals_data ) + def _init_widgets(self): """ initializes the widgets' properties :return: none """ - + self.sbVitalsReason .setValue(0) self.sbSystolic .setValue(120) self.sbDiastolic .setValue(80) self.sbHeartRate .setValue(100) - self.sbVitalsReason .setValue(0) + @Slot() - def handle_vitals_request(self, message, timestamp = 0.0): - """ - Called when the user requests to firmware from UI - @return: None - """ - reason = self.sbVitalsReason.value() - self.td_interface.td_vitals_adjustment_response(reason) + def do_vitals_rsp(self): + self.td_interface.td_vitals_adjustment_response(self.sbVitalsReason.value()) + @Slot() def do_vitals_data(self): """ @@ -93,11 +83,3 @@ diastolic , heartRate ) - - @Slot() - def do_send(self): - """ - the slot for treatment set point Data - :return: none - """ - self.do_vitals_data()