Index: simulator/plugins/HDOpMode/interface.ui
===================================================================
diff -u -reb6acf9c1a4748852875c350568192999be9d3dd -ra11b044673a77150b1d3485d43a5a001340a0feb
--- simulator/plugins/HDOpMode/interface.ui (.../interface.ui) (revision eb6acf9c1a4748852875c350568192999be9d3dd)
+++ simulator/plugins/HDOpMode/interface.ui (.../interface.ui) (revision a11b044673a77150b1d3485d43a5a001340a0feb)
@@ -6,7 +6,7 @@
0
0
- 340
+ 745
271
@@ -252,6 +252,171 @@
+ -
+
+
+
+ 320
+ 215
+
+
+
+
+ 8
+ 50
+ false
+
+
+
+ Qt::ScrollBarAlwaysOff
+
+
+ Qt::ScrollBarAlwaysOff
+
+
+ QAbstractItemView::NoEditTriggers
+
+
+ true
+
+
+ QAbstractItemView::SingleSelection
+
+
+ QAbstractItemView::SelectRows
+
+
+ true
+
+
+ false
+
+
+ 6
+
+
+ 2
+
+
+ true
+
+
+ 285
+
+
+ true
+
+
+ true
+
+
+ 18
+
+
+ 21
+
+
+
+ 0
+
+
+
+
+ 1
+
+
+
+
+ 2
+
+
+
+
+ 3
+
+
+
+
+ 4
+
+
+
+
+ 5
+
+
+
+
+ StandBy
+
+
+
+
+ Description
+
+
+ -
+
+ STANDBY_START_STATE
+
+
+ -
+
+ Start standby
+
+
+ -
+
+ STANDBY_WAIT_FOR_TREATMENT_STATE
+
+
+ -
+
+ Wait for treatment
+
+
+ -
+
+ STANDBY_WAIT_FOR_DISINFECT_STATE
+
+
+ -
+
+ Wait for disinfection
+
+
+ -
+
+ STANDBY_DG_FLUSH_IN_PROGRESS_STATE
+
+
+ -
+
+ DG flush operation is in progress
+
+
+ -
+
+ STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE
+
+
+ -
+
+ DG heat disinfection operation is in progress
+
+
+ -
+
+ STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE
+
+
+ -
+
+ DG chemical disinfection operation is in progress
+
+
+
+
-
Index: simulator/plugins/HDOpMode/loader.py
===================================================================
diff -u -r68ba5188e33d6f05936fb77626822f416b9abb37 -ra11b044673a77150b1d3485d43a5a001340a0feb
--- simulator/plugins/HDOpMode/loader.py (.../loader.py) (revision 68ba5188e33d6f05936fb77626822f416b9abb37)
+++ simulator/plugins/HDOpMode/loader.py (.../loader.py) (revision a11b044673a77150b1d3485d43a5a001340a0feb)
@@ -20,6 +20,7 @@
"""
tbReset: QtWidgets.QToolButton
tblOpMode: QtWidgets.QTableWidget
+ tblSubMode: QtWidgets.QTableWidget
def __init__(self, hd_simulator: HDSimulator):
super().__init__(os.path.dirname(__file__), hd_simulator)
@@ -30,8 +31,8 @@
:return: none
"""
self.tbReset = self.find_tool_button('tbReset')
-
self.tblOpMode = self.find_table_widget('tblOpMode')
+ self.tblSubMode = self.find_table_widget('tblSubMode')
def _init_connections(self):
"""
@@ -40,6 +41,7 @@
"""
self.tbReset.clicked.connect(self._init_widgets)
self.tblOpMode.currentCellChanged.connect(self.do_treatment_states)
+ self.tblSubMode.currentCellChanged.connect(self.do_treatment_states)
@Slot()
def _init_widgets(self):
@@ -48,6 +50,7 @@
:return: none
"""
self.tblOpMode.setCurrentCell(HDDefs.MODE_INIT.value, 0)
+ self.tblSubMode.setCurrentCell(HDDefs.MODE_INIT.value, 0)
@Slot()
def do_treatment_states(self):
@@ -56,6 +59,8 @@
:return: none
"""
op_mode = int(self.tblOpMode.verticalHeaderItem(self.tblOpMode.currentRow()).text())
+ sub_mode = int(self.tblSubMode.verticalHeaderItem(self.tblSubMode.currentRow()).text())
self.hd_simulator.cmd_send_hd_operation_mode(
- op_mode
+ op_mode,
+ sub_mode
)