Index: TD_Prime/interface.ui
===================================================================
diff -u
--- TD_Prime/interface.ui (revision 0)
+++ TD_Prime/interface.ui (revision 4902b21dfddcccdbbef2e51ae9a1b2123aeeba73)
@@ -0,0 +1,197 @@
+
+
+ ui_interface
+
+
+
+ 0
+ 0
+ 383
+ 134
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+
+ 100000
+ 100000
+
+
+
+
+ 10
+
+
+
+ &2 Pre-Treatment/&2 Prime
+
+
+ -
+
+
-
+
+
+
+ 200
+ 0
+
+
+
+ 480
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ State
+
+
+
+ -
+
+
+
+ 40
+ 0
+
+
+
+ 0
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Total
+
+
+
+ -
+
+
+
+ 200
+ 0
+
+
+
+ 480
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 200
+ 0
+
+
+
+ 480
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+
+ 40
+ 0
+
+
+
+ 0
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 40
+ 0
+
+
+
+ 0
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Countdown
+
+
+
+ -
+
+
+ Pause Countdown
+
+
+
+ -
+
+
+ -
+
+
+ color: rgb(238, 238, 236);
+background-color: #0E4C92;
+
+
+
+ 199 : [0xC700] : Prime Data
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+ Send
+
+
+
+
+
+
+
+
+
+
Index: TD_Prime/loader.py
===================================================================
diff -u
--- TD_Prime/loader.py (revision 0)
+++ TD_Prime/loader.py (revision 4902b21dfddcccdbbef2e51ae9a1b2123aeeba73)
@@ -0,0 +1,90 @@
+"""
+ TD Prime UI loader
+"""
+# Python
+import os
+import can
+import struct
+
+# Qt
+from PySide2 import QtCore, QtWidgets
+from PySide2.QtCore import Slot
+
+# parent
+from engine.dynamicloader import DynamicLoader
+
+# plugin specific
+from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
+from leahi_dialin.protocols import CAN
+from leahi_dialin.utils import conversions
+
+# td simulator
+from leahi_dialin.ui.td_messaging import TD_Messaging
+
+class Loader(DynamicLoader):
+ """
+ TD Prime UI loader
+ """
+ def __init__(self):
+ self.td_interface = TD_Messaging()
+ self.can_interface = self.td_interface.can_interface
+ super().__init__(os.path.dirname(__file__))
+
+
+ def _init_loader(self):
+ """
+ finds and creates widgets
+ :return: none
+ """
+ self.tbSend = self.find_widget(QtWidgets.QToolButton , 'tbSend' )
+
+ self.sbState = self.find_widget(QtWidgets.QSpinBox , 'sbState' )
+ self.slTotal = self.find_widget(QtWidgets.QSlider , 'slTotal' )
+ self.lbTotal = self.find_widget(QtWidgets.QLabel , 'lbTotal' )
+ self.slCountdown = self.find_widget(QtWidgets.QSlider , 'slCountdown' )
+ self.lbCountdown = self.find_widget(QtWidgets.QLabel , 'lbCountdown' )
+ self.slPauseCountdown = self.find_widget(QtWidgets.QSlider , 'slPauseCountdown' )
+ self.lbPauseCountdown = self.find_widget(QtWidgets.QLabel , 'lbPauseCountdown' )
+
+
+ def _init_connections(self):
+ """
+ initializes the widget's connections
+ :return: none
+ """
+ self.tbSend .clicked.connect ( self.do_prime_data )
+ self.slTotal .valueChanged.connect ( self.do_prime_data )
+ self.slTotal .valueChanged.connect ( lambda value: self.lbTotal.setText(f"{value}") )
+ self.slCountdown .valueChanged.connect ( self.do_prime_data )
+ self.slCountdown .valueChanged.connect ( lambda value: self.lbCountdown.setText(f"{value}") )
+ self.slPauseCountdown .valueChanged.connect ( self.do_prime_data )
+ self.slPauseCountdown .valueChanged.connect ( lambda value: self.lbPauseCountdown.setText(f"{value}") )
+ self.sbState .valueChanged.connect ( self.do_prime_data )
+
+
+ @Slot()
+ def _init_widgets(self):
+ """
+ initializes the widget's properties
+ :return: none
+ """
+ self.sbState .setValue ( 0 )
+ self.slTotal .setValue ( 0 )
+ self.slCountdown .setValue ( 0 )
+ self.slPauseCountdown .setValue ( 0 )
+
+
+ @Slot()
+ def do_prime_data(self):
+ """
+ the slot for sending prime progress data
+ :return: none
+ """
+ self.td_interface.td_prime_data(
+ self.sbState .value(),
+ self.slTotal .value(),
+ self.slCountdown .value(),
+ self.slPauseCountdown .value()
+ )
+
+
Index: TD_Valves/interface.ui
===================================================================
diff -u -r5875ce76e61acd0220d42445b8cfaed8c3af0a0f -r4902b21dfddcccdbbef2e51ae9a1b2123aeeba73
--- TD_Valves/interface.ui (.../interface.ui) (revision 5875ce76e61acd0220d42445b8cfaed8c3af0a0f)
+++ TD_Valves/interface.ui (.../interface.ui) (revision 4902b21dfddcccdbbef2e51ae9a1b2123aeeba73)
@@ -7,7 +7,7 @@
0
0
456
- 385
+ 317
@@ -266,58 +266,6 @@
- -
-
-
-
-
-
-
- 100
- 0
-
-
-
-
- 100
- 16777215
-
-
-
- Pos D
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
-
- 100
- 0
-
-
-
-
- 100
- 16777215
-
-
-
- Max Homing Pos
-
-
-
- -
-
-
-
-
Index: TD_Valves/loader.py
===================================================================
diff -u -r5875ce76e61acd0220d42445b8cfaed8c3af0a0f -r4902b21dfddcccdbbef2e51ae9a1b2123aeeba73
--- TD_Valves/loader.py (.../loader.py) (revision 5875ce76e61acd0220d42445b8cfaed8c3af0a0f)
+++ TD_Valves/loader.py (.../loader.py) (revision 4902b21dfddcccdbbef2e51ae9a1b2123aeeba73)
@@ -41,8 +41,6 @@
self.sbPosA = self.find_widget(QtWidgets.QSpinBox , 'sbPosA' )
self.sbPosB = self.find_widget(QtWidgets.QSpinBox , 'sbPosB' )
self.sbPosC = self.find_widget(QtWidgets.QSpinBox , 'sbPosC' )
- self.sbPosD = self.find_widget(QtWidgets.QSpinBox , 'sbPosD' )
- self.sbMaxHomingPos = self.find_widget(QtWidgets.QSpinBox , 'sbMaxHomingPos' )
def _init_connections(self):
"""
@@ -66,8 +64,6 @@
self.sbPosA .setValue(0)
self.sbPosB .setValue(0)
self.sbPosC .setValue(0)
- self.sbPosD .setValue(0)
- self.sbMaxHomingPos .setValue(0)
@Slot()
def do_valve_data(self):
@@ -83,7 +79,5 @@
self.sbCmdPos .value() ,
self.sbPosA .value() ,
self.sbPosB .value() ,
- self.sbPosC .value() ,
- self.sbPosD .value() ,
- self.sbMaxHomingPos.value()
+ self.sbPosC .value()
)