Index: FP_Pressure/loader.py =================================================================== diff -u -r736bbf411c3a020f656991ae826ed4b2389dfe81 -rd7132e0ca83f0ad1f6ecc526544f84ed6c63c8b7 --- FP_Pressure/loader.py (.../loader.py) (revision 736bbf411c3a020f656991ae826ed4b2389dfe81) +++ FP_Pressure/loader.py (.../loader.py) (revision d7132e0ca83f0ad1f6ecc526544f84ed6c63c8b7) @@ -33,16 +33,13 @@ self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' ) self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) - self.dsbBeforePressureRegulator = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbBeforePressureRegulator' ) - self.dsbAfterPressureRegulator = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbAfterPressureRegulator' ) - self.dsbBeforeInletConductivity = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbBeforeInletConductivity' ) - self.dsbBeforeROFilter = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbBeforeROFilter' ) - self.dsbAfterROFilter = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbAfterROFilter' ) - self.dsbBeforeROPump = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbBeforeROPump' ) - self.dsbROConcentrate = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbROConcentrate' ) - self.dsbROConcentrateDrop = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbROConcentrateDrop' ) - self.dsbDrainDrop = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbDrainDrop' ) + self.dsbM3Pressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbM3Pressure' ) + self.dsbP8Pressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP8Pressure' ) + self.dsbP13Pressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP13Pressure' ) + self.dsbP17Pressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP17Pressure' ) + self.dsbP46Pressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP46Pressure' ) + def _init_connections(self): """ initializes the widgets connections @@ -51,46 +48,36 @@ self.tbReset.clicked.connect(self._init_widgets) self.tbSend.clicked.connect(self.do_fp_pressure) + @Slot() def _init_widgets(self): """ initializes the widgets' properties :return: none """ - self.dsbBeforePressureRegulator .setValue(0) - self.dsbAfterPressureRegulator .setValue(0) - self.dsbBeforeInletConductivity .setValue(0) - self.dsbBeforeROFilter .setValue(0) - self.dsbAfterROFilter .setValue(0) - self.dsbBeforeROPump .setValue(0) - self.dsbROConcentrate .setValue(0) - self.dsbROConcentrateDrop .setValue(0) - self.dsbDrainDrop .setValue(0) + self.dsbM3Pressure .setValue(0) + self.dsbP8Pressure .setValue(0) + self.dsbP13Pressure .setValue(0) + self.dsbP17Pressure .setValue(0) + self.dsbP46Pressure .setValue(0) + + @Slot() def do_fp_pressure(self): """ the slot for FP pressure change :return: none """ - - m1Pressure = self.dsbBeforePressureRegulator .value() - m3Pressure = self.dsbAfterPressureRegulator .value() - p8Pressure = self.dsbBeforeInletConductivity .value() - p13Pressure = self.dsbBeforeROFilter .value() - p17Pressure = self.dsbAfterROFilter .value() - x1Pressure = self.dsbBeforeROPump .value() - x2Pressure = self.dsbROConcentrate .value() - x3Pressure = self.dsbROConcentrateDrop .value() - x4Pressure = self.dsbDrainDrop .value() + m3Pressure = self.dsbM3Pressure .value() + p8Pressure = self.dsbP8Pressure .value() + p13Pressure = self.dsbP13Pressure .value() + p17Pressure = self.dsbP17Pressure .value() + p46Pressure = self.dsbP46Pressure .value() self.fp_interface.fp_pressure( - m1Pressure , m3Pressure , p8Pressure , p13Pressure , p17Pressure , - x1Pressure , - x2Pressure , - x3Pressure , - x4Pressure + p46Pressure ) \ No newline at end of file