Index: MainTreatmentData/interface.ui
===================================================================
diff -u -r45e91bf76f061c2f9cffd9c96ca338437a27b8e5 -r297ab9b42e421f80cbc5148cc7c03c0d0758822d
--- MainTreatmentData/interface.ui (.../interface.ui) (revision 45e91bf76f061c2f9cffd9c96ca338437a27b8e5)
+++ MainTreatmentData/interface.ui (.../interface.ui) (revision 297ab9b42e421f80cbc5148cc7c03c0d0758822d)
@@ -20,52 +20,10 @@
&3 Treatment/&1 Main treatment
- -
-
+
-
+
-
-
-
-
-
-
-
- 10
-
-
-
- color: rgb(238, 238, 236);
-background-color: rgb(92, 53, 102);
-
-
-
- Main Treatment Data
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- send
-
-
-
- -
-
-
- reset
-
-
-
-
-
-
-
- -
-
-
-
-
+
180
@@ -74,69 +32,17 @@
- 50
- 16777215
-
-
-
- State
-
-
- Qt::AlignJustify|Qt::AlignVCenter
-
-
-
- -
-
-
-
- 50
- 16777215
-
-
-
- 1000
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
-
-
-
180
- 0
-
-
-
-
- 180
16777215
- Current Delivered Volume
+ Cumulative Volume
-
-
+
10000
@@ -146,7 +52,7 @@
-
-
+
50
@@ -160,13 +66,6 @@
- -
-
-
- Saline Bolus Req[0x5E00]
-
-
-
-
-
@@ -207,6 +106,19 @@
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 0
+
+
+
+
-
@@ -241,23 +153,30 @@
- -
-
+
-
+
Qt::Vertical
20
- 0
+ 40
- -
-
+
-
+
+
+ Saline Bolus Req[0x5E00]
+
+
+
+ -
+
-
-
+
0
@@ -270,50 +189,60 @@
0
+
+
+ 16777215
+ 16777215
+
+
10
color: rgb(238, 238, 236);
-background-color: rgb(92, 53, 102);
+background-color: rgb(92, 53, 102);
+
- 62 : [0x3E00] : Ultrafiltration
+ 59 : [0x3B00] : Treament Time
Qt::AlignCenter
-
-
+
-
-
+
180
0
- Set Volume L
+ TX Duration
-
-
+
- 1000
+ 480
+
+ 15
+
Qt::Horizontal
-
-
+
50
@@ -328,32 +257,32 @@
-
-
+
-
-
+
180
0
- Target Rate L/Hr
+ Elapsed Time
-
-
+
- 1000
+ 480
Qt::Horizontal
-
-
+
50
@@ -368,134 +297,109 @@
-
-
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 60
+
+
+
+
+
+
+ -
+
+
-
+
-
-
-
-
- 180
- 0
-
+
+
+
+ 10
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(92, 53, 102);
+
+
- Volume Delivered L
+ Main Treatment Data
-
-
- -
-
-
- 200
+
+ Qt::AlignCenter
-
- Qt::Horizontal
-
-
-
-
-
- 50
- 0
-
-
+
- 0
+ send
-
-
- -
-
-
-
-
-
- 180
- 0
-
-
+
- State
+ reset
- -
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
+
+
+ -
+
-
-
-
-
-
-
-
- 180
- 0
-
-
-
- Max Delivery
-
-
-
- -
-
-
- 20.000000000000000
-
-
- 2.000000000000000
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
+
+
+
+ 180
+ 0
+
+
+
+
+ 180
+ 16777215
+
+
+
+ Current Delivered Volume
+
+
-
-
+
+
+ 10000
+
- Qt::Vertical
+ Qt::Horizontal
-
+
+
+ -
+
+
- 20
- 40
+ 50
+ 0
-
+
+ 0
+
+
- -
+
-
-
@@ -622,10 +526,10 @@
- -
-
+
-
+
-
-
+
0
@@ -638,60 +542,90 @@
0
-
-
- 16777215
- 16777215
-
-
10
color: rgb(238, 238, 236);
-background-color: rgb(92, 53, 102);
-
+background-color: rgb(92, 53, 102);
- 59 : [0x3B00] : Treament Time
+ 62 : [0x3E00] : Ultrafiltration
Qt::AlignCenter
-
-
+
-
-
+
180
0
- TX Duration
+ Set Volume L
-
-
+
- 480
+ 1000
-
- 15
+
+ Qt::Horizontal
+
+
+ -
+
+
+
+ 50
+ 0
+
+
+
+ 0
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 180
+ 0
+
+
+
+ Target Rate L/Hr
+
+
+
+ -
+
+
+ 1000
+
Qt::Horizontal
-
-
+
50
@@ -706,32 +640,32 @@
-
-
+
-
-
+
180
0
- Elapsed Time
+ Volume Delivered L
-
-
+
- 480
+ 200
Qt::Horizontal
-
-
+
50
@@ -746,80 +680,94 @@
-
-
+
+
-
+
+
+
+ 180
+ 0
+
+
+
+ State
+
+
+
+ -
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 180
+ 0
+
+
+
+ Max Delivery
+
+
+
+ -
+
+
+ 20.000000000000000
+
+
+ 2.000000000000000
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
Qt::Vertical
20
- 60
+ 40
- -
-
-
-
-
-
-
- 180
- 0
-
-
-
-
- 180
- 16777215
-
-
-
- Cumulative Volume
-
-
-
- -
-
-
- 10000
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
- 50
- 0
-
-
-
- 0
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
+
-
false
@@ -844,7 +792,6 @@
TargetVolumeSlider
CumulativeVolumeSlider
SalineCurrDeliveredVolumeSlider
- SalineStatespinBox
UFSetVolSlider
UFRateSlider
UFVolDelSlider
Index: MainTreatmentData/loader.py
===================================================================
diff -u -r757c6c0434016f148e574a5c7e94d97738cdfc2d -r297ab9b42e421f80cbc5148cc7c03c0d0758822d
--- MainTreatmentData/loader.py (.../loader.py) (revision 757c6c0434016f148e574a5c7e94d97738cdfc2d)
+++ MainTreatmentData/loader.py (.../loader.py) (revision 297ab9b42e421f80cbc5148cc7c03c0d0758822d)
@@ -51,7 +51,6 @@
self.saline_tgt_vol = self.find_widget(QtWidgets.QSlider , 'TargetVolumeSlider' )
self.saline_cum_vol = self.find_widget(QtWidgets.QSlider , 'CumulativeVolumeSlider' )
self.saline_bol_del = self.find_widget(QtWidgets.QSlider , 'SalineCurrDeliveredVolumeSlider' )
- self.saline_state = self.find_widget(QtWidgets.QSpinBox , 'SalineStatespinBox' )
self.UF_set_vol = self.find_widget(QtWidgets.QSlider , 'UFSetVolSlider' )
self.UF_tgt_rate = self.find_widget(QtWidgets.QSlider , 'UFRateSlider' )
@@ -86,7 +85,6 @@
self.saline_tgt_vol .valueChanged.connect(self.do_saline_data)
self.saline_cum_vol .valueChanged.connect(self.do_saline_data)
self.saline_bol_del .valueChanged.connect(self.do_saline_data)
- self.saline_state .valueChanged.connect(self.do_saline_data)
self.UF_set_vol .valueChanged.connect(self.do_uf_data)
self.UF_tgt_rate .valueChanged.connect(self.do_uf_data)
@@ -121,7 +119,6 @@
self.saline_tgt_vol .setValue(0)
self.saline_cum_vol .setValue(0)
self.saline_bol_del .setValue(0)
- self.saline_state .setValue(0)
self.UF_set_vol .setValue(0)
self.UF_tgt_rate .setValue(0)
@@ -154,13 +151,12 @@
target_volume = self.saline_tgt_vol.value()
cumulative_volume = self.saline_cum_vol.value()
bolus_volume = self.saline_bol_del.value()
- state = self.saline_state .value()
self.td_interface.td_saline(
target_volume ,
cumulative_volume ,
bolus_volume ,
- state
+ 0
)
@Slot()