Index: TD_Pressures/loader.py =================================================================== diff -u -rf9ec0e263221cccdf36e037c4729b0972cd45c07 -ra374e714c180996c7fb37c3eee15faeec217e96e --- TD_Pressures/loader.py (.../loader.py) (revision f9ec0e263221cccdf36e037c4729b0972cd45c07) +++ TD_Pressures/loader.py (.../loader.py) (revision a374e714c180996c7fb37c3eee15faeec217e96e) @@ -32,16 +32,16 @@ finds and creates widgets :return: none """ - self.lblArterialTitle = self.find_widget(QtWidgets.QLabel ,'lblArterialTitle') - self.lblVenousTitle = self.find_widget(QtWidgets.QLabel ,'lblVenousTitle') - self.lblTMPTitle = self.find_widget(QtWidgets.QLabel ,'lblTMPTitle') + self.lblArterialTitle = self.find_widget(QtWidgets.QLabel ,'lblArterialTitle') + self.lblVenousTitle = self.find_widget(QtWidgets.QLabel ,'lblVenousTitle') + self.lblTMPTitle = self.find_widget(QtWidgets.QLabel ,'lblTMPTitle') - self.lblArterialLimitLow = self.find_widget(QtWidgets.QLabel ,'lblArterialLimitLow') - self.lblArterialLimitHigh = self.find_widget(QtWidgets.QLabel ,'lblArterialLimitHigh') - self.lblVenousLimitLow = self.find_widget(QtWidgets.QLabel ,'lblVenousLimitLow') - self.lblVenousLimitHigh = self.find_widget(QtWidgets.QLabel ,'lblVenousLimitHigh') - self.lblTMPLimitLow = self.find_widget(QtWidgets.QLabel ,'lblTMPLimitLow') - self.lblTMPLimitHigh = self.find_widget(QtWidgets.QLabel ,'lblTMPLimitHigh') + self.lblArterialLimitLow = self.find_widget(QtWidgets.QLabel ,'lblArterialLimitLow') + self.lblArterialLimitHigh = self.find_widget(QtWidgets.QLabel ,'lblArterialLimitHigh') + self.lblVenousLimitLow = self.find_widget(QtWidgets.QLabel ,'lblVenousLimitLow') + self.lblVenousLimitHigh = self.find_widget(QtWidgets.QLabel ,'lblVenousLimitHigh') + self.lblTMPLimitLow = self.find_widget(QtWidgets.QLabel ,'lblTMPLimitLow') + self.lblTMPLimitHigh = self.find_widget(QtWidgets.QLabel ,'lblTMPLimitHigh') self.spnArterialLimitLow = self.find_widget(QtWidgets.QSpinBox ,'spnArterialLimitLow') self.spnArterialLimitHigh = self.find_widget(QtWidgets.QSpinBox ,'spnArterialLimitHigh') @@ -50,77 +50,71 @@ self.spnTMPLimitLow = self.find_widget(QtWidgets.QSpinBox ,'spnTMPLimitLow') self.spnTMPLimitHigh = self.find_widget(QtWidgets.QSpinBox ,'spnTMPLimitHigh') - self.sldArterialValue = self.find_widget(QtWidgets.QSlider ,'sldArterialValue') - self.sldArterialValueLong = self.find_widget(QtWidgets.QSlider ,'sldArterialValueLong') - 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.sldArterialValue = self.find_widget(QtWidgets.QSlider ,'sldArterialValue') + self.sldArterialValueLong = self.find_widget(QtWidgets.QSlider ,'sldArterialValueLong') + 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.spnLimitState = self.find_widget(QtWidgets.QSpinBox ,'spnLimitState') + self.spnLimitState = self.find_widget(QtWidgets.QSpinBox ,'spnLimitState') def _init_widgets(self): """ initializes the widgets' properties :return: none """ - self.lblArterialTitle.setText( - f"{self.lblArterialTitle.text()} [{Ranges.ARTERIAL_PRESSURE_MINIMUM},{Ranges.ARTERIAL_PRESSURE_MAXIMUM}]" - ) - self.lblVenousTitle.setText( - f"{self.lblVenousTitle.text()} [{Ranges.VENOUS_PRESSURE_MINIMUM},{Ranges.VENOUS_PRESSURE_MAXIMUM}]" - ) - self.lblTMPTitle.setText( - f"{self.lblTMPTitle.text()} [{Ranges.TMP_PRESSURE_MINIMUM},{Ranges.TMP_PRESSURE_MAXIMUM}]" - ) + self.lblArterialTitle .setText (f"{self.lblArterialTitle .text()} [{Ranges.ARTERIAL_PRESSURE_MINIMUM},{Ranges.ARTERIAL_PRESSURE_MAXIMUM}]" ) + self.lblVenousTitle .setText (f"{self.lblVenousTitle .text()} [{Ranges.VENOUS_PRESSURE_MINIMUM},{Ranges.VENOUS_PRESSURE_MAXIMUM}]" ) + self.lblTMPTitle .setText (f"{self.lblTMPTitle .text()} [{Ranges.TMP_PRESSURE_MINIMUM},{Ranges.TMP_PRESSURE_MAXIMUM}]" ) - 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}") - self.lblTMPLimitLow.setText(f"{Ranges.TMP_PRESSURE_LOW_MIN}\n{Ranges.TMP_PRESSURE_LOW_MAX}") - self.lblTMPLimitHigh.setText(f"{Ranges.TMP_PRESSURE_HIGH_MIN}\n{Ranges.TMP_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}" ) + self.lblTMPLimitLow .setText (f"{Ranges.TMP_PRESSURE_LOW_MIN}\n{Ranges.TMP_PRESSURE_LOW_MAX}" ) + self.lblTMPLimitHigh .setText (f"{Ranges.TMP_PRESSURE_HIGH_MIN}\n{Ranges.TMP_PRESSURE_HIGH_MAX}" ) - self.sldArterialValue.setMinimum(Ranges.ARTERIAL_PRESSURE_MINIMUM) - self.sldArterialValue.setMaximum(Ranges.ARTERIAL_PRESSURE_MAXIMUM) - self.sldArterialValue.setValue(0) - self.sldArterialValueLong.setMinimum(Ranges.ARTERIAL_PRESSURE_MINIMUM) - self.sldArterialValueLong.setMaximum(Ranges.ARTERIAL_PRESSURE_MAXIMUM) - self.sldArterialValueLong.setValue(0) - self.sldVenousValue.setMinimum(Ranges.VENOUS_PRESSURE_MINIMUM) - self.sldVenousValue.setMaximum(Ranges.VENOUS_PRESSURE_MAXIMUM) - self.sldVenousValue.setValue(0) - self.sldVenousValueLong.setMinimum(Ranges.VENOUS_PRESSURE_MINIMUM) - self.sldVenousValueLong.setMaximum(Ranges.VENOUS_PRESSURE_MAXIMUM) - self.sldVenousValueLong.setValue(0) - self.sldTMPValue.setMinimum(Ranges.TMP_PRESSURE_MINIMUM) - self.sldTMPValue.setMaximum(Ranges.TMP_PRESSURE_MAXIMUM) - self.sldTMPValue.setValue(0) + self.sldArterialValue .setMinimum (Ranges.ARTERIAL_PRESSURE_MINIMUM) + self.sldArterialValue .setMaximum (Ranges.ARTERIAL_PRESSURE_MAXIMUM) + self.sldArterialValue .setValue (0) + self.sldArterialValueLong .setMinimum (Ranges.ARTERIAL_PRESSURE_MINIMUM) + self.sldArterialValueLong .setMaximum (Ranges.ARTERIAL_PRESSURE_MAXIMUM) + self.sldArterialValueLong .setValue (0) + self.sldVenousValue .setMinimum (Ranges.VENOUS_PRESSURE_MINIMUM) + self.sldVenousValue .setMaximum (Ranges.VENOUS_PRESSURE_MAXIMUM) + self.sldVenousValue .setValue (0) + self.sldVenousValueLong .setMinimum (Ranges.VENOUS_PRESSURE_MINIMUM) + self.sldVenousValueLong .setMaximum (Ranges.VENOUS_PRESSURE_MAXIMUM) + self.sldVenousValueLong .setValue (0) + self.sldTMPValue .setMinimum (Ranges.TMP_PRESSURE_MINIMUM) + self.sldTMPValue .setMaximum (Ranges.TMP_PRESSURE_MAXIMUM) + self.sldTMPValue .setValue (0) - 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.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(Ranges.ARTERIAL_PRESSURE_HIGH_MIN) - self.spnArterialLimitHigh.setMaximum(Ranges.ARTERIAL_PRESSURE_HIGH_MAX) - self.spnArterialLimitHigh.setValue(Ranges.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(Ranges.VENOUS_PRESSURE_LOW_MIN) - self.spnVenousLimitLow.setMaximum(Ranges.VENOUS_PRESSURE_LOW_MAX) - self.spnVenousLimitLow.setValue(Ranges.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(Ranges.VENOUS_PRESSURE_HIGH_MIN) - self.spnVenousLimitHigh.setMaximum(Ranges.VENOUS_PRESSURE_HIGH_MAX) - self.spnVenousLimitHigh.setValue(Ranges.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) - self.spnTMPLimitLow.setMinimum(Ranges.TMP_PRESSURE_LOW_MIN) - self.spnTMPLimitLow.setMaximum(Ranges.TMP_PRESSURE_LOW_MAX) - self.spnTMPLimitLow.setValue(Ranges.TMP_PRESSURE_LOW_DEF) + self.spnTMPLimitLow .setMinimum (Ranges.TMP_PRESSURE_LOW_MIN) + self.spnTMPLimitLow .setMaximum (Ranges.TMP_PRESSURE_LOW_MAX) + self.spnTMPLimitLow .setValue (Ranges.TMP_PRESSURE_LOW_DEF) - self.spnTMPLimitHigh.setMinimum(Ranges.TMP_PRESSURE_HIGH_MIN) - self.spnTMPLimitHigh.setMaximum(Ranges.TMP_PRESSURE_HIGH_MAX) - self.spnTMPLimitHigh.setValue(Ranges.TMP_PRESSURE_HIGH_DEF) + self.spnTMPLimitHigh .setMinimum (Ranges.TMP_PRESSURE_HIGH_MIN) + self.spnTMPLimitHigh .setMaximum (Ranges.TMP_PRESSURE_HIGH_MAX) + self.spnTMPLimitHigh .setValue (Ranges.TMP_PRESSURE_HIGH_DEF) - self.spnLimitState.setValue(0) + self.spnLimitState .setValue(0) def _init_connections(self):