Index: DD_BloodLeak/interface.ui
===================================================================
diff -u -r767c7999a57c41783d0269ec5ba296caf5278295 -r284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a
--- DD_BloodLeak/interface.ui (.../interface.ui) (revision 767c7999a57c41783d0269ec5ba296caf5278295)
+++ DD_BloodLeak/interface.ui (.../interface.ui) (revision 284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a)
@@ -23,7 +23,7 @@
- &6 DD info/&3 DD Blood Leak
+ &6 DD info/&3 Blood Leak
Index: DD_Levels/interface.ui
===================================================================
diff -u -r767c7999a57c41783d0269ec5ba296caf5278295 -r284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a
--- DD_Levels/interface.ui (.../interface.ui) (revision 767c7999a57c41783d0269ec5ba296caf5278295)
+++ DD_Levels/interface.ui (.../interface.ui) (revision 284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a)
@@ -7,7 +7,7 @@
0
0
476
- 149
+ 226
@@ -18,20 +18,14 @@
- 476
+ 200
250
- &6 DD info/&4 DD Levels
+ &6 DD info/&4 Levels
-
- 4
-
-
- 0
-
-
-
@@ -49,7 +43,7 @@
- 352
+ 0
0
@@ -105,12 +99,12 @@
-
- Floater Level (D6)
+ D46
-
-
+
1000
@@ -119,12 +113,12 @@
-
- Bicarb Level (D63)
+ D63
-
-
+
1000
@@ -133,42 +127,63 @@
-
- Spent Dialysate Level (D43)
+ D98
-
-
+
1000
+ -
+
+
+ D6
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 1000
+
+
+
+ -
+
+
+ bicarb
+
+
+
+ -
+
+
+ 1000
+
+
+
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- sbFloaterLevel
- sbBicarbLevel
- sbSpentDialysateLevel
+ sbd46Level
+ sbd63Level
+ sbd98Level
tbSend
tbReset
Index: DD_Levels/loader.py
===================================================================
diff -u -rae3a21a4b37161a8bfa0a3fff23470d4ac198f5f -r284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a
--- DD_Levels/loader.py (.../loader.py) (revision ae3a21a4b37161a8bfa0a3fff23470d4ac198f5f)
+++ DD_Levels/loader.py (.../loader.py) (revision 284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a)
@@ -33,9 +33,11 @@
self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' )
self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' )
- self.sbFloaterLevel = self.find_widget(QtWidgets.QSpinBox , 'sbFloaterLevel' )
- self.sbBicarbLevel = self.find_widget(QtWidgets.QSpinBox , 'sbBicarbLevel' )
- self.sbSpentDialysateLevel = self.find_widget(QtWidgets.QSpinBox , 'sbSpentDialysateLevel' )
+ self.sbd46Level = self.find_widget(QtWidgets.QSpinBox , 'sbd46Level' )
+ self.sbd63Level = self.find_widget(QtWidgets.QSpinBox , 'sbd63Level' )
+ self.sbd98Level = self.find_widget(QtWidgets.QSpinBox , 'sbd98Level' )
+ self.sbd6Level = self.find_widget(QtWidgets.QSpinBox , 'sbd6Level' )
+ self.sbbicardLevel = self.find_widget(QtWidgets.QSpinBox , 'sbbicardLevel' )
def _init_connections(self):
"""
@@ -51,22 +53,23 @@
initializes the widgets' properties
:return: none
"""
- self.sbFloaterLevel .setValue(0)
- self.sbBicarbLevel .setValue(0)
- self.sbSpentDialysateLevel .setValue(0)
+ self.sbd46Level .setValue(0)
+ self.sbd63Level .setValue(0)
+ self.sbd98Level .setValue(0)
+ self.sbd6Level .setValue(0)
+ self.sbbicardLevel .setValue(0)
@Slot()
def do_dd_level_sensors(self):
"""
the slot for dd level sensor change
:return: none
"""
- d6Level = self.sbFloaterLevel .value()
- d63Level = self.sbBicarbLevel .value()
- d46Level = self.sbSpentDialysateLevel .value()
self.dd_interface.dd_levels(
- d6Level ,
- d63Level ,
- d46Level
+ self.sbd46Level .value() ,
+ self.sbd63Level .value() ,
+ self.sbd98Level .value() ,
+ self.sbd6Level .value() ,
+ self.sbbicardLevel .value()
)
\ No newline at end of file
Index: DD_Pressure/interface.ui
===================================================================
diff -u -r767c7999a57c41783d0269ec5ba296caf5278295 -r284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a
--- DD_Pressure/interface.ui (.../interface.ui) (revision 767c7999a57c41783d0269ec5ba296caf5278295)
+++ DD_Pressure/interface.ui (.../interface.ui) (revision 284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a)
@@ -7,7 +7,7 @@
0
0
1000
- 290
+ 148
@@ -53,7 +53,7 @@
- 352
+ 0
0
@@ -67,7 +67,7 @@
background-color: rgb(200, 115, 17);
- 36 : [0x2400] : DD Pressures
+ 28 : [0x1C00] : DD Pressures
Qt::AlignCenter
@@ -92,43 +92,43 @@
-
-
-
-
+
-
+
-
-
+
- 230
+ 0
0
- Spent Dialysate pressure (D51)
+ D18
-
-
+
- -
-
+
-
+
-
-
+
- 220
+ 0
0
- Transmembrane Temp (D41)
+ D87
-
-
+
@@ -138,276 +138,95 @@
- 230
+ 0
0
- Hydraulics Outlet pressure (D9)
+ D41
-
-
+
- -
-
+
-
+
-
-
+
- 220
+ 0
0
- Spent Dialysate Temp (D51)
+ D66
-
-
+
- -
-
-
-
-
-
-
- 220
- 0
-
-
-
- Fresh Dialysate Temp (D18)
-
-
-
- -
-
-
-
-
-
-
- 230
+ 0
0
- Water Inlet Input pressure (M1)
+ D9
-
-
+
10000.000000000000000
- -
-
-
-
-
-
-
- 220
- 0
-
-
-
- Water Inlet Output Temp (M3)
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
- 220
- 0
-
-
-
- Water Inlet Input Temp (M1)
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
- 220
- 0
-
-
-
- Hydraulics Outlet Temp (D9)
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
- 220
- 0
-
-
-
- Bicarb bag Temp (D66)
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
- 230
- 0
-
-
-
- Fresh Dialysate pressure (D18)
-
-
-
- -
-
-
-
-
-
-
- 230
+ 0
0
- Water Inlet Output pressure (M3)
+ D51
-
-
+
- -
-
-
-
-
-
-
- 230
- 0
-
-
-
- Transmembrane pressure (D41)
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
- 230
- 0
-
-
-
- Bicarb bag pressure (D66)
-
-
-
- -
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- dsbWaterInletInPressure
- dsbWaterInletoutpressure
- dsbHydrolyicsOutletPressure
- dsbBicarbBagPressure
- dsbSpentDialysatePressure
- dsbFreshDialysatePressure
- dsbTMP
- dsbWaterInletInTemp
- dsbWaterInletoutTemp
- dsbHydrolyicsOutletTemp
- dsbBicarbBagTemp
- dsbSpentDialysateTemp
- dsbFreshDialysateTemp
- dsbTMPTemp
+ dsbD9Pressure
+ dsbD51Pressure
+ dsbD41Pressure
+ dsbD66Pressure
+ dsbD18Pressure
+ dsbD87Pressure
tbSend
tbReset
Index: DD_Pressure/loader.py
===================================================================
diff -u -rae3a21a4b37161a8bfa0a3fff23470d4ac198f5f -r284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a
--- DD_Pressure/loader.py (.../loader.py) (revision ae3a21a4b37161a8bfa0a3fff23470d4ac198f5f)
+++ DD_Pressure/loader.py (.../loader.py) (revision 284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a)
@@ -33,21 +33,14 @@
self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' )
self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' )
- self.dsbWaterInletInPressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbWaterInletInPressure' )
- self.dsbWaterInletoutpressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbWaterInletoutpressure' )
- self.dsbHydrolyicsOutletPressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbHydrolyicsOutletPressure' )
- self.dsbBicarbBagPressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbBicarbBagPressure' )
- self.dsbSpentDialysatePressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbSpentDialysatePressure' )
- self.dsbFreshDialysatePressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbFreshDialysatePressure' )
- self.dsbTMP = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbTMP' )
- self.dsbWaterInletInTemp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbWaterInletInTemp' )
- self.dsbWaterInletoutTemp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbWaterInletoutTemp' )
- self.dsbHydrolyicsOutletTemp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbHydrolyicsOutletTemp' )
- self.dsbBicarbBagTemp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbBicarbBagTemp' )
- self.dsbSpentDialysateTemp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbSpentDialysateTemp' )
- self.dsbFreshDialysateTemp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbFreshDialysateTemp' )
- self.dsbTMPTemp = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbTMPTemp' )
+ self.dsbD9Pressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD9Pressure' )
+ self.dsbD66Pressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD66Pressure' )
+ self.dsbD51Pressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD51Pressure' )
+ self.dsbD18Pressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD18Pressure' )
+ self.dsbD41Pressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD41Pressure' )
+ self.dsbD87Pressure = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD87Pressure' )
+
def _init_connections(self):
"""
initializes the widgets connections
@@ -62,56 +55,25 @@
initializes the widgets' properties
:return: none
"""
- self.dsbWaterInletInPressure .setValue(0)
- self.dsbWaterInletoutpressure .setValue(0)
- self.dsbHydrolyicsOutletPressure .setValue(0)
- self.dsbBicarbBagPressure .setValue(0)
- self.dsbSpentDialysatePressure .setValue(0)
- self.dsbFreshDialysatePressure .setValue(0)
- self.dsbTMP .setValue(0)
- self.dsbWaterInletInTemp .setValue(0)
- self.dsbWaterInletoutTemp .setValue(0)
- self.dsbHydrolyicsOutletTemp .setValue(0)
- self.dsbBicarbBagTemp .setValue(0)
- self.dsbSpentDialysateTemp .setValue(0)
- self.dsbFreshDialysateTemp .setValue(0)
- self.dsbTMPTemp .setValue(0)
+ self.dsbD9Pressure .setValue(0)
+ self.dsbD66Pressure .setValue(0)
+ self.dsbD51Pressure .setValue(0)
+ self.dsbD18Pressure .setValue(0)
+ self.dsbD41Pressure .setValue(0)
+ self.dsbD87Pressure .setValue(0)
+
@Slot()
def do_dd_pressure(self):
"""
the slot for dd pressure change
:return: none
- """
-
- m1Pressure = self.dsbWaterInletInPressure .value()
- m3Pressure = self.dsbWaterInletoutpressure .value()
- d9Pressure = self.dsbHydrolyicsOutletPressure .value()
- d66Pressure = self.dsbBicarbBagPressure .value()
- d51Pressure = self.dsbSpentDialysatePressure .value()
- d18Pressure = self.dsbFreshDialysatePressure .value()
- d41Pressure = self.dsbTMP .value()
- m1PresTemp = self.dsbWaterInletInTemp .value()
- m3PresTemp = self.dsbWaterInletoutTemp .value()
- d9PresTemp = self.dsbHydrolyicsOutletTemp .value()
- d66PresTemp = self.dsbBicarbBagTemp .value()
- d51PresTemp = self.dsbSpentDialysateTemp .value()
- d18PresTemp = self.dsbFreshDialysateTemp .value()
- d41PresTemp = self.dsbTMPTemp .value()
-
+ """
self.dd_interface.dd_pressure(
- m1Pressure ,
- m3Pressure ,
- d9Pressure ,
- d66Pressure ,
- d51Pressure ,
- d18Pressure ,
- d41Pressure ,
- m1PresTemp ,
- m3PresTemp ,
- d9PresTemp ,
- d66PresTemp ,
- d51PresTemp ,
- d18PresTemp ,
- d41PresTemp
+ self.dsbD9Pressure .value() ,
+ self.dsbD66Pressure .value() ,
+ self.dsbD51Pressure .value() ,
+ self.dsbD18Pressure .value() ,
+ self.dsbD41Pressure .value() ,
+ self.dsbD87Pressure .value()
)
\ No newline at end of file
Index: DD_Temperature/interface.ui
===================================================================
diff -u -r767c7999a57c41783d0269ec5ba296caf5278295 -r284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a
--- DD_Temperature/interface.ui (.../interface.ui) (revision 767c7999a57c41783d0269ec5ba296caf5278295)
+++ DD_Temperature/interface.ui (.../interface.ui) (revision 284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a)
@@ -6,8 +6,8 @@
0
0
- 1043
- 333
+ 1016
+ 318
@@ -80,143 +80,143 @@
-
-
-
-
+
-
+
-
-
+
- 230
+ 0
0
- Inlet heat Exchanger (D1)
+ D44 Cond
-
-
+
10000.000000000000000
- -
-
+
-
+
-
-
+
- 230
+ 0
0
- Barometric Temperature
+ D50 Avg
-
-
+
10000.000000000000000
- -
-
+
-
+
-
-
+
- 230
+ 0
0
- Conductivity Temp (D75)
+ D75 Cond
-
-
+
10000.000000000000000
- -
-
+
-
+
-
-
+
- 230
+ 0
0
- Outlet heat exchanger (X6)
+ D51 Press Avg
-
-
+
10000.000000000000000
- -
-
+
-
+
-
-
+
- 230
+ 0
0
- Conductivity Temp (D16)
+ D30 Avg
-
-
+
10000.000000000000000
- -
-
+
-
+
-
-
+
- 230
+ 0
0
- Moving Average (D4)
+ D30 Cond
-
-
+
10000.000000000000000
@@ -230,113 +230,113 @@
- 230
+ 0
0
- Hydraulics Primary (D4)
+ D16 Cond
-
-
+
10000.000000000000000
- -
-
+
-
+
-
-
+
- 230
+ 0
0
- Conductivity Temp (D28)
+ Board Temperature
-
-
+
10000.000000000000000
- -
-
+
-
+
-
-
+
- 230
+ 0
0
- Moving Average (D50)
+ D1 Tmp
-
-
+
10000.000000000000000
- -
-
+
-
+
-
-
+
- 230
+ 0
0
- Trimmer Heater (D50)
+ D28 Avg
-
-
+
10000.000000000000000
- -
-
+
-
+
-
-
+
- 230
+ 0
0
- Conductivity Temp (D30)
+ D78 Tmp
-
-
+
10000.000000000000000
@@ -350,129 +350,308 @@
- 230
+ 0
0
- Moving Average (D28)
+ D4 Avg
-
-
+
10000.000000000000000
- -
-
+
-
+
-
-
+
- 230
+ 0
0
- Board Temperature
+ D28 Cond
-
-
+
10000.000000000000000
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ D50 Temp
+
+
+
+ -
+
+
+ 10000.000000000000000
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ D78 Avg
+
+
+
+ -
+
+
+ 10000.000000000000000
+
+
+
+
+
-
-
- 230
+ 0
0
- Conductivity Temp (D44)
+ D99 Avf
-
-
+
10000.000000000000000
- -
-
+
-
+
-
-
+
- 230
+ 0
0
- Moving Average (D30)
+ D99 Tmp
-
-
+
10000.000000000000000
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ D4 Tmp
+
+
+
+ -
+
+
+ 10000.000000000000000
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ D87 Press Avg
+
+
+
+ -
+
+
+ 10000.000000000000000
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ D9 Press Avg
+
+
+
+ -
+
+
+ 10000.000000000000000
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ D18 Press Avg
+
+
+
+ -
+
+
+ 10000.000000000000000
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ D66 Press Avg
+
+
+
+ -
+
+
+ 10000.000000000000000
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ D41 Press Avg
+
+
+
+ -
+
+
+ 10000.000000000000000
+
+
+
+
+
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- dsbD1InletheatExchanger
- dsbX6OutletHeatExchanger
- dsbD4Hydraulics
- dsbD50Trimmerheater
- dsbBoard
- dsbBarometric
- dsbD16
- dsbD28
- dsbD30
- dsbD44
- dsbD75
- dsbD4MovingAverage
+ dsbD1Temperature
+ dsbD50Temperature
+ dsbD16Conductivity
+ dsbD44Conductivity
dsbD50MovingAverage
+ dsbD78Temperature
+ dsbD99Temperature
+ dsbD28Conductivity
+ dsbD75Conductivity
+ dsbD99MovingAverage
+ dsbD4Temperature
+ dsbBoardTemperature
+ dsbD30Conductivity
+ dsbD4MovingAverage
dsbD28MovingAverage
- dsbD30MovingAverage
tbSend
tbReset
Index: DD_Temperature/loader.py
===================================================================
diff -u -rae3a21a4b37161a8bfa0a3fff23470d4ac198f5f -r284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a
--- DD_Temperature/loader.py (.../loader.py) (revision ae3a21a4b37161a8bfa0a3fff23470d4ac198f5f)
+++ DD_Temperature/loader.py (.../loader.py) (revision 284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a)
@@ -33,21 +33,29 @@
self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' )
self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' )
- self.dsbD1InletheatExchanger = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD1InletheatExchanger' )
- self.dsbX6OutletHeatExchanger = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbX6OutletHeatExchanger' )
- self.dsbD4Hydraulics = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD4Hydraulics' )
- self.dsbD50Trimmerheater = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD50Trimmerheater' )
- self.dsbBoard = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbBoard' )
- self.dsbBarometric = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbBarometric' )
- self.dsbD16 = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD16' )
- self.dsbD28 = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD28' )
- self.dsbD30 = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD30' )
- self.dsbD44 = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD44' )
- self.dsbD75 = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD75' )
- self.dsbD4MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD4MovingAverage' )
- self.dsbD50MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD50MovingAverage' )
- self.dsbD28MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD28MovingAverage' )
- self.dsbD30MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD30MovingAverage' )
+ self.dsbD1Temperature = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD1Temperature' )
+ self.dsbD78Temperature = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD78Temperature' )
+ self.dsbD4Temperature = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD4Temperature' )
+ self.dsbD50Temperature = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD50Temperature' )
+ self.dsbD99Temperature = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD99Temperature' )
+ self.dsbBoardTemperature = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbBoardTemperature' )
+ self.dsbD16Conductivity = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD16Conductivity' )
+ self.dsbD28Conductivity = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD28Conductivity' )
+ self.dsbD30Conductivity = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD30Conductivity' )
+ self.dsbD44Conductivity = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD44Conductivity' )
+ self.dsbD75Conductivity = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD75Conductivity' )
+ self.dsbD4MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD4MovingAverage' )
+ self.dsbD50MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD50MovingAverage' )
+ self.dsbD99MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD99MovingAverage' )
+ self.dsbD28MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD28MovingAverage' )
+ self.dsbD30MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD30MovingAverage' )
+ self.dsbD78MovingAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD78MovingAverage' )
+ self.dsbD9PressureAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD9PressureAverage' )
+ self.dsbD66PressureAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD66PressureAverage' )
+ self.dsbD51PressureAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD51PressureAverage' )
+ self.dsbD18PressureAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD18PressureAverage' )
+ self.dsbD41PressureAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD41PressureAverage' )
+ self.dsbD87PressureAverage = self.find_widget(QtWidgets.QDoubleSpinBox , 'dsbD87PressureAverage' )
def _init_connections(self):
"""
@@ -63,59 +71,59 @@
initializes the widgets' properties
:return: none
"""
- self.dsbD1InletheatExchanger .setValue(0)
- self.dsbX6OutletHeatExchanger .setValue(0)
- self.dsbD4Hydraulics .setValue(0)
- self.dsbD50Trimmerheater .setValue(0)
- self.dsbBoard .setValue(0)
- self.dsbBarometric .setValue(0)
- self.dsbD16 .setValue(0)
- self.dsbD28 .setValue(0)
- self.dsbD30 .setValue(0)
- self.dsbD44 .setValue(0)
- self.dsbD75 .setValue(0)
- self.dsbD4MovingAverage .setValue(0)
- self.dsbD50MovingAverage .setValue(0)
- self.dsbD28MovingAverage .setValue(0)
- self.dsbD30MovingAverage .setValue(0)
+ self.dsbD1Temperature .setValue(0)
+ self.dsbD78Temperature .setValue(0)
+ self.dsbD4Temperature .setValue(0)
+ self.dsbD50Temperature .setValue(0)
+ self.dsbD99Temperature .setValue(0)
+ self.dsbBoardTemperature .setValue(0)
+ self.dsbD16Conductivity .setValue(0)
+ self.dsbD28Conductivity .setValue(0)
+ self.dsbD30Conductivity .setValue(0)
+ self.dsbD44Conductivity .setValue(0)
+ self.dsbD75Conductivity .setValue(0)
+ self.dsbD4MovingAverage .setValue(0)
+ self.dsbD50MovingAverage .setValue(0)
+ self.dsbD99MovingAverage .setValue(0)
+ self.dsbD28MovingAverage .setValue(0)
+ self.dsbD30MovingAverage .setValue(0)
+ self.dsbD78MovingAverage .setValue(0)
+ self.dsbD9PressureAverage .setValue(0)
+ self.dsbD66PressureAverage .setValue(0)
+ self.dsbD51PressureAverage .setValue(0)
+ self.dsbD18PressureAverage .setValue(0)
+ self.dsbD41PressureAverage .setValue(0)
+ self.dsbD87PressureAverage .setValue(0)
@Slot()
def do_dd_temperature(self):
"""
the slot for dd temperature change
:return: none
"""
-
- d1Temp = self.dsbD1InletheatExchanger .value()
- x6Temp = self.dsbX6OutletHeatExchanger .value()
- d4Temp = self.dsbD4Hydraulics .value()
- d50Temp = self.dsbD50Trimmerheater .value()
- boardTemp = self.dsbBoard .value()
- baroTemp = self.dsbBarometric .value()
- d16CondTemp = self.dsbD16 .value()
- d28CondTemp = self.dsbD28 .value()
- d30CondTemp = self.dsbD30 .value()
- d44CondTemp = self.dsbD44 .value()
- d75CondTemp = self.dsbD75 .value()
- d4AvgTemp = self.dsbD4MovingAverage .value()
- d50AvgTemp = self.dsbD50MovingAverage .value()
- d28AvgTemp = self.dsbD28MovingAverage .value()
- d30AvgTemp = self.dsbD30MovingAverage .value()
self.dd_interface.dd_temperature(
- d1Temp ,
- x6Temp ,
- d4Temp ,
- d50Temp ,
- boardTemp ,
- baroTemp ,
- d16CondTemp ,
- d28CondTemp ,
- d30CondTemp ,
- d44CondTemp ,
- d75CondTemp ,
- d4AvgTemp ,
- d50AvgTemp ,
- d28AvgTemp ,
- d30AvgTemp
+ self.dsbD1Temperature .value(),
+ self.dsbD78Temperature .value(),
+ self.dsbD4Temperature .value(),
+ self.dsbD50Temperature .value(),
+ self.dsbD99Temperature .value(),
+ self.dsbBoardTemperature .value(),
+ self.dsbD16Conductivity .value(),
+ self.dsbD28Conductivity .value(),
+ self.dsbD30Conductivity .value(),
+ self.dsbD44Conductivity .value(),
+ self.dsbD75Conductivity .value(),
+ self.dsbD4MovingAverage .value(),
+ self.dsbD50MovingAverage .value(),
+ self.dsbD99MovingAverage .value(),
+ self.dsbD28MovingAverage .value(),
+ self.dsbD30MovingAverage .value(),
+ self.dsbD78MovingAverage .value(),
+ self.dsbD9PressureAverage .value(),
+ self.dsbD66PressureAverage.value(),
+ self.dsbD51PressureAverage.value(),
+ self.dsbD18PressureAverage.value(),
+ self.dsbD41PressureAverage.value(),
+ self.dsbD87PressureAverage.value()
)
\ No newline at end of file