Index: TD_Pressures/interface.ui =================================================================== diff -u -rb8705aa1e0402a49cc266c642facb833888116bd -r544e283f389cb9f3e54359c06efffb4daf92e9fc --- TD_Pressures/interface.ui (.../interface.ui) (revision b8705aa1e0402a49cc266c642facb833888116bd) +++ TD_Pressures/interface.ui (.../interface.ui) (revision 544e283f389cb9f3e54359c06efffb4daf92e9fc) @@ -6,8 +6,8 @@ 0 0 - 718 - 273 + 570 + 278 @@ -631,8 +631,24 @@ QLayout::SetFixedSize - - + + + + + 30 + 0 + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + 0 @@ -654,23 +670,20 @@ 10 - 200 + 20 - - - - - 30 - 0 - + + + + -100 - - 0 + + 700 - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + Qt::Horizontal @@ -701,8 +714,8 @@ - - + + 0 @@ -721,38 +734,38 @@ - Low + 0 Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + - + 0 0 + + + 30 + 0 + + 10 - - -100 + + 0 - - 400 + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - 10 - - - 20 - @@ -774,8 +787,8 @@ - - + + 0 @@ -794,45 +807,80 @@ - 0 + Low Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + + + + 0 + 0 + + + + + 10 + + -100 + 400 + + + 10 + + + 200 + + + + + + + + 30 + 0 + + + + Avg + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + sldVenousValue + + + + + + + -100 + + 700 Qt::Horizontal - - - - - 0 - 0 - - + + 30 0 - - - 10 - - 0 @@ -954,6 +1002,54 @@ + + + + + 30 + 0 + + + + Barometric + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + sldVenousValue + + + + + + + -100 + + + 700 + + + Qt::Horizontal + + + + + + + + 30 + 0 + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -1162,5 +1258,37 @@ + + sldTmpValueLong + valueChanged(int) + lblVenousValue_4 + setNum(int) + + + 462 + 152 + + + 525 + 152 + + + + + sldBarometric + valueChanged(int) + lblVenousValue_5 + setNum(int) + + + 436 + 182 + + + 526 + 182 + + + Index: TD_Pressures/loader.py =================================================================== diff -u -r2127613b536bd68ebbcec1923b5b31d95234be0c -r544e283f389cb9f3e54359c06efffb4daf92e9fc --- TD_Pressures/loader.py (.../loader.py) (revision 2127613b536bd68ebbcec1923b5b31d95234be0c) +++ TD_Pressures/loader.py (.../loader.py) (revision 544e283f389cb9f3e54359c06efffb4daf92e9fc) @@ -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 )