Index: TD_BloodPrime/interface.ui
===================================================================
diff -u -r4f4c2d8e77eb683fd6293d681cb3e7d78806a58c -rc6aa11b8a4a60886c17e4d3d2c0166c6160f1053
--- TD_BloodPrime/interface.ui (.../interface.ui) (revision 4f4c2d8e77eb683fd6293d681cb3e7d78806a58c)
+++ TD_BloodPrime/interface.ui (.../interface.ui) (revision c6aa11b8a4a60886c17e4d3d2c0166c6160f1053)
@@ -6,8 +6,8 @@
0
0
- 405
- 240
+ 418
+ 280
@@ -181,7 +181,7 @@
- 50
+ 40
0
@@ -257,7 +257,7 @@
- 50
+ 40
0
@@ -276,6 +276,92 @@
+ -
+
+
+ Timeout (s)
+
+
+
+ -
+
+
-
+
+
+
+ 250
+ 0
+
+
+
+ 500
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 40
+ 0
+
+
+
+ 0
+
+
+ Qt::AlignCenter
+
+
+
+
+
+ -
+
+
+ Countdown (s)
+
+
+
+ -
+
+
-
+
+
+
+ 250
+ 0
+
+
+
+ 500
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 40
+ 0
+
+
+
+ 0
+
+
+ Qt::AlignCenter
+
+
+
+
+
-
Index: TD_BloodPrime/loader.py
===================================================================
diff -u -rf7630c8a12b488b5d65cfebbec07b58de31cf484 -rc6aa11b8a4a60886c17e4d3d2c0166c6160f1053
--- TD_BloodPrime/loader.py (.../loader.py) (revision f7630c8a12b488b5d65cfebbec07b58de31cf484)
+++ TD_BloodPrime/loader.py (.../loader.py) (revision c6aa11b8a4a60886c17e4d3d2c0166c6160f1053)
@@ -46,8 +46,6 @@
self.cmdStrings = [
"Pause",
"Resume",
- "Decrease Rate",
- "Increase Rate",
]
self.tbProgressSend = self.find_widget(QtWidgets.QToolButton , 'tbProgressSend' )
@@ -56,6 +54,10 @@
self.lbProgressTargetVolume = self.find_widget(QtWidgets.QLabel , 'lbProgressTargetVolume' )
self.slProgressDeliveredVolume = self.find_widget(QtWidgets.QSlider , 'slProgressDeliveredVolume' )
self.lbProgressDeliveredVolume = self.find_widget(QtWidgets.QLabel , 'lbProgressDeliveredVolume' )
+ self.slProgressTimeout = self.find_widget(QtWidgets.QSlider , 'slProgressTimeout' )
+ self.lbProgressTimeout = self.find_widget(QtWidgets.QLabel , 'lbProgressTimeout' )
+ self.slProgressCountdown = self.find_widget(QtWidgets.QSlider , 'slProgressCountdown' )
+ self.lbProgressCountdown = self.find_widget(QtWidgets.QLabel , 'lbProgressCountdown' )
self.tbCmdRspSend = self.find_widget(QtWidgets.QToolButton , 'tbCmdRspSend' )
self.tbCmdRspReset = self.find_widget(QtWidgets.QToolButton , 'tbCmdRspReset' )
@@ -75,6 +77,10 @@
self.slProgressTargetVolume .valueChanged .connect(self.do_progress_target_volume_changed)
self.slProgressDeliveredVolume .valueChanged .connect(self.do_progress_send)
self.slProgressDeliveredVolume .valueChanged .connect(self.do_progress_delivered_volume_changed)
+ self.slProgressTimeout .valueChanged .connect(self.do_progress_send)
+ self.slProgressTimeout .valueChanged .connect(self.do_progress_timeout_changed)
+ self.slProgressCountdown .valueChanged .connect(self.do_progress_send)
+ self.slProgressCountdown .valueChanged .connect(self.do_progress_countdown_changed)
self.tbCmdRspSend .clicked .connect(self.do_cmd_response_send)
self.tbCmdRspReset .clicked .connect(self.do_cmd_response_reset)
@@ -97,7 +103,9 @@
"""
self.td_interface.td_blood_prime_progress(
self.slProgressTargetVolume.value(),
- self.slProgressDeliveredVolume.value()
+ self.slProgressDeliveredVolume.value(),
+ self.slProgressTimeout.value(),
+ self.slProgressCountdown.value(),
)
@@ -112,9 +120,21 @@
@Slot()
+ def do_progress_timeout_changed(self, value):
+ self.lbProgressTimeout.setText(f"{value}")
+
+
+ @Slot()
+ def do_progress_countdown_changed(self, value):
+ self.lbProgressCountdown.setText(f"{value}")
+
+
+ @Slot()
def do_progress_reset(self):
- self.slProgressTargetVolume .setValue(0)
- self.slProgressDeliveredVolume .setValue(0)
+ self.slProgressTargetVolume .setValue(0)
+ self.slProgressDeliveredVolume .setValue(0)
+ self.slProgressTimeout .setValue(0)
+ self.slProgressCountdown .setValue(0)
@Slot()
Index: TD_TreatmentStates/interface.ui
===================================================================
diff -u -rff75720cd661c2f8ad5336268659260666d0ffab -rc6aa11b8a4a60886c17e4d3d2c0166c6160f1053
--- TD_TreatmentStates/interface.ui (.../interface.ui) (revision ff75720cd661c2f8ad5336268659260666d0ffab)
+++ TD_TreatmentStates/interface.ui (.../interface.ui) (revision c6aa11b8a4a60886c17e4d3d2c0166c6160f1053)
@@ -6,64 +6,74 @@
0
0
- 721
- 889
+ 628
+ 673
&1 States/&3 Treatment
-
-
-
-
+
+
-
+
+
+ 6
+
-
-
-
-
- 10
-
-
-
- color: rgb(238, 238, 236);
+
+
-
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
background-color:rgb(55, 179, 119)
-
-
- Treatment Mode Data
-
-
- Qt::AlignCenter
-
-
+
+
+ Treatment Mode Data
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ send
+
+
+
+ -
+
+
+ reset
+
+
+
+
-
-
-
- send
+
+
+
+ 0
+ 0
+
-
-
- -
-
-
- reset
-
-
-
-
-
- -
-
-
-
-
- 275
- 130
+ 300
+ 231
8
+ false
@@ -84,6 +94,9 @@
QAbstractItemView::SelectRows
+
+ true
+
false
@@ -93,6 +106,12 @@
260
+
+ true
+
+
+ 18
+
21
@@ -121,49 +140,108 @@
4
+
+
+ 5
+
+
+
+
+ 6
+
+
+
+
+ 7
+
+
+
+
+ 8
+
+
+
+
+ 9
+
+
- 5 : Rinseback States
+ 0 : Treatment States (subMode)
-
- RINSEBACK_STOP_INIT_STATE
+ TREATMENT_START_STATE
-
- ItemIsSelectable|ItemIsEnabled
-
-
- RINSEBACK_RUN_STATE
+ TREATMENT_BLOOD_PRIME_STATE
-
- RINSEBACK_PAUSED_STATE
+ TREATMENT_DIALYSIS_STATE
-
- RINSEBACK_STOP_STATE
+ TREATMENT_PAUSED_STATE
-
- RINSEBACK_RUN_ADDITIONAL_STATE
+ TREATMENT_RINSEBACK_STATE
+ -
+
+ TREATMENT_RECIRC_STATE
+
+
+ -
+
+ TREATMENT_END_STATE
+
+
+ -
+
+ TREATMENT_ISO_UF_STATE
+
+
+ -
+
+ TREATMENT_SALINE_STATE
+
+
+ -
+
+ TREATMENT_DIALYSIS_PAUSED_STATE
+
+
-
-
+
+
+
+ 0
+ 0
+
+
- 300
- 110
+ 250
+ 90
+
+
+ 16777215
+ 16777215
+
+
8
@@ -194,7 +272,7 @@
true
- 275
+ 210
21
@@ -214,53 +292,49 @@
2
-
-
- 3
-
-
- 6 : Recirculate States
+ 1 : Blood Prime States
-
- TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE
+ BLOOD_PRIME_RAMP_STATE
-
- -
-
- TREATMENT_RECIRC_RECIRC_STATE
-
ItemIsSelectable|ItemIsEnabled
- -
+
-
- TREATMENT_RECIRC_STOPPED_STATE
+ BLOOD_PRIME_RUNNING_STATE
- -
+
-
- TREATMENT_RECIRC_RECONNECT_PATIENT_STATE
+ BLOOD_PRIME_PAUSED_STATE
-
-
+
+
+
+ 0
+ 0
+
+
- 0
- 71
+ 250
+ 70
16777215
- 71
+ 16777215
@@ -293,7 +367,7 @@
true
- 260
+ 210
21
@@ -310,30 +384,36 @@
- 7 : Treatment End States
+ 2: Dialysis States
-
- TREATMENT_END_WAIT_FOR_RINSEBACK_STATE
+ DIALYSIS_UF_STATE
ItemIsSelectable|ItemIsEnabled
-
- TREATMENT_END_PAUSED_STATE
+ DIALYSIS_UF_PAUSED_STATE
-
-
+
+
+
+ 0
+ 0
+
+
- 275
- 100
+ 250
+ 90
@@ -366,7 +446,7 @@
true
- 260
+ 210
21
@@ -388,37 +468,46 @@
- 8 : Saline States
+ 3 : Isolated UF States
-
- SALINE_BOLUS_STATE_IDLE
+ UF_START_STATE
-
- ItemIsSelectable|ItemIsEnabled
-
-
- SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP
+ UF_PAUSED_STATE
-
- SALINE_BOLUS_STATE_IN_PROGRESS
+ UF_RUNNING_STATE
-
-
+
+
+
+ 0
+ 0
+
+
- 225
- 175
+ 250
+ 110
+
+
+ 16777215
+ 16777215
+
+
8
@@ -449,7 +538,7 @@
true
- 210
+ 275
21
@@ -474,82 +563,70 @@
3
-
-
- 4
-
-
-
-
- 5
-
-
-
-
- 6
-
-
- 9 : Heparin States
+ 4 : Treatment Stop States
-
- HEPARIN_STATE_OFF
+ TREATMENT_STOP_RECIRC_STATE
ItemIsSelectable|ItemIsEnabled
-
- HEPARIN_STATE_STOPPED
+ TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE
-
- HEPARIN_STATE_PAUSED
+ TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE
-
- HEPARIN_STATE_INITIAL_BOLUS
+ TREATMENT_STOP_NO_RECIRC_STATE
- -
-
- HEPARIN_STATE_DISPENSING
-
-
- -
-
- HEPARIN_STATE_COMPLETED
-
-
- -
-
- HEPARIN_STATE_EMPTY
-
-
+ -
+
+
+ Qt::Vertical
+
+
+
+ 0
+ 0
+
+
+
+
- -
-
+
-
+
-
-
+
+
+
+ 0
+ 0
+
+
- 275
- 231
+ 300
+ 130
8
- false
@@ -570,9 +647,6 @@
QAbstractItemView::SelectRows
-
- true
-
false
@@ -582,12 +656,6 @@
260
-
- true
-
-
- 18
-
21
@@ -616,102 +684,55 @@
4
-
-
- 5
-
-
-
-
- 6
-
-
-
-
- 7
-
-
-
-
- 8
-
-
-
-
- 9
-
-
- 0 : Treatment States (subMode)
+ 5 : Rinseback States
-
- TREATMENT_START_STATE
+ RINSEBACK_STOP_INIT_STATE
+
+ ItemIsSelectable|ItemIsEnabled
+
-
- TREATMENT_BLOOD_PRIME_STATE
+ RINSEBACK_RUN_STATE
-
- TREATMENT_DIALYSIS_STATE
+ RINSEBACK_PAUSED_STATE
-
- TREATMENT_PAUSED_STATE
+ RINSEBACK_STOP_STATE
-
- TREATMENT_RINSEBACK_STATE
+ RINSEBACK_RUN_ADDITIONAL_STATE
- -
-
- TREATMENT_RECIRC_STATE
-
-
- -
-
- TREATMENT_END_STATE
-
-
- -
-
- TREATMENT_ISO_UF_STATE
-
-
- -
-
- TREATMENT_SALINE_STATE
-
-
- -
-
- TREATMENT_DIALYSIS_PAUSED_STATE
-
-
-
-
+
+
+
+ 0
+ 0
+
+
- 0
- 51
+ 250
+ 110
-
-
- 16777215
- 51
-
-
8
@@ -742,7 +763,7 @@
true
- 210
+ 275
21
@@ -752,33 +773,69 @@
0
+
+
+ 1
+
+
+
+
+ 2
+
+
+
+
+ 3
+
+
- 1 : Blood Prime States
+ 6 : Recirculate States
-
- BLOOD_PRIME_RAMP_STATE
+ TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE
+
+ -
+
+ TREATMENT_RECIRC_RECIRC_STATE
+
ItemIsSelectable|ItemIsEnabled
+ -
+
+ TREATMENT_RECIRC_STOPPED_STATE
+
+
+ -
+
+ TREATMENT_RECIRC_RECONNECT_PATIENT_STATE
+
+
-
-
+
+
+
+ 0
+ 0
+
+
- 0
- 70
+ 250
+ 71
16777215
- 70
+ 16777215
@@ -811,7 +868,7 @@
true
- 210
+ 260
21
@@ -828,30 +885,36 @@
- 2: Dialysis States
+ 7 : Treatment End States
-
- DIALYSIS_UF_STATE
+ TREATMENT_END_WAIT_FOR_RINSEBACK_STATE
ItemIsSelectable|ItemIsEnabled
-
- DIALYSIS_UF_PAUSED_STATE
+ TREATMENT_END_PAUSED_STATE
-
-
+
+
+
+ 0
+ 0
+
+
- 0
- 131
+ 250
+ 90
@@ -884,7 +947,7 @@
true
- 210
+ 260
21
@@ -906,40 +969,43 @@
- 3 : Isolated UF States
+ 8 : Saline States
-
- UF_START_STATE
+ SALINE_BOLUS_STATE_IDLE
+
+ ItemIsSelectable|ItemIsEnabled
+
-
- UF_PAUSED_STATE
+ SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP
-
- UF_RUNNING_STATE
+ SALINE_BOLUS_STATE_IN_PROGRESS
-
-
+
+
+
+ 0
+ 0
+
+
- 0
- 110
+ 250
+ 175
-
-
- 16777215
- 16777215
-
-
8
@@ -970,7 +1036,7 @@
true
- 275
+ 210
21
@@ -995,44 +1061,85 @@
3
+
+
+ 4
+
+
+
+
+ 5
+
+
+
+
+ 6
+
+
- 4 : Treatment Stop States
+ 9 : Heparin States
-
- TREATMENT_STOP_RECIRC_STATE
+ HEPARIN_STATE_OFF
ItemIsSelectable|ItemIsEnabled
-
- TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE
+ HEPARIN_STATE_STOPPED
-
- TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE
+ HEPARIN_STATE_PAUSED
-
- TREATMENT_STOP_NO_RECIRC_STATE
+ HEPARIN_STATE_INITIAL_BOLUS
+ -
+
+ HEPARIN_STATE_DISPENSING
+
+
+ -
+
+ HEPARIN_STATE_COMPLETED
+
+
+ -
+
+ HEPARIN_STATE_EMPTY
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 0
+ 0
+
+
+
+
tblSubMode
- tblBloodPrimeStates
- tblDialysisStates
tblUFStates
tblTreatmentStopStates
tblRinsebackStates