Index: simulator/run.py =================================================================== diff -u -rb4e6b92304a715cba0c33fe101922ceee4174465 -refb0dcc34f39f35d41f43cca9667db17fd97c844 --- simulator/run.py (.../run.py) (revision b4e6b92304a715cba0c33fe101922ceee4174465) +++ simulator/run.py (.../run.py) (revision efb0dcc34f39f35d41f43cca9667db17fd97c844) @@ -11,6 +11,7 @@ from PySide2.QtCore import QFile, Slot from PySide2.QtGui import qApp from PySide2.QtCore import QTimer +from dialin.common import Ranges class RunTimeWidget: @@ -281,24 +282,6 @@ sets up the treatment pressures :return: none """ - arterial_pressure_minimum = -400 - arterial_pressure_maximum = +600 - arterial_pressure_low_min = -300 - arterial_pressure_low_def = -300 - arterial_pressure_low_max = +200 - arterial_pressure_high_min = -300 - arterial_pressure_high_def = +100 - arterial_pressure_high_max = +200 - - venous_pressure_minimum = -100 - venous_pressure_maximum = +700 - venous_pressure_low_min = -100 - venous_pressure_low_def = -100 - venous_pressure_low_max = +600 - venous_pressure_high_min = +100 - venous_pressure_high_def = +400 - venous_pressure_high_max = +600 - self.lblArterialTitle = self.find_label('lblArterialTitle') self.lblVenousTitle = self.find_label('lblVenousTitle') self.lblArterialLimitLow = self.find_label('lblArterialLimitLow') @@ -320,16 +303,16 @@ self.sldVenousValue = self.find_slider('sldVenousValue') self.lblArterialTitle.setText( - f"{self.lblArterialTitle.text()} [{arterial_pressure_minimum},{arterial_pressure_maximum}]" + f"{self.lblArterialTitle.text()} [{Ranges.ARTERIAL_PRESSURE_MINIMUM},{Ranges.ARTERIAL_PRESSURE_MAXIMUM}]" ) self.lblVenousTitle.setText( - f"{self.lblVenousTitle.text()} [{venous_pressure_minimum},{venous_pressure_maximum}]" + f"{self.lblVenousTitle.text()} [{Ranges.VENOUS_PRESSURE_MINIMUM},{Ranges.VENOUS_PRESSURE_MAXIMUM}]" ) - self.lblArterialLimitLow.setText(f"{arterial_pressure_low_min}\n{arterial_pressure_low_max}") - self.lblArterialLimitHigh.setText(f"{arterial_pressure_high_min}\n{arterial_pressure_high_max}") - self.lblVenousLimitLow.setText(f"{venous_pressure_low_min}\n{venous_pressure_low_max}") - self.lblVenousLimitHigh.setText(f"{venous_pressure_high_min}\n{venous_pressure_high_max}") + self.lblArterialLimitLow.setText(f"{Ranges.ARTERIAL_PRESSURE_LOW_MIN}\n{Ranges.ARTERIAL_PRESSURE_LOW_MAX}") + self.lblArterialLimitHigh.setText(f"{Ranges.ARTERIAL_PRESSURE_HIGH_MIN}\n{Ranges.ARTERIAL_PRESSURE_HIGH_MAX}") + self.lblVenousLimitLow.setText(f"{Ranges.VENOUS_PRESSURE_LOW_MIN}\n{Ranges.VENOUS_PRESSURE_LOW_MAX}") + self.lblVenousLimitHigh.setText(f"{Ranges.VENOUS_PRESSURE_HIGH_MIN}\n{Ranges.VENOUS_PRESSURE_HIGH_MAX}") # sending the CANBus message when slider value changed self.sldArterialValue.valueChanged.connect(self.do_pressures_data) @@ -339,28 +322,28 @@ self.btnAVPressuresAccept.clicked.connect(self.do_pressures_limits_accept) self.btnAVPressuresReject.clicked.connect(self.do_pressures_limits_reject) - self.sldArterialValue.setMinimum(arterial_pressure_minimum) - self.sldArterialValue.setMaximum(arterial_pressure_maximum) + self.sldArterialValue.setMinimum(Ranges.ARTERIAL_PRESSURE_MINIMUM) + self.sldArterialValue.setMaximum(Ranges.ARTERIAL_PRESSURE_MAXIMUM) self.sldArterialValue.setValue(0) - self.sldVenousValue.setMinimum(venous_pressure_minimum) - self.sldVenousValue.setMaximum(venous_pressure_maximum) + self.sldVenousValue.setMinimum(Ranges.VENOUS_PRESSURE_MINIMUM) + self.sldVenousValue.setMaximum(Ranges.VENOUS_PRESSURE_MAXIMUM) self.sldVenousValue.setValue(0) - self.spnArterialLimitLow.setMinimum(arterial_pressure_low_min) - self.spnArterialLimitLow.setMaximum(arterial_pressure_low_max) - self.spnArterialLimitLow.setValue(arterial_pressure_low_def) + self.spnArterialLimitLow.setMinimum(Ranges.ARTERIAL_PRESSURE_LOW_MIN) + self.spnArterialLimitLow.setMaximum(Ranges.ARTERIAL_PRESSURE_LOW_MAX) + self.spnArterialLimitLow.setValue(Ranges.ARTERIAL_PRESSURE_LOW_DEF) - self.spnArterialLimitHigh.setMinimum(arterial_pressure_high_min) - self.spnArterialLimitHigh.setMaximum(arterial_pressure_high_max) - self.spnArterialLimitHigh.setValue(arterial_pressure_high_def) + self.spnArterialLimitHigh.setMinimum(Ranges.ARTERIAL_PRESSURE_HIGH_MIN) + self.spnArterialLimitHigh.setMaximum(Ranges.ARTERIAL_PRESSURE_HIGH_MAX) + self.spnArterialLimitHigh.setValue(Ranges.ARTERIAL_PRESSURE_HIGH_DEF) - self.spnVenousLimitLow.setMinimum(venous_pressure_low_min) - self.spnVenousLimitLow.setMaximum(venous_pressure_low_max) - self.spnVenousLimitLow.setValue(venous_pressure_low_def) + self.spnVenousLimitLow.setMinimum(Ranges.VENOUS_PRESSURE_LOW_MIN) + self.spnVenousLimitLow.setMaximum(Ranges.VENOUS_PRESSURE_LOW_MAX) + self.spnVenousLimitLow.setValue(Ranges.VENOUS_PRESSURE_LOW_DEF) - self.spnVenousLimitHigh.setMinimum(venous_pressure_high_min) - self.spnVenousLimitHigh.setMaximum(venous_pressure_high_max) - self.spnVenousLimitHigh.setValue(venous_pressure_high_def) + self.spnVenousLimitHigh.setMinimum(Ranges.VENOUS_PRESSURE_HIGH_MIN) + self.spnVenousLimitHigh.setMaximum(Ranges.VENOUS_PRESSURE_HIGH_MAX) + self.spnVenousLimitHigh.setValue(Ranges.VENOUS_PRESSURE_HIGH_DEF) @Slot() def do_sb_accept(self):