Index: MainTreatmentData/interface.ui
===================================================================
diff -u -r2d936e054bf8364ff42d19d616b555637749ca22 -r8d3f0d411aa713011a2204226b5ff5c5a65d5bc3
--- MainTreatmentData/interface.ui (.../interface.ui) (revision 2d936e054bf8364ff42d19d616b555637749ca22)
+++ MainTreatmentData/interface.ui (.../interface.ui) (revision 8d3f0d411aa713011a2204226b5ff5c5a65d5bc3)
@@ -6,8 +6,8 @@
0
0
- 732
- 387
+ 742
+ 481
@@ -19,182 +19,11 @@
&3 Treatment/&1 Main treatment
-
- -
-
+
+
-
+
-
-
-
-
- 180
- 0
-
-
-
-
- 180
- 16777215
-
-
-
- Cumulative Volume
-
-
-
- -
-
-
- 10000
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
- 50
- 0
-
-
-
- 0
-
-
-
-
-
- -
-
-
-
-
-
-
- 180
- 0
-
-
-
- Target Volume
-
-
-
- -
-
-
- 10000
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
- 50
- 0
-
-
-
- 0
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 0
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 352
- 0
-
-
-
-
- 10
-
-
-
- false
-
-
- color: rgb(238, 238, 236);
-background-color: rgb(92, 53, 102);
-
-
- 61 : [0x3D00] : Saline Bolus
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Saline Bolus Req[0x5F00]
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 352
- 0
-
-
-
-
- 16777215
- 16777215
-
-
+
10
@@ -206,586 +35,1219 @@
- 59 : [0x3B00] : Treament Time
+ Main Treatment Data
Qt::AlignCenter
-
-
-
-
-
-
-
- 180
- 0
-
-
-
- TX Duration
-
-
-
- -
-
-
- 480
-
-
- 15
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
- 50
- 0
-
-
-
- 0
-
-
-
-
+
+
+ send
+
+
-
-
-
-
-
-
-
- 180
- 0
-
-
-
- Elapsed Time
-
-
-
- -
-
-
- 480
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
- 50
- 0
-
-
-
- 0
-
-
-
-
-
- -
-
-
- Qt::Vertical
+
+
+ reset
-
-
- 20
- 60
-
-
-
+
- -
-
-
-
-
-
-
-
-
-
- 10
-
-
-
- color: rgb(238, 238, 236);
-background-color: rgb(92, 53, 102);
-
-
-
- Main Treatment Data
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- send
-
-
-
- -
-
-
- reset
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
- 180
- 0
-
+
-
+
+
-
+
+
+ QFrame::StyledPanel
-
-
- 180
- 16777215
-
+
+ QFrame::Raised
-
- Current Delivered Volume
-
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 352
+ 0
+
+
+
+
+ 10
+
+
+
+ false
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(92, 53, 102);
+
+
+ 61 : [0x3D00] : Saline Bolus
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 180
+ 0
+
+
+
+ Target Volume
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 10000
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 50
+ 0
+
+
+
+ 0
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 180
+ 0
+
+
+
+
+ 180
+ 16777215
+
+
+
+ Cumulative Volume
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 10000
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 50
+ 0
+
+
+
+ 0
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 180
+ 0
+
+
+
+
+ 180
+ 16777215
+
+
+
+ Current Delivered Volume
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 10000
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 50
+ 0
+
+
+
+ 0
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 180
+ 0
+
+
+
+ Saline Bolus Req[0x5F00]
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 0
+
+
+
+
+
- -
-
-
- 10000
+
-
+
+
+ QFrame::StyledPanel
-
- Qt::Horizontal
+
+ QFrame::Raised
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 352
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(92, 53, 102);
+
+
+
+ 79 : [0x4F00] : Set Point Data
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 180
+ 0
+
+
+
+ Blood Flow
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 900
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 180
+ 0
+
+
+
+ Dial Flow
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 900
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 180
+ 0
+
+
+
+ Dial Temp
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 100.000000000000000
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 0
+
+
+
+
+
- -
-
-
-
- 50
- 0
-
+
-
+
+
+ QFrame::StyledPanel
-
- 0
+
+ QFrame::Raised
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 352
+ 0
+
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(92, 53, 102);
+
+
+ 62 : [0x3E00] : Ultrafiltration
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 180
+ 0
+
+
+
+ Set Volume L
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 1000
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 50
+ 0
+
+
+
+ 0
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 180
+ 0
+
+
+
+ Target Rate L/Hr
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 1000
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 50
+ 0
+
+
+
+ 0
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 180
+ 0
+
+
+
+ Volume Delivered L
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 200
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 50
+ 0
+
+
+
+ 0
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 180
+ 0
+
+
+
+ State
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 180
+ 0
+
+
+
+ Max Delivery
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 20.000000000000000
+
+
+ 2.000000000000000
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 0
+
+
+
+
+
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
+
-
+
+
+ QFrame::StyledPanel
-
-
- 352
- 0
-
+
+ QFrame::Raised
-
-
- 16777215
- 16777215
-
-
-
-
- 10
-
-
-
- color: rgb(238, 238, 236);
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 352
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
background-color: rgb(92, 53, 102);
-
-
- 79 : [0x4F00] : Set Point Data
-
-
- Qt::AlignCenter
-
+
+
+ 59 : [0x3B00] : Treament Time
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 180
+ 0
+
+
+
+ TX Duration
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 480
+
+
+ 15
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 50
+ 0
+
+
+
+ 0
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 180
+ 0
+
+
+
+ Elapsed Time
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 480
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 50
+ 0
+
+
+
+ 0
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 0
+
+
+
+
+
- -
-
-
-
-
-
-
- 180
- 0
-
-
-
- Blood Flow
-
-
-
- -
-
-
- 900
-
-
-
-
-
- -
-
-
-
-
-
-
- 180
- 0
-
-
-
- Dial Flow
-
-
-
- -
-
-
- 900
-
-
-
-
-
- -
-
-
-
-
-
-
- 180
- 0
-
-
-
- Dial Temp
-
-
-
- -
-
-
- 100.000000000000000
-
-
-
-
-
- -
-
-
- Qt::Vertical
+
-
+
+
+ QFrame::StyledPanel
-
-
- 20
- 10
-
+
+ QFrame::Raised
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- 352
- 0
-
-
-
-
- 10
-
-
-
- color: rgb(238, 238, 236);
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
background-color: rgb(92, 53, 102);
-
-
- 62 : [0x3E00] : Ultrafiltration
-
-
- Qt::AlignCenter
-
+
+
+ 67 : [0x4300] : Param Ranges
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ Min
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Max
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 8000
+
+
+ 10
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 8000
+
+
+ 10
+
+
+ 0
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Treatment Time
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ UF Volume
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Dial Rate
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 0
+
+
+
+
+
- -
-
-
-
-
-
-
- 180
- 0
-
-
-
- Set Volume L
-
-
-
- -
-
-
- 1000
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
- 50
- 0
-
-
-
- 0
-
-
-
-
-
- -
-
-
-
-
-
-
- 180
- 0
-
-
-
- Target Rate L/Hr
-
-
-
- -
-
-
- 1000
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
- 50
- 0
-
-
-
- 0
-
-
-
-
-
- -
-
-
-
-
-
-
- 180
- 0
-
-
-
- Volume Delivered L
-
-
-
- -
-
-
- 200
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
- 50
- 0
-
-
-
- 0
-
-
-
-
-
- -
-
-
-
-
-
-
- 180
- 0
-
-
-
- State
-
-
-
- -
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
-
-
-
- 180
- 0
-
-
-
- Max Delivery
-
-
-
- -
-
-
- 20.000000000000000
-
-
- 2.000000000000000
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- false
-
-
- QFrame::WinPanel
-
-
- QFrame::Sunken
-
-
- -
-
-
- Qt::AlignCenter
-
-
-
Index: MainTreatmentData/loader.py
===================================================================
diff -u -r2d936e054bf8364ff42d19d616b555637749ca22 -r8d3f0d411aa713011a2204226b5ff5c5a65d5bc3
--- MainTreatmentData/loader.py (.../loader.py) (revision 2d936e054bf8364ff42d19d616b555637749ca22)
+++ MainTreatmentData/loader.py (.../loader.py) (revision 8d3f0d411aa713011a2204226b5ff5c5a65d5bc3)
@@ -77,6 +77,12 @@
self.lbBolusStart = self.find_widget(QtWidgets.QLabel , 'lbBolusStart' )
+ self.tx_time_min = self.find_widget(QtWidgets.QSpinBox , 'TxTimeMinSpinBox' )
+ self.tx_time_max = self.find_widget(QtWidgets.QSpinBox , 'TxTimeMaxSpinBox' )
+ self.uf_volume_min = self.find_widget(QtWidgets.QSpinBox , 'UFVolumeMinSpinBox' )
+ self.uf_volume_max = self.find_widget(QtWidgets.QSpinBox , 'UFVolumeMaxSpinBox' )
+ self.dial_rate_min = self.find_widget(QtWidgets.QSpinBox , 'DialRateMinSpinBox' )
+ self.dial_rate_max = self.find_widget(QtWidgets.QSpinBox , 'DialRateMaxSpinBox' )
def _init_connections(self):
"""
@@ -104,6 +110,12 @@
self.dial_flow_st_pt .valueChanged.connect(self.do_tx_set_point_data)
self.dial_temp_st_pt .valueChanged.connect(self.do_tx_set_point_data)
+ self.tx_time_min .valueChanged.connect(self.do_param_ranges_data)
+ self.tx_time_max .valueChanged.connect(self.do_param_ranges_data)
+ self.uf_volume_min .valueChanged.connect(self.do_param_ranges_data)
+ self.uf_volume_max .valueChanged.connect(self.do_param_ranges_data)
+ self.dial_rate_min .valueChanged.connect(self.do_param_ranges_data)
+ self.dial_rate_max .valueChanged.connect(self.do_param_ranges_data)
def handle_solution_infusion_request(self, message, timestamp = 0.0):
"""
@@ -134,6 +146,13 @@
self.tx_duration .setValue(0)
self.tx_elapsed .setValue(0)
+ self.tx_time_min .setValue(0)
+ self.tx_time_max .setValue(0)
+ self.uf_volume_min .setValue(0)
+ self.uf_volume_max .setValue(8000)
+ self.dial_rate_min .setValue(0)
+ self.dial_rate_max .setValue(0)
+
@Slot()
def do_uf_max(self):
"""
@@ -221,6 +240,28 @@
)
@Slot()
+ def do_param_ranges_data(self):
+ """
+ the slot for treatment param ranges Data
+ :return: none
+ """
+ tx_time_min_s = self.tx_time_min.value()
+ tx_time_max_s = self.tx_time_max.value()
+ uf_volume_min_mL = self.uf_volume_min.value()
+ uf_volume_max_mL = self.uf_volume_max.value()
+ dial_rate_min_mLH = self.dial_rate_min.value()
+ dial_rate_max_mLH = self.dial_rate_max.value()
+
+ self.td_interface.td_param_ranges(
+ tx_time_min_s ,
+ tx_time_max_s ,
+ uf_volume_min_mL ,
+ uf_volume_max_mL ,
+ dial_rate_min_mLH ,
+ dial_rate_max_mLH
+ )
+
+ @Slot()
def do_all_tx_data(self):
"""
the slot for treatment set point Data
@@ -230,3 +271,4 @@
self.do_uf_data()
self.do_tx_time_data()
self.do_tx_set_point_data()
+ self.do_param_ranges_data()