Index: sources/model/MModel.h =================================================================== diff -u -rc9764bd0ad823c5c1725d7c7f556290c2c459d4d -rad57884fca3e8a0916b6d6bf51a69264b9b5263f --- sources/model/MModel.h (.../MModel.h) (revision c9764bd0ad823c5c1725d7c7f556290c2c459d4d) +++ sources/model/MModel.h (.../MModel.h) (revision ad57884fca3e8a0916b6d6bf51a69264b9b5263f) @@ -59,6 +59,7 @@ #include "MTreatmentBloodPrimeData.h" #include "MTreatmentStopData.h" #include "MTreatmentUltrafiltrationData.h" +#include "MTreatmentIsolatedUFData.h" #include "MTreatmentParametersSetPointData.h" #include "MHDAccelerometerData.h" #include "MHDSyringePumpData.h" @@ -158,6 +159,9 @@ #include "MTreatmentAdjustUltrafiltrationStateResponse.h" #include "MTreatmentAdjustUltrafiltrationEditResponse.h" #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h" +#include "MTreatmentAdjustIsolatedUFDurationEditResponse.h" +#include "MTreatmentAdjustIsolatedUFVolumeGoalEditResponse.h" +#include "MTreatmentAdjustIsolatedUFConfirmResponse.h" #include "MTreatmentAdjustSalineResponse.h" #include "MTreatmentAdjustVitalsResponse.h" #include "MTreatmentAdjustHeparinResponse.h" @@ -368,6 +372,7 @@ REGISTER_METATYPE( TreatmentBloodPrimeData ) \ REGISTER_METATYPE( TreatmentStopData ) \ REGISTER_METATYPE( TreatmentUltrafiltrationData ) \ + REGISTER_METATYPE( TreatmentIsolatedUFData ) \ REGISTER_METATYPE( TreatmentParametersSetPointData ) \ REGISTER_METATYPE( HDSyringePumpData ) \ REGISTER_METATYPE( HDAccelerometerData ) \ @@ -465,6 +470,9 @@ REGISTER_METATYPE( AdjustUltrafiltrationStateRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \ + REGISTER_METATYPE( AdjustIsolatedUFDurationEditRequestData ) \ + REGISTER_METATYPE( AdjustIsolatedUFVolumeGoalEditRequestData ) \ + REGISTER_METATYPE( AdjustIsolatedUFConfirmRequestData ) \ REGISTER_METATYPE( AdjustSalineRequestData ) \ REGISTER_METATYPE( AdjustVitalsRequestData ) \ REGISTER_METATYPE( AdjustHeparinRequestData ) \ @@ -511,6 +519,9 @@ REGISTER_METATYPE( AdjustUltrafiltrationStateResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \ + REGISTER_METATYPE( AdjustIsolatedUFDurationEditResponseData ) \ + REGISTER_METATYPE( AdjustIsolatedUFVolumeGoalEditResponseData ) \ + REGISTER_METATYPE( AdjustIsolatedUFConfirmResponseData ) \ REGISTER_METATYPE( AdjustSalineResponseData ) \ REGISTER_METATYPE( AdjustVitalsResponseData ) \ REGISTER_METATYPE( AdjustHeparinResponseData ) \ @@ -593,6 +604,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentBloodPrimeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentStopData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentUltrafiltrationData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentIsolatedUFData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentParametersSetPointData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAccelerometerData ) \ @@ -679,6 +691,9 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFDurationEditResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFVolumeGoalEditResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVitalsResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHeparinResponseData ) \ @@ -726,6 +741,9 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFDurationEditRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFVolumeGoalEditRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustIsolatedUFConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustParametersConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVitalsRequestData ) \ @@ -829,6 +847,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentBloodPrimeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentStopData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentUltrafiltrationData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentIsolatedUFData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentParametersSetPointData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDSyringePumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDAccelerometerData ) \ @@ -915,6 +934,9 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustIsolatedUFDurationEditResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustIsolatedUFVolumeGoalEditResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustIsolatedUFConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVitalsResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHeparinResponseData ) \ @@ -986,6 +1008,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustIsolatedUFDurationEditRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustIsolatedUFVolumeGoalEditRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustIsolatedUFConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVitalsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHeparinRequestData ) \ @@ -1056,6 +1081,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustIsolatedUFDurationEditRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustIsolatedUFVolumeGoalEditRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustIsolatedUFConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVitalsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHeparinRequestData ) \ @@ -1126,6 +1154,9 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationStateRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationEditRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationConfirmRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFDurationEditRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFVolumeGoalEditRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustIsolatedUFConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPressuresLimitsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVitalsRequestData ) \ @@ -1189,6 +1220,7 @@ ACTION_RECEIVE_SIGNAL( TreatmentBloodPrimeData ) \ ACTION_RECEIVE_SIGNAL( TreatmentStopData ) \ ACTION_RECEIVE_SIGNAL( TreatmentUltrafiltrationData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentIsolatedUFData ) \ ACTION_RECEIVE_SIGNAL( TreatmentParametersSetPointData ) \ ACTION_RECEIVE_SIGNAL( HDSyringePumpData ) \ ACTION_RECEIVE_SIGNAL( HDAccelerometerData ) \ @@ -1276,6 +1308,9 @@ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationConfirmResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustIsolatedUFDurationEditResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustIsolatedUFVolumeGoalEditResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustIsolatedUFConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustSalineResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustVitalsResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHeparinResponseData ) \