Index: simulator/plugins/disinfection/loader.py =================================================================== diff -u -r1b402ab005844b85b8361ae611664731cfa39e0b -r967521dff94783ce48b50abc8db6bcd67bb501bf --- simulator/plugins/disinfection/loader.py (.../loader.py) (revision 1b402ab005844b85b8361ae611664731cfa39e0b) +++ simulator/plugins/disinfection/loader.py (.../loader.py) (revision 967521dff94783ce48b50abc8db6bcd67bb501bf) @@ -9,7 +9,7 @@ # parent from simulator.dynamicloader import DynamicLoader # hd Simulator -from dialin.ui.hd_simulator import HDSimulator +from simulator.interface import SimulationInterface # plugin specific # -- none -- @@ -38,8 +38,8 @@ sldTimeoutTotalChemical: QtWidgets.QSlider sldTimeoutCountDownChemical: QtWidgets.QSlider - 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): """ @@ -98,7 +98,7 @@ the slot for accept button :return: none """ - self.hd_simulator.cmd_send_hd_disinfect_response(True, 0) + self.interface.hd.cmd_send_hd_disinfect_response(True, 0) self.lblActionDisinfect.setText('Accepted ') @Slot() @@ -108,7 +108,7 @@ :return: none """ reason = self.spnReasonDisinfect.value() - self.hd_simulator.cmd_send_hd_disinfect_response(False, reason) + self.interface.hd.cmd_send_hd_disinfect_response(False, reason) self.lblActionDisinfect.setText('Rejected ' + "{}".format(reason)) @Slot() @@ -117,8 +117,8 @@ the slot for accept button :return: none """ - self.hd_simulator.cmd_send_hd_disinfect_chemical_confirm(True, 0) - self.lblAction.setText('Accepted ') + self.interface.hd.cmd_send_hd_disinfect_chemical_confirm(True, 0) + self.lblActionChemical.setText('Accepted ') @Slot() def do_reject_chemical(self): @@ -127,8 +127,8 @@ :return: none """ reason = self.spnReasonDisinfect.value() - self.hd_simulator.cmd_send_hd_disinfect_chemical_confirm(False, reason) - self.lblActionDisinfect.setText('Rejected ' + "{}".format(reason)) + self.interface.hd.cmd_send_hd_disinfect_chemical_confirm(False, reason) + self.lblActionChemical.setText('Rejected ' + "{}".format(reason)) @Slot() def do_data_flush(self): @@ -139,7 +139,7 @@ """ timeout_total = self.sldTimeoutTotalFlush.value() timeout_countdown = self.sldTimeoutCountDownFlush.value() - self.hd_simulator.cmd_send_dg_disinfect_progress_time_flush(timeout_total, timeout_countdown) + self.interface.dg.cmd_send_dg_disinfect_progress_time_flush(timeout_total, timeout_countdown) @Slot() def do_data_heat(self): @@ -150,7 +150,7 @@ """ timeout_total = self.sldTimeoutTotalHeat.value() timeout_countdown = self.sldTimeoutCountDownHeat.value() - self.hd_simulator.cmd_send_dg_disinfect_progress_time_heat(timeout_total, timeout_countdown) + self.interface.dg.cmd_send_dg_disinfect_progress_time_heat(timeout_total, timeout_countdown) @Slot() def do_data_chemical(self): @@ -161,4 +161,4 @@ """ timeout_total = self.sldTimeoutTotalChemical.value() timeout_countdown = self.sldTimeoutCountDownChemical.value() - self.hd_simulator.cmd_send_dg_disinfect_progress_time_checmical(timeout_total, timeout_countdown) + self.interface.dg.cmd_send_dg_disinfect_progress_time_checmical(timeout_total, timeout_countdown)