Index: simulator/plugins/inlinebloodpressures/loader.py =================================================================== diff -u -rf921975179b1c1ad61d841b9db5976c00432fdcc -r310f51a5ed4921f184572f90d07b350ec41c0bae --- simulator/plugins/inlinebloodpressures/loader.py (.../loader.py) (revision f921975179b1c1ad61d841b9db5976c00432fdcc) +++ simulator/plugins/inlinebloodpressures/loader.py (.../loader.py) (revision 310f51a5ed4921f184572f90d07b350ec41c0bae) @@ -5,9 +5,8 @@ from simulator.dynamicloader import DynamicLoader from PySide2 import QtWidgets from PySide2.QtCore import Slot -from dialin.squish import denaliMessages -from dialin.squish.denaliMessages import txStates, EResponse from dialin.common import Ranges +from dialin.ui import TXStates, EResponse class Loader(DynamicLoader): @@ -36,7 +35,7 @@ def __init__(self): super().__init__(os.path.dirname(__file__)) - self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE + self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IDLE def _init_loader(self): """ @@ -122,7 +121,7 @@ sends the pressures values message with given value on the screen :return: none """ - denaliMessages.setPressureOcclusionData( + self.hd_simulator.cmd_set_pressure_occlusion_data( self.sldArterialValue.value(), self.sldVenousValue.value(), 0, 0, 0 @@ -135,7 +134,7 @@ :return: none """ # vAccepted, vReason, vArterialLow, vArterialHigh, vVenousLow, vVenousHigh - denaliMessages.sendTreatmentAdjustPressuresLimitsResponse( + self.hd_simulator.cmd_send_treatment_adjust_pressures_limit_response( EResponse.Accepted, 0, self.spnArterialLimitLow.value(), self.spnArterialLimitHigh.value(), @@ -151,7 +150,7 @@ :return: none """ reason = self.spnAVPressuresRejectReason.value() - denaliMessages.sendTreatmentAdjustPressuresLimitsResponse( + self.hd_simulator.cmd_send_treatment_adjust_pressures_limit_response( EResponse.Rejected, reason, self.spnArterialLimitLow.value(), self.spnArterialLimitHigh.value(),