Index: FP_Flow/interface.ui =================================================================== diff -u -r639e60ab542d69ff6c7b489c0e86bef287519c32 -rd7132e0ca83f0ad1f6ecc526544f84ed6c63c8b7 --- FP_Flow/interface.ui (.../interface.ui) (revision 639e60ab542d69ff6c7b489c0e86bef287519c32) +++ FP_Flow/interface.ui (.../interface.ui) (revision d7132e0ca83f0ad1f6ecc526544f84ed6c63c8b7) @@ -6,8 +6,8 @@ 0 0 - 519 - 188 + 474 + 130 @@ -26,58 +26,6 @@ &7 FP info/&7 Flows - - - - 2 - - - - - - 0 - 0 - - - - - 352 - 0 - - - - - 10 - - - - color: rgb(238, 238, 236); -background-color: rgb(79, 30, 109) - - - 54 : [0x3600] : FP Flows - - - Qt::AlignCenter - - - - - - - Send - - - - - - - reset - - - - - @@ -101,28 +49,7 @@ - - - - - - 180 - 0 - - - - Water Inlet Temperature (P7) - - - - - - - 500.000000000000000 - - - - + @@ -149,51 +76,67 @@ - - - - - - 180 - 0 - - - - RO Filter Outlet Temperature (P16) - - - - - - - 100.000000000000000 - - - - + - - - - Qt::Vertical + + + + 2 - - - 20 - 40 - - - + + + + + 0 + 0 + + + + + 352 + 0 + + + + + 10 + + + + color: rgb(238, 238, 236); +background-color: rgb(79, 30, 109) + + + 54 : [0x3600] : FP Flows + + + Qt::AlignCenter + + + + + + + Send + + + + + + + reset + + + + dsbP7WaterInletFlow dsbP16ROOutletFlow - dsbP7WaterInletTemp - dsbP16ROOutletTemp tbSend tbReset Index: FP_Flow/loader.py =================================================================== diff -u -r639e60ab542d69ff6c7b489c0e86bef287519c32 -rd7132e0ca83f0ad1f6ecc526544f84ed6c63c8b7 --- FP_Flow/loader.py (.../loader.py) (revision 639e60ab542d69ff6c7b489c0e86bef287519c32) +++ FP_Flow/loader.py (.../loader.py) (revision d7132e0ca83f0ad1f6ecc526544f84ed6c63c8b7) @@ -34,9 +34,8 @@ self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' ) self.dsbP7WaterInletFlow = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP7WaterInletFlow' ) - self.dsbP7WaterInletTemp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP7WaterInletTemp' ) self.dsbP16ROOutletFlow = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP16ROOutletFlow' ) - self.dsbP16ROOutletTemp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbP16ROOutletTemp' ) + def _init_connections(self): """ @@ -53,9 +52,7 @@ :return: none """ self.dsbP7WaterInletFlow .setValue(0) - self.dsbP7WaterInletTemp .setValue(0) self.dsbP16ROOutletFlow .setValue(0) - self.dsbP16ROOutletTemp .setValue(0) @Slot() def do_fp_flow(self): @@ -65,12 +62,8 @@ """ p7Flow = self.dsbP7WaterInletFlow .value() p16Flow = self.dsbP16ROOutletFlow .value() - p7Temp = self.dsbP7WaterInletTemp .value() - p16Temp = self.dsbP16ROOutletTemp .value() self.fp_interface.fp_flow_sensors( p7Flow , - p16Flow , - p7Temp , - p16Temp + p16Flow ) \ No newline at end of file Index: FP_Pressure/interface.ui =================================================================== diff -u -r736bbf411c3a020f656991ae826ed4b2389dfe81 -rd7132e0ca83f0ad1f6ecc526544f84ed6c63c8b7 --- FP_Pressure/interface.ui (.../interface.ui) (revision 736bbf411c3a020f656991ae826ed4b2389dfe81) +++ FP_Pressure/interface.ui (.../interface.ui) (revision d7132e0ca83f0ad1f6ecc526544f84ed6c63c8b7) @@ -6,8 +6,8 @@ 0 0 - 1000 - 290 + 474 + 216 @@ -18,7 +18,7 @@ - 1000 + 0 0 @@ -53,7 +53,7 @@ - 352 + 0 0 @@ -92,63 +92,67 @@ - - + + - + - 220 + 0 0 - Before RO pump Pressure (X1) + P13 - + - - + + - + - 220 + 0 0 - RO Concentrate Drop (X3) + M3 - + + + 10000.000000000000000 + + - - + + - + - 230 + 0 0 - Before RO Filter (P13) + P8 - + @@ -158,151 +162,50 @@ - 230 + 0 0 - After RO Filter (P17) + P46 - + - - + + - + - 220 + 0 0 - RO Concentrate (X2) + P17 - + - - - - - - - 220 - 0 - - - - Pressure Drain Drop (X4) - - - - - - - - - - - - - - - 230 - 0 - - - - Before Inlet Conductivity (P8) - - - - - - - - - - - - - - - 230 - 0 - - - - After Pressure Regulator (M3) - - - - - - - - - - - - - - - 230 - 0 - - - - Before Pressure Regulator (M1) - - - - - - - 10000.000000000000000 - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - dsbBeforePressureRegulator - dsbAfterPressureRegulator - dsbBeforeInletConductivity - dsbBeforeROFilter - dsbAfterROFilter - dsbBeforeROPump - dsbROConcentrate - dsbROConcentrateDrop - dsbDrainDrop + dsbM3Pressure + dsbP8Pressure + dsbP13Pressure + dsbP17Pressure + dsbP46Pressure tbSend tbReset 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 Index: FP_Temperature/interface.ui =================================================================== diff -u -r639e60ab542d69ff6c7b489c0e86bef287519c32 -rd7132e0ca83f0ad1f6ecc526544f84ed6c63c8b7 --- FP_Temperature/interface.ui (.../interface.ui) (revision 639e60ab542d69ff6c7b489c0e86bef287519c32) +++ FP_Temperature/interface.ui (.../interface.ui) (revision d7132e0ca83f0ad1f6ecc526544f84ed6c63c8b7) @@ -6,8 +6,8 @@ 0 0 - 1043 - 466 + 334 + 252 @@ -26,58 +26,6 @@ &7 FP info/&8 Temperatures - - - - 2 - - - - - - 0 - 0 - - - - - 352 - 0 - - - - - 10 - - - - color: rgb(238, 238, 236); -background-color: rgb(49, 6, 77) - - - 57 : [0x3900] : FP Temperatures - - - Qt::AlignCenter - - - - - - - Send - - - - - - - reset - - - - - @@ -86,305 +34,261 @@ - 230 + 0 0 - Inlet conductivity (P10) + M3 - + 10000.000000000000000 - - - - - - - 230 - 0 - - - - Before RO Pump (X1) - - - - - - - 10000.000000000000000 - - - - - - 230 + 0 0 - Outlet Conductivity (P19) + P8 - + 10000.000000000000000 - - - - - - - 230 - 0 - - - - RO Concentrate (X2) - - - - - - - 10000.000000000000000 - - - - - - 230 + 0 0 - Before Pressure Regulator (M1) + P13 - + 10000.000000000000000 - - + + - + - 230 + 0 0 - RO Concentrate Pump (X3) + P17 - + 10000.000000000000000 - - + + - + - 230 + 0 0 - After Pressure Regulator (M3) + P46 - + 10000.000000000000000 - - + + - - - - 230 - 0 - - - - Drain Drop (X4) - - + + + + + + 0 + 0 + + + + P16 Internal + + + + + + + 10000.000000000000000 + + + + - - - - 10000.000000000000000 - - - - - + + - + - 230 + 0 0 - Before Inlet Conductivity (P8) + P10 - + 10000.000000000000000 - - + + - + - 230 + 0 0 - RO Inlet (P7) + P7 Internal - + 10000.000000000000000 - - + + - + - 230 + 0 0 - Before RO Filter (P13) + P16 - + 10000.000000000000000 - - + + - + - 230 + 0 0 - RO Outlet (P16) + P7 - + 10000.000000000000000 - + - 230 + 0 0 - After RO Filter (P17) + P19 - + 10000.000000000000000 @@ -394,35 +298,72 @@ - - - - Qt::Vertical + + + + 2 - - - 20 - 40 - - - + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 10 + + + + color: rgb(238, 238, 236); +background-color: rgb(49, 6, 77) + + + 57 : [0x3900] : FP Temperatures + + + Qt::AlignCenter + + + + + + + Send + + + + + + + reset + + + + - dsbP10InletConductivity - dsbP19OutletConductivity - dsbM1BeforePressureRegulator - dsbM3AfterPressureRegulator - dsbP8BeforeInletConductivity - dsbP13ROFilter - dsbP17AfterROFilter - dsbX1BeforeROPump - dsbX2ROConcentrate - dsbX3ROConcentratePump - dsbX4DrainDrop - dsbP7ROInlet - dsbP16ROOutlet + dsbM3Temp + dsbP8Temp + dsbP13Temp + dsbP17Temp + dsbP46Temp + dsbP10Temp + dsbP19Temp + dsbP7Temp + dsbP16Temp + dsbP7InternalTemp + dsbP16InternalTemp tbSend tbReset 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