Index: simulator/plugins/rinseback/loader.py =================================================================== diff -u -rf4523ffcaff0d27f7392c943f0a487fcb01a7d34 -r9696f8b120608ac427f8b85d4f8ed2fd259e5d9e --- simulator/plugins/rinseback/loader.py (.../loader.py) (revision f4523ffcaff0d27f7392c943f0a487fcb01a7d34) +++ simulator/plugins/rinseback/loader.py (.../loader.py) (revision 9696f8b120608ac427f8b85d4f8ed2fd259e5d9e) @@ -9,7 +9,8 @@ # parent from simulator.dynamicloader import DynamicLoader # hd Simulator -from dialin.ui.hd_simulator import HDSimulator, TXStates +from simulator.interface import SimulationInterface +from dialin.ui.hd_simulator import TXStates # plugin specific # -- none -- @@ -31,9 +32,8 @@ requested_state: TXStates - def __init__(self, hd_simulator: HDSimulator): - super().__init__(os.path.dirname(__file__), hd_simulator) - print(" ---------- ", self.hd_simulator) + def __init__(self, interface: SimulationInterface): + super().__init__(os.path.dirname(__file__), interface) self.requested_state = TXStates.RINSEBACK_STOP_INIT_STATE def _init_loader(self): @@ -81,7 +81,7 @@ the slot for accept button :return: none """ - self.hd_simulator.cmd_send_treatment_adjust_rinseback_response(True, 0) + self.interface.hd.cmd_send_treatment_adjust_rinseback_response(True, 0) self.lblAction.setText('Accepted ') @Slot() @@ -91,7 +91,7 @@ :return: none """ reason = self.spnRejectReason.value() - self.hd_simulator.cmd_send_treatment_adjust_rinseback_response(False, reason) + self.interface.hd.cmd_send_treatment_adjust_rinseback_response(False, reason) self.lblAction.setText('Rejected ' + "{}".format(reason)) @Slot() @@ -107,4 +107,4 @@ timeout_total = self.sldTimeoutTotal.value() timeout_countdown = self.sldTimeoutCountDown.value() - self.hd_simulator.cmd_send_treatment_rinseback_data(target, current, rate, timeout_total, timeout_countdown) + self.interface.hd.cmd_send_treatment_rinseback_data(target, current, rate, timeout_total, timeout_countdown, 0)