Index: simulator/plugins/disinfectionstates/loader.py =================================================================== diff -u -rae63fbc76b4638ffdcdaad7b69648beeee3340c3 -r967521dff94783ce48b50abc8db6bcd67bb501bf --- simulator/plugins/disinfectionstates/loader.py (.../loader.py) (revision ae63fbc76b4638ffdcdaad7b69648beeee3340c3) +++ simulator/plugins/disinfectionstates/loader.py (.../loader.py) (revision 967521dff94783ce48b50abc8db6bcd67bb501bf) @@ -9,10 +9,8 @@ # parent from simulator.dynamicloader import DynamicLoader # hd Simulator -from dialin.ui.hd_simulator import HDSimulator +from simulator.interface import SimulationInterface # plugin specific -from dialin.common.hd_defs import HDDefs -from dialin.common.hd_defs import HD_Standby_States class Loader(DynamicLoader): @@ -26,8 +24,8 @@ tblHeatMode: QtWidgets.QTableWidget tblChemicalMode: QtWidgets.QTableWidget - def __init__(self, hd_simulator: HDSimulator): - super().__init__(os.path.dirname(__file__), hd_simulator) + def __init__(self, interface: SimulationInterface): + super().__init__(os.path.dirname(__file__), interface) def _init_loader(self): """ @@ -59,10 +57,10 @@ initializes the widgets' properties :return: none """ - self.tblSubMode.setCurrentCell(0, 0) # not defined in FwCommon yet - self.tblFlushMode.setCurrentCell(0, 0) # not defined in FwCommon yet - self.tblHeatMode.setCurrentCell(HD_Standby_States.STANDBY_START_STATE.value, 0) - self.tblChemicalMode.setCurrentCell(0, 0) # not defined in FwCommon yet + self.tblSubMode.setCurrentCell(0, 0) + self.tblFlushMode.setCurrentCell(0, 0) + self.tblHeatMode.setCurrentCell(0, 0) + self.tblChemicalMode.setCurrentCell(0, 0) self.tblSubMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) self.tblFlushMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) self.tblHeatMode.horizontalHeaderItem(0).setTextAlignment(QtCore.Qt.AlignLeft) @@ -75,10 +73,10 @@ :return: none """ sub_mode = int(self.tblSubMode.verticalHeaderItem(self.tblSubMode.currentRow()).text()) - flush_mode = 0 # int(self.tblFlushMode.verticalHeaderItem(self.tblFlushMode.currentRow()).text()) + flush_mode = int(self.tblFlushMode.verticalHeaderItem(self.tblFlushMode.currentRow()).text()) heat_mode = int(self.tblHeatMode.verticalHeaderItem(self.tblHeatMode.currentRow()).text()) - chemical_mode = 0 # int(self.tblChemicalMode.verticalHeaderItem(self.tblChemicalMode.currentRow()).text()) - self.hd_simulator.cmd_send_dg_disinfection_state( + chemical_mode = int(self.tblChemicalMode.verticalHeaderItem(self.tblChemicalMode.currentRow()).text()) + self.interface.dg.cmd_send_dg_disinfection_state( sub_mode, flush_mode, heat_mode,