Index: TD_IsolatedUF/interface.ui
===================================================================
diff -u -rf31946354d8b5931ef6bbc0943788a7210202118 -r2f22dd779f62e03f061dc3fa000464c600d86872
--- TD_IsolatedUF/interface.ui (.../interface.ui) (revision f31946354d8b5931ef6bbc0943788a7210202118)
+++ TD_IsolatedUF/interface.ui (.../interface.ui) (revision 2f22dd779f62e03f061dc3fa000464c600d86872)
@@ -6,8 +6,8 @@
0
0
- 465
- 142
+ 462
+ 175
@@ -24,23 +24,8 @@
&3 Treatment/&7 Isolated UF
-
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
-
- 5
-
- -
+
+
-
-
@@ -77,7 +62,7 @@
- -
+
-
@@ -131,10 +116,55 @@
- -
+
-
+
+
+ 2
+
+
+ 2
+
+
+ 2
+
+
-
+
+
+ 0
+
+
+ 500
+
+
+ 0
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 50
+ 0
+
+
+
+ 0
+
+
+ Qt::AlignCenter
+
+
+
+
+
+ -
- Set Volume (mL)
+ Set Volume (L)
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -144,7 +174,7 @@
- -
+
-
2
@@ -206,10 +236,10 @@
- -
+
-
- Volume Delivered (mL)
+ Volume Delivered (L)
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -219,7 +249,7 @@
- -
+
-
2
@@ -281,8 +311,18 @@
- -
-
+
-
+
+
+ Rate (L/Hr)
+
+
+
+ -
+
+
+ 2
+
2
@@ -292,24 +332,21 @@
2
+
+ 2
+
-
-
-
- 0
-
+
- 500
+ 3000
-
- 0
-
Qt::Horizontal
-
-
+
50
@@ -326,18 +363,15 @@
- -
-
+
-
+
- Rate (mL/Hr)
+ Elapsed Time (sec)
- -
-
-
- 2
-
+
-
+
2
@@ -347,21 +381,24 @@
2
-
- 2
-
-
-
+
+
+ 0
+
- 3000
+ 500
+
+ 0
+
Qt::Horizontal
-
-
+
50
Index: TD_IsolatedUF/loader.py
===================================================================
diff -u -rae1930d3e2a41d3862a9e77e4607aaf6b896665e -r2f22dd779f62e03f061dc3fa000464c600d86872
--- TD_IsolatedUF/loader.py (.../loader.py) (revision ae1930d3e2a41d3862a9e77e4607aaf6b896665e)
+++ TD_IsolatedUF/loader.py (.../loader.py) (revision 2f22dd779f62e03f061dc3fa000464c600d86872)
@@ -37,11 +37,15 @@
finds and creates widgets
:return: none
"""
+ self.uf_scaling = 100.00 # UF Scaling factor to be 2 decimal places
+
self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' )
self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' )
self.slDuration = self.find_widget(QtWidgets.QSlider , 'slDuration' )
self.lbDuration = self.find_widget(QtWidgets.QLabel , 'lbDuration' )
+ self.slElapsedTime = self.find_widget(QtWidgets.QSlider , 'slElapsedTime' )
+ self.lbElapsedTime = self.find_widget(QtWidgets.QLabel , 'lbElapsedTime' )
self.slSetVolume = self.find_widget(QtWidgets.QSlider , 'slSetVolume' )
self.lbSetVolume = self.find_widget(QtWidgets.QLabel , 'lbSetVolume' )
self.slVolumeDelivered = self.find_widget(QtWidgets.QSlider , 'slVolumeDelivered' )
@@ -60,11 +64,13 @@
self.slDuration .valueChanged .connect(self.do_send)
self.slDuration .valueChanged .connect(lambda value: self.lbDuration.setText(f"{value}"))
self.slSetVolume .valueChanged .connect(self.do_send)
- self.slSetVolume .valueChanged .connect(lambda value: self.lbSetVolume.setText(f"{value}"))
+ self.slSetVolume .valueChanged .connect(lambda value: self.lbSetVolume.setText(f"{value:.2f}"))
self.slVolumeDelivered .valueChanged .connect(self.do_send)
- self.slVolumeDelivered .valueChanged .connect(lambda value: self.lbVolumeDelivered.setText(f"{value}"))
+ self.slVolumeDelivered .valueChanged .connect(lambda value: self.lbVolumeDelivered.setText(f"{value:.2f}"))
self.slRate .valueChanged .connect(self.do_send)
- self.slRate .valueChanged .connect(lambda value: self.lbRate.setText(f"{value}"))
+ self.slRate .valueChanged .connect(lambda value: self.lbRate.setText(f"{value:.2f}"))
+ self.slElapsedTime .valueChanged .connect(self.do_send)
+ self.slElapsedTime .valueChanged .connect(lambda value: self.lbElapsedTime.setText(f"{value}"))
@Slot()
@@ -82,17 +88,21 @@
slot for sending blood prime data
:return: none
"""
+
self.td_interface.td_isolated_uf(
self.slDuration.value(),
- self.slSetVolume.value(),
- self.slVolumeDelivered.value(),
- self.slRate.value(),
+ self.slElapsedTime.value(),
+ 0 if self.slDuration.value()- self.slElapsedTime.value() <= 0 else self.slDuration.value() - self.slElapsedTime.value(),
+ self.slSetVolume.value() / self.uf_scaling,
+ self.slVolumeDelivered.value() / self.uf_scaling,
+ self.slRate.value() / self.uf_scaling,
)
@Slot()
def do_reset(self):
self.slDuration .setValue(0)
+ self.slElapsedTime .setValue(0)
self.slSetVolume .setValue(0)
self.slVolumeDelivered .setValue(0)
self.slRate .setValue(0)