Index: MainTreatmentData/loader.py =================================================================== diff -u -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b -rc2a68654fcf052f130d3e5de8457aaa375b72506 --- MainTreatmentData/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b) +++ MainTreatmentData/loader.py (.../loader.py) (revision c2a68654fcf052f130d3e5de8457aaa375b72506) @@ -32,7 +32,7 @@ super().__init__(os.path.dirname(__file__)) if self.can_interface is not None: - channel_id = CAN.DenaliChannels.ui_to_td_ch_id + channel_id = CAN.CanChannels.ui_to_td_ch_id message_id = MsgIds.MSG_ID_UI_SOLUTION_INFUSION_REQUEST.value self.can_interface.register_receiving_publication_function(channel_id, message_id, @@ -53,7 +53,10 @@ self.saline_tgt_vol = self.find_widget(QtWidgets.QSlider , 'TargetVolumeSlider' ) self.saline_cum_vol = self.find_widget(QtWidgets.QSlider , 'CumulativeVolumeSlider' ) self.saline_bol_del = self.find_widget(QtWidgets.QSlider , 'SalineCurrDeliveredVolumeSlider' ) + self.cbBolusPermitted = self.find_widget(QtWidgets.QCheckBox , 'cbBolusPermitted' ) + self.tbBolusDataSend = self.find_widget(QtWidgets.QToolButton , 'tbBolusDataSend' ) + self.ufDataSend = self.find_widget(QtWidgets.QToolButton , 'ufDataSendButton' ) self.ufDataReset = self.find_widget(QtWidgets.QToolButton , 'ufDataResetButton' ) self.ufSetVolume = self.find_widget(QtWidgets.QSlider , 'ufSetVolumeSlider' ) @@ -62,7 +65,7 @@ self.ufState = self.find_widget(QtWidgets.QSpinBox , 'ufStateSpinBox' ) self.ufSetVolumeLabel = self.find_widget(QtWidgets.QLabel , 'ufSetVolumeLabel' ) self.ufTargetRateLabel = self.find_widget(QtWidgets.QLabel , 'ufTargetRateLabel' ) - self.ufVolumeDeliveredLabel = self.find_widget(QtWidgets.QLabel , 'ufVolumeDeliveredLabel' ) + self.ufVolumeDeliveredLabel = self.find_widget(QtWidgets.QLabel , 'ufVolumeDeliveredLabel' ) self.tx_duration = self.find_widget(QtWidgets.QSlider , 'DurationSlider' ) self.tx_elapsed = self.find_widget(QtWidgets.QSlider , 'ElapsedSlider' ) @@ -87,6 +90,8 @@ self.saline_tgt_vol .valueChanged.connect(self.do_saline_data) self.saline_cum_vol .valueChanged.connect(self.do_saline_data) self.saline_bol_del .valueChanged.connect(self.do_saline_data) + self.cbBolusPermitted.clicked.connect(self.do_saline_data) + self.tbBolusDataSend .clicked.connect(self.do_saline_data) self.ufDataSend .clicked.connect(self.do_uf_data) self.ufDataReset .clicked.connect(self.init_uf_data) @@ -112,6 +117,7 @@ state,index = conversions.bytearray_to_integer( message, index) self.lbBolusStart .setText( str(state) ) + @Slot() def _init_widgets(self): """ @@ -131,21 +137,23 @@ self.dial_flow_st_pt .setValue(0) self.dial_temp_st_pt .setValue(0) + @Slot() def do_saline_data(self): """ the slot for Saline Data :return: none """ - target_volume = self.saline_tgt_vol.value() - cumulative_volume = self.saline_cum_vol.value() - bolus_volume = self.saline_bol_del.value() + target_volume = self.saline_tgt_vol .value() + bolus_volume = self.saline_bol_del .value() + cumulative_volume = self.saline_cum_vol .value() + bolusPermitted = int(self.cbBolusPermitted .isChecked()) self.td_interface.td_saline( target_volume , - cumulative_volume , bolus_volume , - 0 + cumulative_volume , + bolusPermitted )