Index: simulator/plugins/salinebolus/loader.py =================================================================== diff -u -rf4523ffcaff0d27f7392c943f0a487fcb01a7d34 -r967521dff94783ce48b50abc8db6bcd67bb501bf --- simulator/plugins/salinebolus/loader.py (.../loader.py) (revision f4523ffcaff0d27f7392c943f0a487fcb01a7d34) +++ simulator/plugins/salinebolus/loader.py (.../loader.py) (revision 967521dff94783ce48b50abc8db6bcd67bb501bf) @@ -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 -- @@ -30,9 +31,8 @@ saline_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.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IDLE def _init_loader(self): @@ -84,7 +84,7 @@ self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IN_PROGRESS target = self.cmbSalineAcceptTarget.currentText() - self.hd_simulator.cmd_set_saline_bolus_response( + self.interface.hd.cmd_set_saline_bolus_response( True, 0, int(target), self.saline_requested_state ) self.lblSalineAction.setText('Accepted ' + target) @@ -96,7 +96,7 @@ :return: none """ reason = self.spnSalineRejectReason.value() - self.hd_simulator.cmd_set_saline_bolus_response( + self.interface.hd.cmd_set_saline_bolus_response( False, reason, 0, self.saline_requested_state ) self.lblSalineAction.setText('Rejected ' + "{}".format(reason)) @@ -108,7 +108,7 @@ by calling the denaliMessage API setTreatmentSalineBolusData :return: none """ - self.hd_simulator.cmd_set_treatment_saline_bolus_data( + self.interface.hd.cmd_set_treatment_saline_bolus_data( self.sldSalineTarget.value(), self.sldSalineCumulative.value(), self.sldSalineVolume.value()