Index: TD_TreatmentAdjustmentsUltrafiltration/interface.ui
===================================================================
diff -u -r85dcfe80f3e4c9d51423fa66d98647f83ebcd85c -r6096978cdce08be0b604f9e5653d8608e624111e
--- TD_TreatmentAdjustmentsUltrafiltration/interface.ui (.../interface.ui) (revision 85dcfe80f3e4c9d51423fa66d98647f83ebcd85c)
+++ TD_TreatmentAdjustmentsUltrafiltration/interface.ui (.../interface.ui) (revision 6096978cdce08be0b604f9e5653d8608e624111e)
@@ -6,7 +6,7 @@
0
0
- 423
+ 913
457
@@ -24,23 +24,8 @@
&3 Treatment/Adjustments/&4 Ultrafiltration
-
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
- -
+
+
-
@@ -66,7 +51,7 @@
- -
+
-
@@ -148,33 +133,37 @@
Req [0x4100]
-Volume (mL)
+Volume (L)
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
- 10
-
-
-
- QFrame::Box
-
-
- QFrame::Raised
-
-
- --
-
-
- Qt::AlignCenter
-
-
+
+
-
+
+
+
+ 10
+
+
+
+ QFrame::Box
+
+
+ QFrame::Raised
+
+
+ --
+
+
+ Qt::AlignCenter
+
+
+
+
-
@@ -193,7 +182,7 @@
-
- Volume (mL)
+ Volume (L)
@@ -244,122 +233,17 @@
- -
-
-
- Duration (min)
-
-
-
-
-
-
-
-
-
-
- 250
- 0
-
-
-
- 4800
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 50
- 0
-
-
-
-
- 10
-
-
-
- 0.00
-
-
- Qt::AlignCenter
-
-
-
-
+
-
-
-
- Time Diff
-
-
-
- -
-
-
-
-
-
-
- 250
- 0
-
-
-
- 4800
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 50
- 0
-
-
-
-
- 10
-
-
-
- 0.00
-
-
- Qt::AlignCenter
-
-
-
-
-
- -
Rate (L/Hr)
- -
+
-
-
@@ -400,102 +284,6 @@
- -
-
-
- Rate Diff (L/Hr)
-
-
-
- -
-
-
-
-
-
- 2000
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 50
- 0
-
-
-
-
- 10
-
-
-
- 0.00
-
-
- Qt::AlignCenter
-
-
-
-
-
- -
-
-
- Old Rate (L/Hr)
-
-
-
- -
-
-
-
-
-
- 2000
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 50
- 0
-
-
-
-
- 10
-
-
-
- 0.00
-
-
- Qt::AlignCenter
-
-
-
-
-
-
@@ -514,7 +302,7 @@
- -
+
-
QFrame::StyledPanel
@@ -649,7 +437,7 @@
- -
+
-
QFrame::StyledPanel
@@ -718,35 +506,13 @@
-
- Req [0x6600]
-Volume (mL)
+ Req [0x6600]
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
- -
-
-
-
- 10
-
-
-
- QFrame::Box
-
-
- QFrame::Raised
-
-
- --
-
-
- Qt::AlignCenter
-
-
-
-
@@ -761,6 +527,72 @@
+ -
+
+
-
+
+
+ Volume (L)
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ QFrame::Box
+
+
+ QFrame::Raised
+
+
+ --
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Rate (L/Hr)
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 10
+
+
+
+ QFrame::Box
+
+
+ QFrame::Raised
+
+
+ --
+
+
+ Qt::AlignCenter
+
+
+
+
+
-
Index: TD_TreatmentAdjustmentsUltrafiltration/loader.py
===================================================================
diff -u -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b -r6096978cdce08be0b604f9e5653d8608e624111e
--- TD_TreatmentAdjustmentsUltrafiltration/loader.py (.../loader.py) (revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b)
+++ TD_TreatmentAdjustmentsUltrafiltration/loader.py (.../loader.py) (revision 6096978cdce08be0b604f9e5653d8608e624111e)
@@ -63,20 +63,13 @@
self.changeRejectReason = self.find_widget(QtWidgets.QSpinBox , 'changeRejectReasonSpinBox' )
self.changeVolume = self.find_widget(QtWidgets.QSlider , 'changeVolumeSlider' )
self.changeVolumeLabel = self.find_widget(QtWidgets.QLabel , 'changeVolumeLabel' )
- self.changeDuration = self.find_widget(QtWidgets.QSlider , 'changeDurationSlider' )
- self.changeDurationLabel = self.find_widget(QtWidgets.QLabel , 'changeDurationLabel' )
- self.changeTimeDiff = self.find_widget(QtWidgets.QSlider , 'changeTimeDiffSlider' )
- self.changeTimeDiffLabel = self.find_widget(QtWidgets.QLabel , 'changeTimeDiffLabel' )
self.changeRate = self.find_widget(QtWidgets.QSlider , 'changeRateSlider' )
self.changeRateLabel = self.find_widget(QtWidgets.QLabel , 'changeRateLabel' )
- self.changeRateDiff = self.find_widget(QtWidgets.QSlider , 'changeRateDiffSlider' )
- self.changeRateDiffLabel = self.find_widget(QtWidgets.QLabel , 'changeRateDiffLabel' )
- self.changeOldRate = self.find_widget(QtWidgets.QSlider , 'changeOldRateSlider' )
- self.changeOldRateLabel = self.find_widget(QtWidgets.QLabel , 'changeOldRateLabel' )
self.confirmSend = self.find_widget(QtWidgets.QToolButton , 'confirmSendButton' )
self.confirmReset = self.find_widget(QtWidgets.QToolButton , 'confirmResetButton' )
- self.confirmRequestLabel = self.find_widget(QtWidgets.QLabel , 'confirmRequestLabel' )
+ self.confirmRequestVolume = self.find_widget(QtWidgets.QLabel , 'confirmRequestVolume' )
+ self.confirmRequestRate = self.find_widget(QtWidgets.QLabel , 'confirmRequestRate' )
self.confirmRejectReason = self.find_widget(QtWidgets.QSpinBox , 'confirmRejectReasonSpinBox' )
def _init_connections(self):
@@ -90,11 +83,7 @@
self.changeSend.clicked.connect(self.do_settings_change)
self.changeReset.clicked.connect(self.init_settings_change)
self.changeVolume.valueChanged.connect(lambda value: self.changeVolumeLabel.setText(f"{value/1000:.2f}"))
- self.changeDuration.valueChanged.connect(lambda value: self.changeDurationLabel.setText(f"{value}"))
- self.changeTimeDiff.valueChanged.connect(lambda value: self.changeTimeDiffLabel.setText(f"{value}"))
self.changeRate.valueChanged.connect(lambda value: self.changeRateLabel.setText(f"{value/1000:.2f}"))
- self.changeRateDiff.valueChanged.connect(lambda value: self.changeRateDiffLabel.setText(f"{value/1000:.2f}"))
- self.changeOldRate.valueChanged.connect(lambda value: self.changeOldRateLabel.setText(f"{value/1000:.2f}"))
self.confirmSend.clicked.connect(self.do_confirm)
self.confirmReset.clicked.connect(self.init_confirm)
@@ -118,11 +107,7 @@
self.changeRequestLabel .setText("--")
self.changeRejectReason .setValue(0)
self.changeVolume .setValue(0)
- self.changeDuration .setValue(0)
- self.changeTimeDiff .setValue(0)
self.changeRate .setValue(0)
- self.changeRateDiff .setValue(0)
- self.changeOldRate .setValue(0)
@Slot()
def handle_settings_change_request(self, message, timestamp = 0.0):
@@ -133,7 +118,7 @@
message = message['message']
index = MsgFieldPositions.START_POS_FIELD_1
value,index = conversions.bytearray_to_float(message, index)
- self.changeRequestLabel.setText(f"{value:.0f}")
+ self.changeRequestLabel.setText(f"{value:.2f}")
@Slot()
def do_settings_change(self):
@@ -143,13 +128,10 @@
"""
payload = conversions.integer_to_bytearray(1 if self.changeRejectReason.value() == 0 else 0)
payload += conversions.integer_to_bytearray(self.changeRejectReason.value())
- payload += conversions.float_to_bytearray(self.changeVolume.value())
- payload += conversions.integer_to_bytearray(self.changeDuration.value())
- payload += conversions.integer_to_bytearray(self.changeTimeDiff.value())
+ payload += conversions.float_to_bytearray(self.changeVolume.value()/1000)
payload += conversions.float_to_bytearray(self.changeRate.value()/1000)
- payload += conversions.float_to_bytearray(self.changeRateDiff.value()/1000)
- payload += conversions.float_to_bytearray(self.changeOldRate.value()/1000)
+
self.td_interface.cmd_send_general_response(
message_id = MsgIds.MSG_ID_TD_RESP_ULTRAFILTRATION_VOLUME_TO_VALIDATE.value,
accepted = 1 if self.changeRejectReason.value() == 0 else 0,
@@ -197,7 +179,8 @@
slot for initializing UF confirm
:return: none
"""
- self.confirmRequestLabel .setText("--")
+ self.confirmRequestVolume .setText("--")
+ self.confirmRequestRate .setText("--")
self.confirmRejectReason .setValue(0)
@Slot()
@@ -208,8 +191,10 @@
"""
message = message['message']
index = MsgFieldPositions.START_POS_FIELD_1
- value,index = conversions.bytearray_to_float(message, index)
- self.confirmRequestLabel.setText(f"{value:.0f}")
+ volume,index = conversions.bytearray_to_float(message, index)
+ rate,index = conversions.bytearray_to_float(message, index)
+ self.confirmRequestVolume.setText(f"{volume:.2f}")
+ self.confirmRequestRate.setText(f"{rate:.2f}")
@Slot()
def do_confirm(self):