Index: TD_TreatmentAdjustmentsSetPoints/interface.ui
===================================================================
diff -u -r56cb5aea19a2bbac47e06e4631f53a082b1be29a -r6f56b7d7d671e97678391e16a6a1fb08ab329b9e
--- TD_TreatmentAdjustmentsSetPoints/interface.ui (.../interface.ui) (revision 56cb5aea19a2bbac47e06e4631f53a082b1be29a)
+++ TD_TreatmentAdjustmentsSetPoints/interface.ui (.../interface.ui) (revision 6f56b7d7d671e97678391e16a6a1fb08ab329b9e)
@@ -6,8 +6,8 @@
0
0
- 743
- 369
+ 752
+ 359
@@ -115,27 +115,6 @@
- -
-
-
- Dialysate Temperature (°C)
-
-
-
- -
-
-
- Acid Concentrate
-
-
-
- -
-
-
- Bicarb Concentrate
-
-
-
-
@@ -152,6 +131,13 @@
+ -
+
+
+ Dialysate Temperature (°C)
+
+
+
-
@@ -168,6 +154,13 @@
+ -
+
+
+ Acid Concentrate
+
+
+
-
@@ -184,7 +177,14 @@
- -
+
-
+
+
+ Bicarb Concentrate
+
+
+
+ -
QFrame::Box
@@ -200,7 +200,14 @@
- -
+
-
+
+
+ Treatment Modality
+
+
+
+ -
QFrame::Box
@@ -216,14 +223,14 @@
- -
-
+
-
+
- Treatment Modality
+ Hepatitis
- -
+
-
QFrame::Box
@@ -239,7 +246,14 @@
- -
+
-
+
+
+ Sodium
+
+
+
+ -
QFrame::Box
@@ -255,7 +269,14 @@
- -
+
-
+
+
+ Bicarbonate
+
+
+
+ -
QFrame::Box
@@ -271,25 +292,27 @@
- -
-
+
-
+
- Hepatitis
+ Acid Concentrate Conversion Factor
- -
-
-
- Sodium
+
-
+
+
+ QFrame::Box
-
-
- -
-
+
+ QFrame::Sunken
+
- Bicarbonate
+ --
+
+ Qt::AlignCenter
+
Index: TD_TreatmentAdjustmentsSetPoints/loader.py
===================================================================
diff -u -r56cb5aea19a2bbac47e06e4631f53a082b1be29a -r6f56b7d7d671e97678391e16a6a1fb08ab329b9e
--- TD_TreatmentAdjustmentsSetPoints/loader.py (.../loader.py) (revision 56cb5aea19a2bbac47e06e4631f53a082b1be29a)
+++ TD_TreatmentAdjustmentsSetPoints/loader.py (.../loader.py) (revision 6f56b7d7d671e97678391e16a6a1fb08ab329b9e)
@@ -60,6 +60,8 @@
self.lbSetPointsReqDialysateFlowRate = self.find_widget(QtWidgets.QLabel , 'lbSetPointsReqDialysateFlowRate' )
self.lbSetPointsReqDialysateTemperature = self.find_widget(QtWidgets.QLabel , 'lbSetPointsReqDialysateTemperature' )
self.lbSetPointsReqAcidConcentrate = self.find_widget(QtWidgets.QLabel , 'lbSetPointsReqAcidConcentrate' )
+ self.lbSetPointsReqAcidConcentrateFactor = self.find_widget(QtWidgets.QLabel , 'lbSetPointsReqAcidConcentrateFactor' )
+
self.lbSetPointsReqBicarbConcentrate = self.find_widget(QtWidgets.QLabel , 'lbSetPointsReqBicarbConcentrate' )
self.lbSetPointsReqTreatmentModality = self.find_widget(QtWidgets.QLabel , 'lbSetPointsReqTreatmentModality' )
self.lbSetPointsReqHepatitis = self.find_widget(QtWidgets.QLabel , 'lbSetPointsReqHepatitis' )
@@ -125,6 +127,7 @@
self.lbSetPointsReqDialysateFlowRate .setText("--")
self.lbSetPointsReqDialysateTemperature .setText("--")
self.lbSetPointsReqAcidConcentrate .setText("--")
+ self.lbSetPointsReqAcidConcentrateFactor.setText("--")
self.lbSetPointsReqBicarbConcentrate .setText("--")
self.lbSetPointsReqTreatmentModality .setText("--")
self.lbSetPointsReqHepatitis .setText("--")
@@ -140,25 +143,27 @@
"""
message = message['message']
index = MsgFieldPositions.START_POS_FIELD_1
- param1,index = conversions.bytearray_to_integer (message, index)
- param2,index = conversions.bytearray_to_integer (message, index)
- param3,index = conversions.bytearray_to_float (message, index)
- param4,index = conversions.bytearray_to_integer (message, index)
- param5,index = conversions.bytearray_to_integer (message, index)
- param6,index = conversions.bytearray_to_integer (message, index)
- param7,index = conversions.bytearray_to_integer (message, index)
- param8,index = conversions.bytearray_to_integer (message, index)
- param9,index = conversions.bytearray_to_integer (message, index)
+ param1,index = conversions.bytearray_to_integer (message, index)
+ param2,index = conversions.bytearray_to_integer (message, index)
+ param3,index = conversions.bytearray_to_float (message, index)
+ param4,index = conversions.bytearray_to_integer (message, index)
+ param5,index = conversions.bytearray_to_float (message, index)
+ param6,index = conversions.bytearray_to_integer (message, index)
+ param7,index = conversions.bytearray_to_integer (message, index)
+ param8,index = conversions.bytearray_to_integer (message, index)
+ param9,index = conversions.bytearray_to_integer (message, index)
+ param10,index = conversions.bytearray_to_integer (message, index)
self.lbSetPointsReqBloodFlowRate .setText( f"{param1}" )
self.lbSetPointsReqDialysateFlowRate .setText( f"{param2}" )
self.lbSetPointsReqDialysateTemperature .setText( f"{param3:.1f}" )
self.lbSetPointsReqAcidConcentrate .setText( f"{param4}" )
- self.lbSetPointsReqBicarbConcentrate .setText( f"{param5}" )
- self.lbSetPointsReqTreatmentModality .setText( f"{param6}" )
- self.lbSetPointsReqHepatitis .setText( f"{param7}" )
- self.lbSetPointsReqSodium .setText( f"{param8}" )
- self.lbSetPointsReqBicarbonate .setText( f"{param9}" )
+ self.lbSetPointsReqAcidConcentrateFactor.setText( f"{param5:.5f}" )
+ self.lbSetPointsReqBicarbConcentrate .setText( f"{param6}" )
+ self.lbSetPointsReqTreatmentModality .setText( f"{param7}" )
+ self.lbSetPointsReqHepatitis .setText( f"{param8}" )
+ self.lbSetPointsReqSodium .setText( f"{param9}" )
+ self.lbSetPointsReqBicarbonate .setText( f"{param10}" )
@Slot()