Index: TD_Pre_Treatment/interface.ui
===================================================================
diff -u -r07140fe219f4f6b24d08c70325fe98cb3568e628 -rc0894303c4aa8ed3bde7fba88b9579a6409f6019
--- TD_Pre_Treatment/interface.ui (.../interface.ui) (revision 07140fe219f4f6b24d08c70325fe98cb3568e628)
+++ TD_Pre_Treatment/interface.ui (.../interface.ui) (revision c0894303c4aa8ed3bde7fba88b9579a6409f6019)
@@ -217,72 +217,15 @@
-
-
-
-
-
-
- 50
- 16777215
-
-
-
- -2147483647
-
-
- 2147483647
-
-
- 3
-
-
-
- -
-
+
-
+
- UF Estimated Target Weight
+ Fluid Bolus Volume
- -
-
-
-
- 50
- 16777215
-
-
-
- -2147483647
-
-
- 2147483647
-
-
- 3
-
-
-
- -
-
-
-
- 50
- 16777215
-
-
-
- -2147483647
-
-
- 2147483647
-
-
- 3
-
-
-
- -
-
+
-
+
0
@@ -318,67 +261,52 @@
- -
-
-
- Heparin Dispensing Rate
-
-
-
- -
-
-
- Dialyzer Type
-
-
-
-
-
+
- Dry Bicarbonate Cartridge Size
+ Heparin Type
- -
-
-
+
-
+
+
+
+ 0
+ 0
+
+
+
- 50
- 16777215
+ 75
+ 0
-
- -2147483647
-
-
- 2147483647
-
-
- 3
-
-
-
- -
-
- 50
+ 100
16777215
-
- -2147483647
+
+ false
-
- 2147483647
+
+ QFrame::WinPanel
-
- 3
+
+ QFrame::Sunken
+
+ -
+
+
+ Qt::AlignCenter
+
- -
-
+
-
+
0
@@ -414,7 +342,7 @@
- -
+
-
@@ -433,8 +361,15 @@
+ -
+
+
+ Sodium
+
+
+
-
-
+
0
@@ -471,7 +406,7 @@
-
-
+
50
@@ -489,27 +424,45 @@
- -
-
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ 0
+
+
- 50
+ 100
16777215
-
- -2147483647
+
+ false
-
- 2147483647
+
+ QFrame::WinPanel
-
- 3
+
+ QFrame::Sunken
+
+ -
+
+
+ Qt::AlignCenter
+
- -
-
+
-
+
0
@@ -545,72 +498,80 @@
- -
-
-
-
- 50
- 16777215
-
+
-
+
+
+ UF Estimated Target Weight
-
- -2147483647
+
+
+ -
+
+
+ Heparin Delivery Duration
-
- 2147483647
+
+
+ -
+
+
+ Treatment Duration
-
- 3
-
- -
-
-
-
- 50
- 16777215
-
+
-
+
+
+ Hepatitis B Status
-
- -2147483647
-
-
- 2147483647
-
-
- 3
-
- -
-
+
-
+
- UF Volume
+ Dry Bicarbonate Cartridge Size
- -
-
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ 0
+
+
- 50
+ 100
16777215
-
- -2147483647
+
+ false
-
- 2147483647
+
+ QFrame::WinPanel
-
- 3
+
+ QFrame::Sunken
+
+ -
+
+
+ Qt::AlignCenter
+
- -
-
+
-
+
50
@@ -628,26 +589,51 @@
- -
-
+
-
+
+
+ Blood Flow Rate
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ 0
+
+
- 50
+ 100
16777215
-
- -2147483647
+
+ false
-
- 2147483647
+
+ QFrame::WinPanel
-
- 3
+
+ QFrame::Sunken
+
+ -
+
+
+ Qt::AlignCenter
+
- -
+
-
@@ -666,8 +652,8 @@
- -
-
+
-
+
0
@@ -703,27 +689,8 @@
- -
-
-
-
- 50
- 16777215
-
-
-
- -2147483647
-
-
- 2147483647
-
-
- 3
-
-
-
- -
-
+
-
+
0
@@ -759,22 +726,72 @@
- -
-
-
- Dialysate Temp
+
-
+
+
+
+ 50
+ 16777215
+
+
+ -2147483647
+
+
+ 2147483647
+
+
+ 3
+
- -
-
+
-
+
+
+
+ 50
+ 16777215
+
+
+
+ -2147483647
+
+
+ 2147483647
+
+
+ 3
+
+
+
+ -
+
- Sodium
+ Treatment Modality
- -
-
+
-
+
+
+
+ 50
+ 16777215
+
+
+
+ -2147483647
+
+
+ 2147483647
+
+
+ 3
+
+
+
+ -
+
0
@@ -810,22 +827,22 @@
- -
-
+
-
+
- Treatment Duration
+ HDF Treatment Mode
- -
+
-
UF Pre-Weight
- -
-
+
-
+
50
@@ -843,8 +860,8 @@
- -
-
+
-
+
50
@@ -862,15 +879,8 @@
- -
-
-
- Acid Concentrate Conversion Factor
-
-
-
- -
-
+
-
+
0
@@ -906,22 +916,48 @@
+ -
+
+
+
+ 50
+ 16777215
+
+
+
+ -2147483647
+
+
+ 2147483647
+
+
+ 3
+
+
+
+ -
+
+
+ Dialyzer Type
+
+
+
-
Blood Pressure Measure Interval
- -
+
-
Dialysate Flow Rate
-
-
+
0
@@ -957,15 +993,27 @@
- -
-
-
- Heparin Bolus Volume
+
-
+
+
+
+ 50
+ 16777215
+
+
+ -2147483647
+
+
+ 2147483647
+
+
+ 3
+
- -
-
+
-
+
50
@@ -983,52 +1031,34 @@
- -
-
+
-
+
- Hepatitis B Status
+ Bicarbonate
- -
-
-
-
- 0
- 0
-
-
-
-
- 75
- 0
-
-
+
-
+
- 100
+ 50
16777215
-
- false
+
+ -2147483647
-
- QFrame::WinPanel
+
+ 2147483647
-
- QFrame::Sunken
+
+ 3
-
- -
-
-
- Qt::AlignCenter
-
- -
-
+
-
+
0
@@ -1064,7 +1094,7 @@
- -
+
-
@@ -1083,8 +1113,8 @@
- -
-
+
-
+
0
@@ -1139,8 +1169,15 @@
- -
-
+
-
+
+
+ Rinseback Volume
+
+
+
+ -
+
0
@@ -1176,8 +1213,8 @@
- -
-
+
-
+
50
@@ -1195,8 +1232,8 @@
- -
-
+
-
+
0
@@ -1232,8 +1269,53 @@
- -
-
+
-
+
+
+
+ 50
+ 16777215
+
+
+
+ -2147483647
+
+
+ 2147483647
+
+
+ 3
+
+
+
+ -
+
+
+ UF Volume
+
+
+
+ -
+
+
+
+ 50
+ 16777215
+
+
+
+ -2147483647
+
+
+ 2147483647
+
+
+ 3
+
+
+
+ -
+
0
@@ -1269,15 +1351,8 @@
- -
-
-
- HDF Treatment Mode
-
-
-
- -
-
+
-
+
0
@@ -1313,15 +1388,27 @@
- -
-
-
- Treatment Modality
+
-
+
+
+
+ 50
+ 16777215
+
+
+ -2147483647
+
+
+ 2147483647
+
+
+ 3
+
- -
-
+
-
+
50
@@ -1339,8 +1426,8 @@
- -
-
+
-
+
0
@@ -1376,22 +1463,8 @@
- -
-
-
- Substitution Fluid
-
-
-
- -
-
-
- Fluid Bolus Volume
-
-
-
- -
-
+
-
+
0
@@ -1428,7 +1501,7 @@
-
-
+
0
@@ -1464,22 +1537,8 @@
- -
-
-
- Bicarbonate
-
-
-
- -
-
-
- Blood Flow Rate
-
-
-
- -
-
+
-
+
0
@@ -1515,7 +1574,7 @@
- -
+
-
@@ -1552,8 +1611,8 @@
- -
-
+
-
+
50
@@ -1571,103 +1630,34 @@
- -
-
+
-
+
- Rinseback Volume
+ Acid Concentrate Conversion Factor
- -
-
-
- Heparin Delivery Duration
-
-
-
- -
-
-
- Heparin Type
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 75
- 0
-
-
+
-
+
- 100
+ 50
16777215
-
- false
+
+ -2147483647
-
- QFrame::WinPanel
+
+ 2147483647
-
- QFrame::Sunken
+
+ 3
-
- -
-
-
- Qt::AlignCenter
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 75
- 0
-
-
-
-
- 100
- 16777215
-
-
-
- false
-
-
- QFrame::WinPanel
-
-
- QFrame::Sunken
-
-
- -
-
-
- Qt::AlignCenter
-
-
-
-
-
+
50
@@ -1685,50 +1675,60 @@
- -
-
-
-
- 0
- 0
-
+
-
+
+
+ Dialysate Temp
-
-
- 75
- 0
-
+
+
+ -
+
+
+ Heparin Dispensing Rate
-
-
- 100
- 16777215
-
+
+
+ -
+
+
+ Heparin Bolus Volume
-
- false
-
-
- QFrame::WinPanel
-
-
- QFrame::Sunken
-
+
+
+ -
+
- -
+ Substitution Fluid
-
- Qt::AlignCenter
-
- -
+
-
Acid Concentrate Index
+ -
+
+
+
+ 50
+ 16777215
+
+
+
+ -2147483647
+
+
+ 2147483647
+
+
+ 3
+
+
+
-
Index: TD_Pre_Treatment/loader.py
===================================================================
diff -u -r07140fe219f4f6b24d08c70325fe98cb3568e628 -rc0894303c4aa8ed3bde7fba88b9579a6409f6019
--- TD_Pre_Treatment/loader.py (.../loader.py) (revision 07140fe219f4f6b24d08c70325fe98cb3568e628)
+++ TD_Pre_Treatment/loader.py (.../loader.py) (revision c0894303c4aa8ed3bde7fba88b9579a6409f6019)
@@ -199,15 +199,15 @@
self.spnBloodPressureMeasureIntervalRejectReason .value() +
self.spnRinsebackVolumeRejectReason .value() +
self.spnHepatitisBStatusRejectReason .value() +
+ self.spnAcidConcentrateIndextRejectReason .value() +
self.spnSubstitutionFluidRejectReason .value() +
self.spnHeparinBolusVolumeRejectReason .value() +
self.spnHeparinDispensingRateRejectReason .value() +
self.spnDialysateTempRejectReason .value() +
self.spnAcidConcentrateRejectReason .value() +
- self.spnUFVolumeRejectReason .value() +
self.spnPreWeightRejectReason .value() +
self.spnEstimatedTargetWeightRejectReason .value() +
- self.spnAcidConcentrateIndextRejectReason .value()
+ self.spnUFVolumeRejectReason .value()
) == 0
self.td_interface.td_Treatment_Parameters_Validation(
@@ -227,15 +227,15 @@
self.spnBloodPressureMeasureIntervalRejectReason .value(),
self.spnRinsebackVolumeRejectReason .value(),
self.spnHepatitisBStatusRejectReason .value(),
+ self.spnAcidConcentrateIndextRejectReason .value(),
self.spnSubstitutionFluidRejectReason .value(),
self.spnHeparinBolusVolumeRejectReason .value(),
self.spnHeparinDispensingRateRejectReason .value(),
self.spnDialysateTempRejectReason .value(),
self.spnAcidConcentrateRejectReason .value(),
- self.spnUFVolumeRejectReason .value(),
self.spnPreWeightRejectReason .value(),
self.spnEstimatedTargetWeightRejectReason .value(),
- self.spnAcidConcentrateIndextRejectReason .value()
+ self.spnUFVolumeRejectReason .value()
)
@Slot()
@@ -255,16 +255,17 @@
self.spnBloodPressureMeasureIntervalRejectReason .setValue(0)
self.spnRinsebackVolumeRejectReason .setValue(0)
self.spnHepatitisBStatusRejectReason .setValue(0)
+ self.spnAcidConcentrateIndextRejectReason .setValue(0)
self.spnSubstitutionFluidRejectReason .setValue(0)
self.spnHeparinBolusVolumeRejectReason .setValue(0)
self.spnHeparinDispensingRateRejectReason .setValue(0)
self.spnDialysateTempRejectReason .setValue(0)
self.spnAcidConcentrateRejectReason .setValue(0)
- self.spnUFVolumeRejectReason .setValue(0)
self.spnPreWeightRejectReason .setValue(0)
self.spnEstimatedTargetWeightRejectReason .setValue(0)
- self.spnAcidConcentrateIndextRejectReason .setValue(0)
+ self.spnUFVolumeRejectReason .setValue(0)
+
@Slot()
def handle_load_request(self, message, timestamp = 0.0):
"""
@@ -312,15 +313,15 @@
self.lbBloodPressureMeasureInterval .setText(str(self.getIntValue(message)))
self.lbRinsebackVolume .setText(str(self.getIntValue(message)))
self.lbHepatitisBStatus .setText(str(self.getIntValue(message)))
+ self.lbAcidConcentrateIndex .setText(str(self.getIntValue(message)))
self.lbSubstitutionFluid .setText(f"{self.getFloatValue(message):.1f}")
self.lbHeparinBolusVolume .setText(f"{self.getFloatValue(message):.1f}")
self.lbHeparinDispensingRate .setText(f"{self.getFloatValue(message):.1f}")
self.lbDialysateTemp .setText(f"{self.getFloatValue(message):.1f}")
self.lbAcidConcentrate .setText(f"{self.getFloatValue(message):.5f}")
- self.lbUFVolue .setText(f"{self.getFloatValue(message):.1f}")
self.lbPreWeight .setText(f"{self.getFloatValue(message):.1f}")
self.lbEstimatedTargetWeight .setText(f"{self.getFloatValue(message):.1f}")
- self.lbAcidConcentrateIndex .setText(str(self.getIntValue(message)))
+ self.lbUFVolue .setText(f"{self.getFloatValue(message):.1f}")
def getIntValue (self, message):