Index: FP_Temperature/loader.py =================================================================== diff -u -r639e60ab542d69ff6c7b489c0e86bef287519c32 -rd7132e0ca83f0ad1f6ecc526544f84ed6c63c8b7 --- FP_Temperature/loader.py (.../loader.py) (revision 639e60ab542d69ff6c7b489c0e86bef287519c32) +++ FP_Temperature/loader.py (.../loader.py) (revision d7132e0ca83f0ad1f6ecc526544f84ed6c63c8b7) @@ -33,20 +33,19 @@ self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' ) self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) - self.dsbP10InletConductivity = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP10InletConductivity' ) - self.dsbP19OutletConductivity = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP19OutletConductivity' ) - self.dsbM1BeforePressureRegulator = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbM1BeforePressureRegulator' ) - self.dsbM3AfterPressureRegulator = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbM3AfterPressureRegulator' ) - self.dsbP8BeforeInletConductivity = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP8BeforeInletConductivity' ) - self.dsbP13ROFilter = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP13ROFilter' ) - self.dsbP17AfterROFilter = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP17AfterROFilter' ) - self.dsbX1BeforeROPump = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbX1BeforeROPump' ) - self.dsbX2ROConcentrate = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbX2ROConcentrate' ) - self.dsbX3ROConcentratePump = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbX3ROConcentratePump' ) - self.dsbX4DrainDrop = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbX4DrainDrop' ) - self.dsbP7ROInlet = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP7ROInlet' ) - self.dsbP16ROOutlet = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP16ROOutlet' ) + self.dsbM3Temp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbM3Temp' ) + self.dsbP8Temp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP8Temp' ) + self.dsbP13Temp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP13Temp' ) + self.dsbP17Temp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP17Temp' ) + self.dsbP46Temp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP46Temp' ) + self.dsbP10Temp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP10Temp' ) + self.dsbP19Temp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP19Temp' ) + self.dsbP7Temp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP7Temp' ) + self.dsbP16Temp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP16Temp' ) + self.dsbP7InternalTemp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP7InternalTemp' ) + self.dsbP16InternalTemp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP16InternalTemp' ) + def _init_connections(self): """ initializes the widgets connections @@ -61,53 +60,34 @@ initializes the widgets' properties :return: none """ - self.dsbP10InletConductivity .setValue(0) - self.dsbP19OutletConductivity .setValue(0) - self.dsbM1BeforePressureRegulator .setValue(0) - self.dsbM3AfterPressureRegulator .setValue(0) - self.dsbP8BeforeInletConductivity .setValue(0) - self.dsbP13ROFilter .setValue(0) - self.dsbP17AfterROFilter .setValue(0) - self.dsbX1BeforeROPump .setValue(0) - self.dsbX2ROConcentrate .setValue(0) - self.dsbX3ROConcentratePump .setValue(0) - self.dsbX4DrainDrop .setValue(0) - self.dsbP7ROInlet .setValue(0) - self.dsbP16ROOutlet .setValue(0) + self.dsbM3Temp .setValue(0) + self.dsbP8Temp .setValue(0) + self.dsbP13Temp .setValue(0) + self.dsbP17Temp .setValue(0) + self.dsbP46Temp .setValue(0) + self.dsbP10Temp .setValue(0) + self.dsbP19Temp .setValue(0) + self.dsbP7Temp .setValue(0) + self.dsbP16Temp .setValue(0) + self.dsbP7InternalTemp .setValue(0) + self.dsbP16InternalTemp .setValue(0) @Slot() def do_fp_temperature(self): """ the slot for fp temperature change :return: none """ - - p10Temp = self.dsbP10InletConductivity .value() - p19Temp = self.dsbP19OutletConductivity .value() - m1Temp = self.dsbM1BeforePressureRegulator .value() - m3Temp = self.dsbM3AfterPressureRegulator .value() - p8Temp = self.dsbP8BeforeInletConductivity .value() - p13Temp = self.dsbP13ROFilter .value() - p17Temp = self.dsbP17AfterROFilter .value() - x1Temp = self.dsbX1BeforeROPump .value() - x2Temp = self.dsbX2ROConcentrate .value() - x3Temp = self.dsbX3ROConcentratePump .value() - x4Temp = self.dsbX4DrainDrop .value() - p7Temp = self.dsbP7ROInlet .value() - p16Temp = self.dsbP16ROOutlet .value() - self.fp_interface.fp_temperature( - p10Temp , - p19Temp , - m1Temp , - m3Temp , - p8Temp , - p13Temp , - p17Temp , - x1Temp , - x2Temp , - x3Temp , - x4Temp , - p7Temp , - p16Temp + self.dsbM3Temp .value(), + self.dsbP8Temp .value(), + self.dsbP13Temp .value(), + self.dsbP17Temp .value(), + self.dsbP46Temp .value(), + self.dsbP10Temp .value(), + self.dsbP19Temp .value(), + self.dsbP7Temp .value(), + self.dsbP16Temp .value(), + self.dsbP7InternalTemp .value(), + self.dsbP16InternalTemp .value() ) \ No newline at end of file