Index: TD_TreatmentAdjustmentsSetPoints/interface.ui
===================================================================
diff -u -r5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd -r56cb5aea19a2bbac47e06e4631f53a082b1be29a
--- TD_TreatmentAdjustmentsSetPoints/interface.ui (.../interface.ui) (revision 5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd)
+++ TD_TreatmentAdjustmentsSetPoints/interface.ui (.../interface.ui) (revision 56cb5aea19a2bbac47e06e4631f53a082b1be29a)
@@ -7,7 +7,7 @@
0
0
743
- 297
+ 369
@@ -24,23 +24,8 @@
&3 Treatment/Adjustments/&5 Set Points
-
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
- -
+
+
-
2
@@ -215,6 +200,98 @@
+ -
+
+
+ QFrame::Box
+
+
+ QFrame::Sunken
+
+
+ --
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Treatment Modality
+
+
+
+ -
+
+
+ QFrame::Box
+
+
+ QFrame::Sunken
+
+
+ --
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ QFrame::Box
+
+
+ QFrame::Sunken
+
+
+ --
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ QFrame::Box
+
+
+ QFrame::Sunken
+
+
+ --
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Hepatitis
+
+
+
+ -
+
+
+ Sodium
+
+
+
+ -
+
+
+ Bicarbonate
+
+
+
@@ -319,7 +396,7 @@
- -
+
-
2
Index: TD_TreatmentAdjustmentsSetPoints/loader.py
===================================================================
diff -u -r84da8cf3d6bfa361a9597bc4ffde504f73d34fb5 -r56cb5aea19a2bbac47e06e4631f53a082b1be29a
--- TD_TreatmentAdjustmentsSetPoints/loader.py (.../loader.py) (revision 84da8cf3d6bfa361a9597bc4ffde504f73d34fb5)
+++ TD_TreatmentAdjustmentsSetPoints/loader.py (.../loader.py) (revision 56cb5aea19a2bbac47e06e4631f53a082b1be29a)
@@ -61,6 +61,10 @@
self.lbSetPointsReqDialysateTemperature = self.find_widget(QtWidgets.QLabel , 'lbSetPointsReqDialysateTemperature' )
self.lbSetPointsReqAcidConcentrate = self.find_widget(QtWidgets.QLabel , 'lbSetPointsReqAcidConcentrate' )
self.lbSetPointsReqBicarbConcentrate = self.find_widget(QtWidgets.QLabel , 'lbSetPointsReqBicarbConcentrate' )
+ self.lbSetPointsReqTreatmentModality = self.find_widget(QtWidgets.QLabel , 'lbSetPointsReqTreatmentModality' )
+ self.lbSetPointsReqHepatitis = self.find_widget(QtWidgets.QLabel , 'lbSetPointsReqHepatitis' )
+ self.lbSetPointsReqSodium = self.find_widget(QtWidgets.QLabel , 'lbSetPointsReqSodium' )
+ self.lbSetPointsReqBicarbonate = self.find_widget(QtWidgets.QLabel , 'lbSetPointsReqBicarbonate' )
self.tbSetPointsRspSend = self.find_widget(QtWidgets.QToolButton , 'tbSetPointsRspSend' )
self.tbSetPointsRspReset = self.find_widget(QtWidgets.QToolButton , 'tbSetPointsRspReset' )
@@ -122,6 +126,10 @@
self.lbSetPointsReqDialysateTemperature .setText("--")
self.lbSetPointsReqAcidConcentrate .setText("--")
self.lbSetPointsReqBicarbConcentrate .setText("--")
+ self.lbSetPointsReqTreatmentModality .setText("--")
+ self.lbSetPointsReqHepatitis .setText("--")
+ self.lbSetPointsReqSodium .setText("--")
+ self.lbSetPointsReqBicarbonate .setText("--")
@Slot()
@@ -137,12 +145,20 @@
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)
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}" )
@Slot()