Index: simulator/plugins/ultrafiltration/loader.py =================================================================== diff -u -r1779b6711f3791e8bf570e06ddb4c2e7d2a52e18 -rf4523ffcaff0d27f7392c943f0a487fcb01a7d34 --- simulator/plugins/ultrafiltration/loader.py (.../loader.py) (revision 1779b6711f3791e8bf570e06ddb4c2e7d2a52e18) +++ simulator/plugins/ultrafiltration/loader.py (.../loader.py) (revision f4523ffcaff0d27f7392c943f0a487fcb01a7d34) @@ -1,13 +1,17 @@ """ The Ultrafiltration ui loader """ +# 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 -from dialin.ui.hd_simulator import HDSimulator +# parent +from simulator.dynamicloader import DynamicLoader +# hd Simulator +from dialin.ui.hd_simulator import HDSimulator, TXStates +# plugin specific +# -- none -- class Loader(DynamicLoader): @@ -81,8 +85,9 @@ the slot for accept ultrafiltration pause button :return: none """ - denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse( - EResponse.Accepted, 0, txStates.UF_PAUSED_STATE) + self.hd_simulator.cmd_set_treatment_adjust_ultrafiltration_state_response( + True, 0, TXStates.UF_PAUSED_STATE + ) self.lblUfPauseAction.setText('Accepted ') @Slot() @@ -92,8 +97,8 @@ :return: none """ reason = self.spnUfPauseRejectReason.value() - denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse( - EResponse.Rejected, reason, txStates.UF_RUNNING_STATE) + self.hd_simulator.cmd_set_treatment_adjust_ultrafiltration_state_response( + False, reason, TXStates.UF_RUNNING_STATE) self.lblUfPauseAction.setText('Rejected ' + "{}".format(reason)) @Slot() @@ -102,8 +107,8 @@ the slot for accept ultrafiltration resume accept :return: none """ - denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse( - EResponse.Accepted, 0, txStates.UF_RUNNING_STATE) + self.hd_simulator.cmd_set_treatment_adjust_ultrafiltration_state_response( + True, 0, TXStates.UF_RUNNING_STATE) self.lblUfResumeAction.setText('Accepted ') @Slot() @@ -113,8 +118,8 @@ :return: none """ reason = self.spnUfResumeRejectReason.value() - denaliMessages.setTreatmentAdjustUltrafiltrationStateResponse( - EResponse.Rejected, reason, txStates.UF_PAUSED_STATE) + self.hd_simulator.cmd_set_treatment_adjust_ultrafiltration_state_response( + False, reason, TXStates.UF_PAUSED_STATE) self.lblUfResumeAction.setText('Rejected ' + "{}".format(reason)) @Slot() @@ -123,8 +128,8 @@ the slot for accept ultrafiltration next button :return: none """ - denaliMessages.setTreatmentAdjustUltrafiltrationEditResponse( - EResponse.Accepted, 0, 2500, 60, 0, 10, 0, 10) + self.hd_simulator.cmd_set_treatment_adjust_ultrafiltration_edit_response( + True, 0, 2325, 60, 0, 10, 0, 10) self.lblUfEditAction.setText('Accepted ') @Slot() @@ -134,8 +139,8 @@ :return: none """ reason = self.spnUfEditRejectReason.value() - denaliMessages.setTreatmentAdjustUltrafiltrationEditResponse( - EResponse.Rejected, reason, 2500, 60, 0, 10, 0, 10) + self.hd_simulator.cmd_set_treatment_adjust_ultrafiltration_edit_response( + False, reason, 2500, 60, 0, 10, 0, 10) self.lblUfEditAction.setText('Rejected ' + "{}".format(reason)) @Slot() @@ -144,5 +149,6 @@ sends the ultrafiltration delivered volume message :return: none """ - denaliMessages.setTreatmentUltrafiltration(self.sldUfVolume.value(), 0, 0, 0, 0, 0, 0) - + self.hd_simulator.cmd_set_treatment_ultrafiltration_outlet_flow_data( + self.sldUfVolume.value(), 0, 0, 0, 0, 0, 0 + )