Index: sources/model/mmodel.h =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 --- sources/model/mmodel.h (.../mmodel.h) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ sources/model/mmodel.h (.../mmodel.h) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) @@ -23,9 +23,11 @@ #include "mtreatmentflows.h" #include "mtreatmentoutletflow.h" #include "mtreatmentpressureocclusion.h" +#include "mtreatmentranges.h" #include "mtreatmentadjustblooddialysateresponse.h" #include "mtreatmentadjustdurationresponse.h" -#include "mtreatmentranges.h" +#include "mtreatmentultrafiltrationstate.h" +#include "mtreatmentadjustultrafiltrationresponse.h" /*! * \brief Message interpretation instruction @@ -116,8 +118,10 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PowerOffData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRangesData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentUltrafiltrationStateData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationResponseData ) + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationResponseData ) //--------------------------------------------------------------------------------// #define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS \ @@ -129,8 +133,10 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PowerOffData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRangesData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentUltrafiltrationStateData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustBloodDialysateResponseData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationResponseData ) + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationResponseData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationResponseData ) //--------------------------------------------------------------------------------// #define REGISTER_MODEL_METATYPES \ REGISTER_METATYPE( BloodFlowData ) \ @@ -142,8 +148,10 @@ REGISTER_METATYPE( AlarmStatusFlag ) \ REGISTER_METATYPE( PowerOffData ) \ REGISTER_METATYPE( TreatmentRangesData ) \ + REGISTER_METATYPE( TreatmentUltrafiltrationStateData ) \ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ - REGISTER_METATYPE( AdjustDurationResponseData ) + REGISTER_METATYPE( AdjustDurationResponseData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationResponseData ) //--------------------------------------------------------------------------------// #define ACTION_RECEIVE_INTERPRETER_CONNECTIONS \ ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, BloodFlowData ) \ @@ -154,8 +162,10 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, PowerOffData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, TreatmentRangesData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,TreatmentUltrafiltrationStateData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustBloodDialysateResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustDurationResponseData ) + ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustDurationResponseData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter,AdjustUltrafiltrationResponseData ) //--------------------------------------------------------------------------------// #define ACTION_RECEIVE_SIGNALS \ ACTION_RECEIVE_SIGNAL( BloodFlowData ) \ @@ -166,7 +176,9 @@ ACTION_RECEIVE_SIGNAL( AlarmStatusData ) \ ACTION_RECEIVE_SIGNAL( PowerOffData ) \ ACTION_RECEIVE_SIGNAL( TreatmentRangesData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentUltrafiltrationStateData ) \ ACTION_RECEIVE_SIGNAL( AdjustBloodDialysateResponseData ) \ - ACTION_RECEIVE_SIGNAL( AdjustDurationResponseData ) + ACTION_RECEIVE_SIGNAL( AdjustDurationResponseData ) \ + ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationResponseData ) //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------//