Index: TD_Pressures/loader.py =================================================================== diff -u -ra374e714c180996c7fb37c3eee15faeec217e96e -r03501309d607343ba120663e0abce74faeb34f59 --- TD_Pressures/loader.py (.../loader.py) (revision a374e714c180996c7fb37c3eee15faeec217e96e) +++ TD_Pressures/loader.py (.../loader.py) (revision 03501309d607343ba120663e0abce74faeb34f59) @@ -32,41 +32,44 @@ finds and creates widgets :return: none """ + self.tbReset = self.find_widget(QtWidgets.QToolButton ,'tbReset' ) + self.tbSend = self.find_widget(QtWidgets.QToolButton ,'tbSend' ) 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.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') - self.spnVenousLimitLow = self.find_widget(QtWidgets.QSpinBox ,'spnVenousLimitLow') - self.spnVenousLimitHigh = self.find_widget(QtWidgets.QSpinBox ,'spnVenousLimitHigh') - self.spnTMPLimitLow = self.find_widget(QtWidgets.QSpinBox ,'spnTMPLimitLow') - self.spnTMPLimitHigh = self.find_widget(QtWidgets.QSpinBox ,'spnTMPLimitHigh') + self.spnArterialLimitLow = self.find_widget(QtWidgets.QSpinBox ,'spnArterialLimitLow' ) + self.spnArterialLimitHigh = self.find_widget(QtWidgets.QSpinBox ,'spnArterialLimitHigh' ) + self.spnVenousLimitLow = self.find_widget(QtWidgets.QSpinBox ,'spnVenousLimitLow' ) + self.spnVenousLimitHigh = self.find_widget(QtWidgets.QSpinBox ,'spnVenousLimitHigh' ) + 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' ) + 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}]" ) + + 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.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}" ) @@ -123,7 +126,9 @@ :return: none """ - # sending the CANBus message when slider value changed + self.tbReset .clicked.connect(self._init_widgets) + self.tbSend .clicked.connect(self.do_pressures_data) + self.sldArterialValue .valueChanged.connect(self.do_pressures_data) self.sldArterialValueLong .valueChanged.connect(self.do_pressures_data) self.sldVenousValue .valueChanged.connect(self.do_pressures_data)