Index: TD_BloodPump/interface.ui
===================================================================
diff -u -r4b4fedc07e2f374ff7618f47d00aa2db2323f91d -rfed26cc0ded3c0c08da0588bdb531143867fd1b3
--- TD_BloodPump/interface.ui (.../interface.ui) (revision 4b4fedc07e2f374ff7618f47d00aa2db2323f91d)
+++ TD_BloodPump/interface.ui (.../interface.ui) (revision fed26cc0ded3c0c08da0588bdb531143867fd1b3)
@@ -7,203 +7,206 @@
0
0
596
- 193
+ 346
&1 States/&4 TD Blood Pump
-
- 6
-
-
-
+
-
-
-
-
-
-
-
- 0
- 0
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 464
+ 0
+
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(52, 105, 2);
+
+
+ 17 : [0x1100] : TD Blood pump
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Send
+
+
+
+ -
+
+
+ reset
+
+
+
+
+
+ -
+
+
-
+
+
+ QLayout::SetMaximumSize
+
+
+ 10
+
+
-
+
+
+ set Flow
-
-
- 464
- 0
-
+
+
+ -
+
+
+ 999
-
-
- 10
-
+
+
+ -
+
+
+ rot Count
-
- color: rgb(238, 238, 236);
-background-color: rgb(52, 105, 2);
+
+
+ -
+
+
+ 999
+
+
+ -
+
- 17 : [0x1100] : TD Blood pump
+ pres Flow
-
- Qt::AlignCenter
+
+
+ -
+
+
+ 999
- -
-
+
-
+
- Send
+ hall State
- -
-
-
- reset
+
-
+
+
+ 10
-
-
-
-
-
-
- QLayout::SetMaximumSize
+
+
+ 10
+
+
-
+
+
+ meas Flow
-
- 10
+
+
+ -
+
+
+ 999.990000000000009
-
-
-
-
- set Flow
-
-
-
- -
-
-
- 999
-
-
-
- -
-
-
- rot Count
-
-
-
- -
-
-
- 999
-
-
-
- -
-
-
- pres Flow
-
-
-
- -
-
-
- 999
-
-
-
- -
-
-
- hall State
-
-
-
- -
-
-
- 10
-
-
-
-
+
- -
-
-
- 10
+
-
+
+
+ rot Speed
-
-
-
-
- meas Flow
-
-
-
- -
-
-
- 999.990000000000009
-
-
-
- -
-
-
- rot Speed
-
-
-
- -
-
-
- 999.990000000000009
-
-
-
- -
-
-
- mot Speed
-
-
-
- -
-
-
- 999.990000000000009
-
-
-
- -
-
-
- RPM
-
-
-
- -
-
-
- 999.990000000000009
-
-
-
-
+
+ -
+
+
+ 999.990000000000009
+
+
+
+ -
+
+
+ mot Speed
+
+
+
+ -
+
+
+ 999.990000000000009
+
+
+
+ -
+
+
+ RPM
+
+
+
+ -
+
+
+ 999.990000000000009
+
+
+
+ -
+
+
+ -
+
+
+ Curr Motor
+
+
+
- -
+
-
Qt::Vertical
Index: TD_BloodPump/loader.py
===================================================================
diff -u -rf05537cca2e7e054a5124d4f5f9ed3ad26264458 -rfed26cc0ded3c0c08da0588bdb531143867fd1b3
--- TD_BloodPump/loader.py (.../loader.py) (revision f05537cca2e7e054a5124d4f5f9ed3ad26264458)
+++ TD_BloodPump/loader.py (.../loader.py) (revision fed26cc0ded3c0c08da0588bdb531143867fd1b3)
@@ -45,6 +45,7 @@
self.motSpeed = self.find_widget(QtWidgets.QDoubleSpinBox , 'motSpeedDoubleSpinBox' )
self.hallState = self.find_widget(QtWidgets.QSpinBox , 'hallStateSpinBox' )
self.sRPM = self.find_widget(QtWidgets.QDoubleSpinBox , 'rPMDoubleSpinBox' )
+ self.currMotor = self.find_widget(QtWidgets.QDoubleSpinBox , 'CurrMotorDoubleSpinBox' )
def _init_connections(self):
"""
@@ -70,6 +71,7 @@
self.motSpeed.setValue(0)
self.hallState.setValue(0)
self.sRPM.setValue(0)
+ self.currMotor.setValue(0)
@Slot()
def do_bp_data(self):
@@ -81,6 +83,7 @@
meas_flow = self.mFlow.value()
rot_speed = self.rotSpeed.value()
mot_speed = self.motSpeed.value()
+ curr_motor = self.currMotor.value()
set_rpm = self.sRPM.value()
rot_count = self.rotCount.value()
pres_flow = self.presFlow.value()
@@ -91,6 +94,7 @@
meas_flow,
rot_speed,
mot_speed,
+ curr_motor,
set_rpm, rot_count,
pres_flow,
rot_hall_state
Index: TD_Ejector/interface.ui
===================================================================
diff -u -rf05537cca2e7e054a5124d4f5f9ed3ad26264458 -rfed26cc0ded3c0c08da0588bdb531143867fd1b3
--- TD_Ejector/interface.ui (.../interface.ui) (revision f05537cca2e7e054a5124d4f5f9ed3ad26264458)
+++ TD_Ejector/interface.ui (.../interface.ui) (revision fed26cc0ded3c0c08da0588bdb531143867fd1b3)
@@ -45,7 +45,7 @@
background-color: rgb(52, 105, 2);
- 146 : [0x9200] : TD Ejector
+ 78 : [0x4E00] : TD Ejector
Qt::AlignCenter
@@ -81,23 +81,23 @@
-
- steps/min
+ set spd
- -
-
-
-
- position
+ State
-
-
+
+ -
+
+
Index: TD_Ejector/loader.py
===================================================================
diff -u -rf05537cca2e7e054a5124d4f5f9ed3ad26264458 -rfed26cc0ded3c0c08da0588bdb531143867fd1b3
--- TD_Ejector/loader.py (.../loader.py) (revision f05537cca2e7e054a5124d4f5f9ed3ad26264458)
+++ TD_Ejector/loader.py (.../loader.py) (revision fed26cc0ded3c0c08da0588bdb531143867fd1b3)
@@ -34,11 +34,11 @@
finds and creates widgets
:return: none
"""
- self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' )
- self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' )
+ self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' )
+ self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' )
- self.position = self.find_widget(QtWidgets.QSpinBox , 'positionSpinBox' )
- self.stepPerMin = self.find_widget(QtWidgets.QSpinBox , 'stepsMinSpinBox' )
+ self.state = self.find_widget(QtWidgets.QSpinBox , 'stateSpinBox' )
+ self.setSpeed = self.find_widget(QtWidgets.QDoubleSpinBox , 'setSpeedDoubleSpinBox' )
def _init_connections(self):
"""
@@ -56,18 +56,18 @@
initializes the widgets' properties
:return: none
"""
- self.position.setValue(0)
- self.stepPerMin.setValue(0)
+ self.state.setValue(0)
+ self.setSpeed.setValue(0)
@Slot()
def do_ejector_data(self):
"""
the slot for ejector change
:return: none
"""
- position = self.position.value()
- steps_per_min = self.stepPerMin.value()
+ state = self.state.value()
+ set_speed = self.setSpeed.value()
self.td_interface.td_ejector(
- position,
- steps_per_min
+ state,
+ set_speed
)
\ No newline at end of file
Index: TD_Switches/interface.ui
===================================================================
diff -u -rf05537cca2e7e054a5124d4f5f9ed3ad26264458 -rfed26cc0ded3c0c08da0588bdb531143867fd1b3
--- TD_Switches/interface.ui (.../interface.ui) (revision f05537cca2e7e054a5124d4f5f9ed3ad26264458)
+++ TD_Switches/interface.ui (.../interface.ui) (revision fed26cc0ded3c0c08da0588bdb531143867fd1b3)
@@ -44,7 +44,7 @@
background-color: rgb(52, 105, 2);
- 147 : [0x9300] : TD Switches
+ 33 : [0x2100] : TD Switches
Qt::AlignCenter
@@ -91,34 +91,6 @@
- -
-
-
- Rot1
-
-
-
- -
-
-
- 1000
-
-
-
- -
-
-
- Rot2
-
-
-
- -
-
-
- 1000
-
-
-
Index: TD_Switches/loader.py
===================================================================
diff -u -rf05537cca2e7e054a5124d4f5f9ed3ad26264458 -rfed26cc0ded3c0c08da0588bdb531143867fd1b3
--- TD_Switches/loader.py (.../loader.py) (revision f05537cca2e7e054a5124d4f5f9ed3ad26264458)
+++ TD_Switches/loader.py (.../loader.py) (revision fed26cc0ded3c0c08da0588bdb531143867fd1b3)
@@ -38,8 +38,6 @@
self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' )
self.door = self.find_widget(QtWidgets.QSpinBox , 'doorSpinBox' )
- self.rot1 = self.find_widget(QtWidgets.QSpinBox , 'rot1SpinBox' )
- self.rot2 = self.find_widget(QtWidgets.QSpinBox , 'rot2SpinBox' )
def _init_connections(self):
"""
@@ -58,8 +56,6 @@
:return: none
"""
self.door.setValue(0)
- self.rot1.setValue(0)
- self.rot2.setValue(0)
@Slot()
def do_td_switches(self):
@@ -68,10 +64,6 @@
:return: none
"""
door = self.door.value()
- rot1 = self.rot1.value()
- rot2 = self.rot2.value()
self.td_interface.td_switches(
- door,
- rot1,
- rot2
+ door
)
\ No newline at end of file
Index: TD_Valves/interface.ui
===================================================================
diff -u -rf05537cca2e7e054a5124d4f5f9ed3ad26264458 -rfed26cc0ded3c0c08da0588bdb531143867fd1b3
--- TD_Valves/interface.ui (.../interface.ui) (revision f05537cca2e7e054a5124d4f5f9ed3ad26264458)
+++ TD_Valves/interface.ui (.../interface.ui) (revision fed26cc0ded3c0c08da0588bdb531143867fd1b3)
@@ -6,110 +6,332 @@
0
0
- 352
- 124
+ 599
+ 169
&1 States/&7 TD Valves
-
+
-
-
-
-
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 350
+ 0
+
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(52, 105, 2);
+
+
+ 43 : [0x2B00] : TD Valves
+
+
+ Qt::AlignCenter
+
+
+
+
+
+ -
+
+
-
+
-
-
+
+
+
+ 100
+ 0
+
+
+
+ Valve ID
+
+
+
+ -
+
-
+
0
0
- 220
+ 400
0
-
-
- 10
-
+
+ 100
-
- color: rgb(238, 238, 236);
-background-color: rgb(52, 105, 2);
+
+ Qt::Horizontal
+
+
+ -
+
+
+
+ 60
+ 0
+
+
- 43 : [0x2B00] : TD Valves
+ 0
-
- Qt::AlignCenter
+
+
+
+
+ -
+
+
-
+
+
+
+ 100
+ 0
+
+
+
+ 100
+ 16777215
+
+
+
+ State
+
-
-
+
+
+
+ 0
+ 0
+
+
+
+ 100
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 60
+ 0
+
+
+
+
+ 60
+ 16777215
+
+
- Send
+ 0
+
+
+ -
+
-
-
+
+
+
+ 100
+ 0
+
+
+
+
+ 100
+ 16777215
+
+
- reset
+ Pos Name
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 100
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 60
+ 0
+
+
+
+
+ 60
+ 16777215
+
+
+
+ 0
+
+
+
- -
-
+
-
+
-
-
-
- QLayout::SetMaximumSize
+
+
+
+ 100
+ 0
+
-
- 10
+
+
+ 100
+ 16777215
+
-
-
-
-
- arterial
-
-
-
- -
-
-
- 1000
-
-
-
- -
-
-
- venous
-
-
-
- -
-
-
- 1000
-
-
-
-
+
+ Pos Count
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 32767
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 60
+ 0
+
+
+
+
+ 60
+ 16777215
+
+
+
+ 0
+
+
+
+ -
+
+
-
+
+
+
+ 100
+ 0
+
+
+
+ Next Pos
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 32767
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 60
+ 0
+
+
+
+
+ 60
+ 16777215
+
+
+
+ 0
+
+
+
+
+
- -
+
-
Qt::Vertical
@@ -125,5 +347,86 @@
-
+
+
+ ValveIDSlider
+ valueChanged(int)
+ ValveID
+ setNum(int)
+
+
+ 577
+ 46
+
+
+ 700
+ 46
+
+
+
+
+ StateSlider
+ valueChanged(int)
+ ValveState
+ setNum(int)
+
+
+ 556
+ 66
+
+
+ 704
+ 70
+
+
+
+
+ PosNameSlider
+ valueChanged(int)
+ PosName
+ setNum(int)
+
+
+ 665
+ 96
+
+
+ 709
+ 99
+
+
+
+
+ PosCountSlider
+ valueChanged(int)
+ PosCount
+ setNum(int)
+
+
+ 509
+ 119
+
+
+ 715
+ 118
+
+
+
+
+ NextPosSlider
+ valueChanged(int)
+ NextPos
+ setNum(int)
+
+
+ 660
+ 144
+
+
+ 710
+ 149
+
+
+
+
Index: TD_Valves/loader.py
===================================================================
diff -u -rf05537cca2e7e054a5124d4f5f9ed3ad26264458 -rfed26cc0ded3c0c08da0588bdb531143867fd1b3
--- TD_Valves/loader.py (.../loader.py) (revision f05537cca2e7e054a5124d4f5f9ed3ad26264458)
+++ TD_Valves/loader.py (.../loader.py) (revision fed26cc0ded3c0c08da0588bdb531143867fd1b3)
@@ -34,40 +34,55 @@
finds and creates widgets
:return: none
"""
- self.tbReset = self.find_widget(QtWidgets.QToolButton , 'tbReset' )
- self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' )
- self.arterial = self.find_widget(QtWidgets.QSpinBox , 'arterialSpinBox' )
- self.venous = self.find_widget(QtWidgets.QSpinBox , 'venousSpinBox' )
+ self.ValveID = self.find_widget(QtWidgets.QSlider , 'ValveIDSlider' )
+ self.State = self.find_widget(QtWidgets.QSlider , 'StateSlider' )
+ self.PosName = self.find_widget(QtWidgets.QSlider , 'PosNameSlider' )
+ self.PosCount = self.find_widget(QtWidgets.QSlider , 'PosCountSlider' )
+ self.NextPos = self.find_widget(QtWidgets.QSlider , 'NextPosSlider' )
def _init_connections(self):
"""
initializes the widgets connections
:return: none
"""
- self.tbReset.clicked.connect(self._init_widgets)
- self.tbSend.clicked.connect(self.do_valve_data)
+ # self.tbReset.clicked.connect(self._init_widgets)
+ # self.tbSend.clicked.connect(self.do_valve_data)
# self.tblOpMode.currentCellChanged.connect(self.do_treatment_states)
# self.tblSubMode.currentCellChanged.connect(self.do_treatment_states)
+ self.ValveID .valueChanged.connect(self.do_valve_data)
+ self.State .valueChanged.connect(self.do_valve_data)
+ self.PosName .valueChanged.connect(self.do_valve_data)
+ self.PosCount.valueChanged.connect(self.do_valve_data)
+ self.NextPos .valueChanged.connect(self.do_valve_data)
@Slot()
def _init_widgets(self):
"""
initializes the widgets' properties
:return: none
"""
- self.arterial.setValue(0)
- self.venous.setValue(0)
+ self.ValveID.setValue(0)
+ self.State.setValue(0)
+ self.PosName.setValue(0)
+ self.PosCount.setValue(0)
+ self.NextPos.setValue(0)
@Slot()
def do_valve_data(self):
"""
the slot for Valve data change
:return: none
"""
- arterial = self.arterial.value()
- venous = self.venous.value()
+ valve_id = self.ValveID.value()
+ state = self.State.value()
+ pos_name = self.PosName.value()
+ pos_count = self.PosCount.value()
+ next_pos = self.NextPos.value()
self.td_interface.td_valves(
- arterial,
- venous
- )
\ No newline at end of file
+ valve_id ,
+ state ,
+ pos_name ,
+ pos_count ,
+ next_pos
+ )
Index: TD_Versions/interface.ui
===================================================================
diff -u -rf05537cca2e7e054a5124d4f5f9ed3ad26264458 -rfed26cc0ded3c0c08da0588bdb531143867fd1b3
--- TD_Versions/interface.ui (.../interface.ui) (revision f05537cca2e7e054a5124d4f5f9ed3ad26264458)
+++ TD_Versions/interface.ui (.../interface.ui) (revision fed26cc0ded3c0c08da0588bdb531143867fd1b3)
@@ -77,20 +77,6 @@
- -
-
-
- Send
-
-
-
- -
-
-
- reset
-
-
-
-
@@ -107,7 +93,7 @@
- 206
+ 260
0
@@ -215,7 +201,7 @@
- 200
+ 250
0
@@ -303,7 +289,7 @@
-
-
+
-
Index: TD_Versions/loader.py
===================================================================
diff -u -rf05537cca2e7e054a5124d4f5f9ed3ad26264458 -rfed26cc0ded3c0c08da0588bdb531143867fd1b3
--- TD_Versions/loader.py (.../loader.py) (revision f05537cca2e7e054a5124d4f5f9ed3ad26264458)
+++ TD_Versions/loader.py (.../loader.py) (revision fed26cc0ded3c0c08da0588bdb531143867fd1b3)
@@ -44,7 +44,7 @@
self.comp = self.find_widget(QtWidgets.QSpinBox , 'deviceCompatibilityspinBox' )
self.fpga_id = self.find_widget(QtWidgets.QSpinBox , 'FPGAIDspinBox' )
self.fpga_major = self.find_widget(QtWidgets.QSpinBox , 'FPGAMajorspinBox' )
- self.fpga_minor = self.find_widget(QtWidgets.QSpinBox , 'deviceMinorspinBox' )
+ self.fpga_minor = self.find_widget(QtWidgets.QSpinBox , 'FPGAMinorspinBox' )
self.fpga_lab = self.find_widget(QtWidgets.QSpinBox , 'FPGALabspinBox' )
self.serial = self.find_widget(QtWidgets.QPlainTextEdit , 'deviceSerial' )