Index: TD_Pre_Treatment/interface.ui
===================================================================
diff -u -rc3941c2f98ef15de30ccac6bb2a88d644f24e946 -r0faa9b7bb3739a7d640f6f4065e1cfbb8c446a32
--- TD_Pre_Treatment/interface.ui (.../interface.ui) (revision c3941c2f98ef15de30ccac6bb2a88d644f24e946)
+++ TD_Pre_Treatment/interface.ui (.../interface.ui) (revision 0faa9b7bb3739a7d640f6f4065e1cfbb8c446a32)
@@ -6,8 +6,8 @@
0
0
- 751
- 561
+ 817
+ 555
@@ -1243,23 +1243,6 @@
-
-
-
- Reason
-
-
-
- -
-
-
- -
-
-
- ⟲
-
-
-
- -
Qt::Horizontal
@@ -1342,7 +1325,20 @@
- -
+
-
+
+
+
+ 50
+ 16777215
+
+
+
+ 900
+
+
+
+ -
Qt::Horizontal
@@ -1355,16 +1351,16 @@
- -
-
-
+
-
+
+
- 50
- 16777215
+ 0
+ 0
-
- 900
+
+ Reason
@@ -1381,19 +1377,6 @@
- -
-
-
-
- 0
- 0
-
-
-
- Reason
-
-
-
-
@@ -1420,68 +1403,87 @@
+ -
+
+
+ ⟲
+
+
+
- -
-
-
-
- 10
-
+
-
+
+
+
+ 0
+ 0
+
-
- color: rgb(238, 238, 236);
-background-color:rgb(173, 127, 168)
+
+
+ 352
+ 0
+
-
- 69 :[0x4500] Pre-Treatment
+
+
+ 16777215
+ 16777215
+
-
- Qt::AlignCenter
-
-
-
- -
-
10
color: rgb(238, 238, 236);
-background-color:rgb(173, 127, 168)
+background-color: rgb(92, 53, 102);
+
- 53:[0x3500] Create Rx
+ 146 : [0x9200] : Auto Load
Qt::AlignCenter
- -
-
-
-
- 10
-
-
-
- color: rgb(238, 238, 236);
-background-color:rgb(173, 127, 168)
-
-
- Start Treatment
-
-
- Qt::AlignCenter
-
-
-
-
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 0
+ 0
+
+
+
+ false
+
+
+ QFrame::WinPanel
+
+
+ QFrame::Sunken
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
Qt::Horizontal
@@ -1495,9 +1497,12 @@
-
-
+
+
+ -
+
- Standby
+ Reason
@@ -1515,40 +1520,16 @@
-
-
-
-
- 0
- 0
-
-
-
-
- 0
- 0
-
-
-
- false
-
-
- QFrame::WinPanel
-
-
- QFrame::Sunken
-
+
- -
+ Send
-
- Qt::AlignCenter
-
-
-
+
- Pre-Treatment
+ ⟲
@@ -1567,64 +1548,108 @@
- -
-
-
-
- 0
- 0
-
+
-
+
+
+
+ 10
+
-
-
- 352
- 0
-
+
+ color: rgb(238, 238, 236);
+background-color:rgb(173, 127, 168)
-
-
- 16777215
- 16777215
-
+
+ 69 :[0x4500] Pre-Treatment
+
+ Qt::AlignCenter
+
+
+
+ -
+
10
color: rgb(238, 238, 236);
-background-color: rgb(92, 53, 102);
-
+background-color:rgb(173, 127, 168)
- 146 : [0x9200] : Auto Load
+ 53:[0x3500] Create Rx
Qt::AlignCenter
+ -
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color:rgb(173, 127, 168)
+
+
+ Start Treatment
+
+
+ Qt::AlignCenter
+
+
+
-
-
-
-
-
-
- Start Treatment
+
-
+
+
+
+ 50
+ 16777215
+
+
+ -2147483647
+
+
+ 2147483647
+
+
+ 3
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
-
Reason
- -
-
+
-
+
Qt::Horizontal
@@ -1661,8 +1686,8 @@
- -
-
+
-
+
Qt::Horizontal
@@ -1674,38 +1699,13 @@
- -
-
-
-
- 50
- 16777215
-
+
-
+
+
+ ⟲
-
- -2147483647
-
-
- 2147483647
-
-
- 3
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
Index: TD_Pre_Treatment/loader.py
===================================================================
diff -u -r7006afe58ff6d87b2e2dc1e6b582f75ee54d176f -r0faa9b7bb3739a7d640f6f4065e1cfbb8c446a32
--- TD_Pre_Treatment/loader.py (.../loader.py) (revision 7006afe58ff6d87b2e2dc1e6b582f75ee54d176f)
+++ TD_Pre_Treatment/loader.py (.../loader.py) (revision 0faa9b7bb3739a7d640f6f4065e1cfbb8c446a32)
@@ -60,13 +60,13 @@
finds and creates widgets
:return: none
"""
- self.btnStandby = self.find_widget(QtWidgets.QPushButton, 'btnStandby' )
self.btnCreate_tx = self.find_widget(QtWidgets.QPushButton, 'btnCreate' )
self.btnCreateReset = self.find_widget(QtWidgets.QToolButton, 'btnCreateReset' )
self.btnValidate = self.find_widget(QtWidgets.QPushButton, 'btnValidate' )
self.btnValidateReset = self.find_widget(QtWidgets.QToolButton, 'btnValidateReset' )
- self.btnStartTreatment = self.find_widget(QtWidgets.QPushButton, 'btnConfirm' )
self.btnAutoLoad = self.find_widget(QtWidgets.QPushButton, 'btnAutoLoadSend' )
+ self.btnAutoLoadReset = self.find_widget(QtWidgets.QToolButton, 'btnAutoLoadReset' )
+ self.btnStartTxReset = self.find_widget(QtWidgets.QToolButton, 'btnStartTxReset' )
self.spnCreateRxRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnCreateRxRejectReason' )
self.spnAutoLoadRejectReason = self.find_widget(QtWidgets.QSpinBox , 'spnLoadReasonSpinBox' )
@@ -133,30 +133,19 @@
initializes the widgets connections
:return:
"""
- self.btnStandby .clicked.connect(self.do_standby )
self.btnCreate_tx .clicked.connect(self.do_create_tx )
self.btnCreateReset .clicked.connect(self.do_createReset )
+ self.btnAutoLoadReset .clicked.connect(self.do_autoLoadReset )
+ self.btnStartTxReset .clicked.connect(self.do_startTxReset )
self.btnValidate .clicked.connect(self.do_validate )
self.btnValidateReset .clicked.connect(self.do_validateReset )
- self.btnStartTreatment .clicked.connect(self.do_start )
self.btnAutoLoad .clicked.connect(self.do_auto_load )
-
- @Slot()
- def do_standby(self):
- self.td_interface.td_operation_mode(
- TD_Defs.TDOpModes.MODE_STAN.value,
- TD_Defs.TDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value
- )
@Slot()
def do_create_tx(self):
self.lbCreateTx.setText("-")
if self.spnCreateRxRejectReason.value() == 0 :
self.td_interface.td_Treatment_Parameters_CreateRx (0)
- self.td_interface.td_operation_mode(
- TD_Defs.TDOpModes.MODE_PRET.value,
- TD_Defs.TDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value
- )
else:
self.td_interface.td_Treatment_Parameters_CreateRx (self.spnCreateRxRejectReason.value())
@@ -166,11 +155,11 @@
self.lbCreateTx.setText("-")
@Slot()
- def do_start(self):
- self.td_interface.td_operation_mode(
- TD_Defs.TDOpModes.MODE_TREA.value,
- TD_Defs.TDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value
- )
+ def do_autoLoadReset(self):
+ self.btnAutoLoadReset.setValue(0)
+ self.lbAutoLoad.setText("-")
+
+ def do_startTxReset(self):
self.lbStartTreatment.setText("-")
@Slot()