Index: TD_TreatmentAdjustmentsDuration/interface.ui
===================================================================
diff -u -r5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd -r3f68dea5e1d134194d637125d6217f74f4c05561
--- TD_TreatmentAdjustmentsDuration/interface.ui (.../interface.ui) (revision 5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd)
+++ TD_TreatmentAdjustmentsDuration/interface.ui (.../interface.ui) (revision 3f68dea5e1d134194d637125d6217f74f4c05561)
@@ -6,8 +6,8 @@
0
0
- 404
- 292
+ 412
+ 359
@@ -24,22 +24,7 @@
&3 Treatment/Adjustments/&1 Duration
-
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
+
-
-
@@ -203,7 +188,7 @@
-
- UF Volume Goal (mL)
+ UF Volume Goal (L)
@@ -366,25 +351,54 @@
+ -
+
+
+
+ 10
+
+
+
+ Heparin Duration (min)
+
+
+
+ -
+
+
-
+
+
+ 540
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 40
+ 0
+
+
+
+ --
+
+
+ Qt::AlignCenter
+
+
+
+
+
- -
-
-
- Qt::Vertical
-
-
-
- 0
- 0
-
-
-
-
- -
+
-
QFrame::StyledPanel
@@ -449,36 +463,13 @@
-
- Req [0x7800]
-Duration (min)
+ Req [0x7800]
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
- -
-
-
-
- 0
- 0
-
-
-
- QFrame::Box
-
-
- QFrame::Sunken
-
-
- --
-
-
- Qt::AlignCenter
-
-
-
-
@@ -496,24 +487,140 @@
+ -
+
+
-
+
+
-
+
+
+ Duration (min)
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 80
+ 0
+
+
+
+ QFrame::Box
+
+
+ QFrame::Sunken
+
+
+ --
+
+
+ Qt::AlignCenter
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 10
+
+
+
+ Heparin Duration (min)
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 80
+ 0
+
+
+
+ QFrame::Box
+
+
+ QFrame::Sunken
+
+
+ --
+
+
+ Qt::AlignCenter
+
+
+
+
+
+ -
+
+
-
+
+
+ UF Rate (L/hr)
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 80
+ 0
+
+
+
+ QFrame::Box
+
+
+ QFrame::Sunken
+
+
+ --
+
+
+ Qt::AlignCenter
+
+
+
+
+
+
+
- -
-
-
- Qt::Vertical
-
-
-
- 0
- 0
-
-
-
-
Index: TD_TreatmentAdjustmentsDuration/loader.py
===================================================================
diff -u -r5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd -r3f68dea5e1d134194d637125d6217f74f4c05561
--- TD_TreatmentAdjustmentsDuration/loader.py (.../loader.py) (revision 5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd)
+++ TD_TreatmentAdjustmentsDuration/loader.py (.../loader.py) (revision 3f68dea5e1d134194d637125d6217f74f4c05561)
@@ -56,6 +56,8 @@
self.sbEditRspRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbEditRspRejectionReason' )
self.slEditRspDuration = self.find_widget(QtWidgets.QSlider , 'slEditRspDuration' )
self.lbEditRspDuration = self.find_widget(QtWidgets.QLabel , 'lbEditRspDuration' )
+ self.slEditRspHeparinDuration = self.find_widget(QtWidgets.QSlider , 'slEditRspHeparinDuration' )
+ self.lbEditRspHeparinDuration = self.find_widget(QtWidgets.QLabel , 'lbEditRspHeparinDuration' )
self.slEditRspUfVolumeGoal = self.find_widget(QtWidgets.QSlider , 'slEditRspUfVolumeGoal' )
self.lbEditRspUfVolumeGoal = self.find_widget(QtWidgets.QLabel , 'lbEditRspUfVolumeGoal' )
self.slEditRspUfRate = self.find_widget(QtWidgets.QSlider , 'slEditRspUfRate' )
@@ -64,6 +66,8 @@
self.tbConfirmRspSend = self.find_widget(QtWidgets.QToolButton , 'tbConfirmRspSend' )
self.tbConfirmRspReset = self.find_widget(QtWidgets.QToolButton , 'tbConfirmRspReset' )
self.lbConfirmReqDuration = self.find_widget(QtWidgets.QLabel , 'lbConfirmReqDuration' )
+ self.lbConfirmReqHeparinDuration = self.find_widget(QtWidgets.QLabel , 'lbConfirmReqHeparinDuration' )
+ self.lbConfirmReqRate = self.find_widget(QtWidgets.QLabel , 'lbConfirmReqRate' )
self.sbConfirmRspRejectionReason = self.find_widget(QtWidgets.QSpinBox , 'sbConfirmRspRejectionReason' )
@@ -78,6 +82,7 @@
self.tbEditRspCopy .clicked .connect(self.do_copy_edit_response )
self.tbEditRspReset .clicked .connect(self.init_edit_response )
self.slEditRspDuration .valueChanged .connect(lambda value: self.lbEditRspDuration.setText(f"{value}") )
+ self.slEditRspHeparinDuration .valueChanged .connect(lambda value: self.lbEditRspHeparinDuration.setText(f"{value}") )
self.slEditRspUfVolumeGoal .valueChanged .connect(lambda value: self.lbEditRspUfVolumeGoal.setText(f"{value/1000:.2f}") )
self.slEditRspUfRate .valueChanged .connect(lambda value: self.lbEditRspUfRate.setText(f"{value/1000:.2f}") )
@@ -112,6 +117,8 @@
self.sbEditRspRejectionReason .setValue(0)
self.slEditRspDuration .setValue(0)
self.lbEditRspDuration .setText("{0}".format(self.slEditRspDuration.value()))
+ self.slEditRspHeparinDuration .setValue(0)
+ self.lbEditRspHeparinDuration .setText("{0}".format(self.slEditRspHeparinDuration.value()))
self.slEditRspUfVolumeGoal .setValue(0)
self.lbEditRspUfVolumeGoal .setText("{0:.2f}".format(self.slEditRspUfVolumeGoal.value() / 1000))
self.slEditRspUfRate .setValue(0)
@@ -127,7 +134,8 @@
self.td_interface.td_duration_validate_response(
self.sbEditRspRejectionReason .value(),
self.slEditRspDuration .value(),
- self.slEditRspUfVolumeGoal .value(),
+ self.slEditRspHeparinDuration .value(),
+ self.slEditRspUfVolumeGoal .value() / 1000,
self.slEditRspUfRate .value() / 1000
)
@@ -150,13 +158,19 @@
"""
message = message['message']
index = MsgFieldPositions.START_POS_FIELD_1
- value,index = conversions.bytearray_to_integer(message, index)
- self.lbConfirmReqDuration.setText(f"{value}")
+ duration,index = conversions.bytearray_to_integer (message, index)
+ hepDuration,index = conversions.bytearray_to_integer (message, index)
+ rate,index = conversions.bytearray_to_float (message, index)
+ self.lbConfirmReqDuration .setText(f"{duration}")
+ self.lbConfirmReqHeparinDuration .setText(f"{hepDuration}")
+ self.lbConfirmReqRate .setText(f"{rate:.2f}")
@Slot()
def init_confirm_response(self):
self.lbConfirmReqDuration .setText("--")
+ self.lbConfirmReqHeparinDuration .setText("--")
+ self.lbConfirmReqRate .setText("--")
self.sbConfirmRspRejectionReason .setValue(0)