Index: simulator/plugins/inlinebloodpressures/loader.py =================================================================== diff -u -r1779b6711f3791e8bf570e06ddb4c2e7d2a52e18 -rf4523ffcaff0d27f7392c943f0a487fcb01a7d34 --- simulator/plugins/inlinebloodpressures/loader.py (.../loader.py) (revision 1779b6711f3791e8bf570e06ddb4c2e7d2a52e18) +++ simulator/plugins/inlinebloodpressures/loader.py (.../loader.py) (revision f4523ffcaff0d27f7392c943f0a487fcb01a7d34) @@ -1,14 +1,17 @@ """ The In-Line Blood Pressure ui class """ +# Python import os -from simulator.dynamicloader import DynamicLoader +# Qt from PySide2 import QtWidgets from PySide2.QtCore import Slot -from dialin.squish import denaliMessages -from dialin.squish.denaliMessages import txStates, EResponse +# parent +from simulator.dynamicloader import DynamicLoader +# hd Simulator +from dialin.ui.hd_simulator import HDSimulator, TXStates +# plugin specific from dialin.common import Ranges -from dialin.ui.hd_simulator import HDSimulator class Loader(DynamicLoader): @@ -38,7 +41,7 @@ def __init__(self, hd_simulator: HDSimulator): super().__init__(os.path.dirname(__file__), hd_simulator) print(" ---------- ", self.hd_simulator) - self.saline_requested_state = txStates.SALINE_BOLUS_STATE_IDLE + self.saline_requested_state = TXStates.SALINE_BOLUS_STATE_IDLE def _init_loader(self): """ @@ -124,7 +127,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 @@ -137,8 +140,8 @@ :return: none """ # vAccepted, vReason, vArterialLow, vArterialHigh, vVenousLow, vVenousHigh - denaliMessages.sendTreatmentAdjustPressuresLimitsResponse( - EResponse.Accepted, 0, + self.hd_simulator.cmd_send_treatment_adjust_pressures_limit_response( + True, 0, self.spnArterialLimitLow.value(), self.spnArterialLimitHigh.value(), self.spnVenousLimitLow.value(), @@ -153,8 +156,8 @@ :return: none """ reason = self.spnAVPressuresRejectReason.value() - denaliMessages.sendTreatmentAdjustPressuresLimitsResponse( - EResponse.Rejected, reason, + self.hd_simulator.cmd_send_treatment_adjust_pressures_limit_response( + False, reason, self.spnArterialLimitLow.value(), self.spnArterialLimitHigh.value(), self.spnVenousLimitLow.value(),