Index: TD_Pressures/loader.py =================================================================== diff -u -r2127613b536bd68ebbcec1923b5b31d95234be0c -ra7779af44ced3be6e30e4d4d67125d171a641d09 --- TD_Pressures/loader.py (.../loader.py) (revision 2127613b536bd68ebbcec1923b5b31d95234be0c) +++ TD_Pressures/loader.py (.../loader.py) (revision a7779af44ced3be6e30e4d4d67125d171a641d09) @@ -31,7 +31,7 @@ self.can_interface = self.td_interface.can_interface super().__init__(os.path.dirname(__file__)) if self.can_interface is not None: - self.can_interface.register_receiving_publication_function(CAN.DenaliChannels.ui_to_td_ch_id, + self.can_interface.register_receiving_publication_function(CAN.CanChannels.ui_to_td_ch_id, MsgIds.MSG_ID_UI_PRESSURE_LIMIT_WIDEN_REQUEST.value, self.handle_pressures_widen_request) @@ -65,6 +65,8 @@ self.sldVenousValue = self.find_widget(QtWidgets.QSlider ,'sldVenousValue' ) self.sldVenousValueLong = self.find_widget(QtWidgets.QSlider ,'sldVenousValueLong' ) self.sldTMPValue = self.find_widget(QtWidgets.QSlider ,'sldTMPValue' ) + self.sldTmpValueLong = self.find_widget(QtWidgets.QSlider ,'sldTmpValueLong' ) + self.sldBarometric = self.find_widget(QtWidgets.QSlider ,'sldBarometric' ) self.spnLimitState = self.find_widget(QtWidgets.QSpinBox ,'spnLimitState' ) self.tbPressureWidenSend = self.find_widget(QtWidgets.QToolButton ,'tbPressuresWidenSend' ) @@ -104,6 +106,12 @@ self.sldTMPValue .setMinimum (Ranges.TMP_PRESSURE_MINIMUM) self.sldTMPValue .setMaximum (Ranges.TMP_PRESSURE_MAXIMUM) self.sldTMPValue .setValue (0) + self.sldTmpValueLong .setMinimum (Ranges.TMP_PRESSURE_MINIMUM) + self.sldTmpValueLong .setMaximum (Ranges.TMP_PRESSURE_MAXIMUM) + self.sldTmpValueLong .setValue (0) + self.sldBarometric .setMinimum (Ranges.TMP_PRESSURE_MINIMUM) + self.sldBarometric .setMaximum (Ranges.TMP_PRESSURE_MAXIMUM) + self.sldBarometric .setValue (0) self.spnArterialLimitLow .setMinimum (Ranges.ARTERIAL_PRESSURE_LOW_MIN) self.spnArterialLimitLow .setMaximum (Ranges.ARTERIAL_PRESSURE_LOW_MAX) @@ -148,6 +156,8 @@ self.sldVenousValue .valueChanged.connect(self.do_pressures_data) self.sldVenousValueLong .valueChanged.connect(self.do_pressures_data) self.sldTMPValue .valueChanged.connect(self.do_pressures_data) + self.sldTmpValueLong .valueChanged.connect(self.do_pressures_data) + self.sldBarometric .valueChanged.connect(self.do_pressures_data) self.spnArterialLimitLow .valueChanged.connect(self.do_pressures_data) self.spnArterialLimitHigh .valueChanged.connect(self.do_pressures_data) @@ -177,8 +187,10 @@ H2_arterial_long = self.sldArterialValueLong .value() H14_venous_long = self.sldVenousValueLong .value() tmp_pressure = self.sldTMPValue .value() + tmp_long = self.sldTmpValueLong .value() tmp_min = self.spnTMPLimitLow .value() tmp_max = self.spnTMPLimitHigh .value() + barometric = self.sldBarometric .value() self.td_interface.td_pressure( H2_arterial_pressure , @@ -191,8 +203,10 @@ H2_arterial_long , H14_venous_long , tmp_pressure , + tmp_long , tmp_min , - tmp_max + tmp_max , + barometric )