Index: sources/model/mmodel.h =================================================================== diff -u -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 --- sources/model/mmodel.h (.../mmodel.h) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) +++ sources/model/mmodel.h (.../mmodel.h) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) @@ -128,18 +128,20 @@ REGISTER_METATYPE( AlarmStatusFlag ) \ REGISTER_METATYPE( PowerOffData ) \ REGISTER_METATYPE( TreatmentRangesData ) \ - REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ + \ + REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ + REGISTER_METATYPE( AdjustDurationRequestData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationStateRequestData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \ + \ REGISTER_METATYPE( AdjustBloodDialysateResponseData ) \ - REGISTER_METATYPE( AdjustDurationRequestData ) \ REGISTER_METATYPE( AdjustDurationResponseData ) \ - REGISTER_METATYPE( AdjustUltrafiltrationStateRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateResponseData ) \ - REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \ - REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) -//--------------------------------------------------------------------------------// +//===============================================================================// #define ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, BloodFlowData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DialysateFlowData ) \ @@ -149,13 +151,20 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PowerOffData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRangesData ) \ + \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDurationResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) - //--------------------------------------------------------------------------------// +#define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmRequestData ) +//===============================================================================// #define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS \ ACTION_RECEIVE_BRIDGE_DEFINITION( BloodFlowData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DialysateFlowData ) \ @@ -165,27 +174,34 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( PowerOffData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRangesData ) \ + \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustBloodDialysateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDurationResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) //--------------------------------------------------------------------------------// -#define ACTION_RECEIVE_INTERPRETER_CONNECTIONS \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, BloodFlowData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, DialysateFlowData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, OutletFlowData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, TreatmentTimeData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, PressureOcclusionData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AlarmStatusData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, PowerOffData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, TreatmentRangesData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustUltrafiltrationStateResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustBloodDialysateResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustDurationResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustUltrafiltrationEditResponseData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(_interpreter, AdjustUltrafiltrationConfirmResponseData ) +#define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustBloodDialysateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDurationRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationEditRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmRequestData ) //--------------------------------------------------------------------------------// +#define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustBloodDialysateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDurationRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationEditRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationConfirmRequestData ) +//--------------------------------------------------------------------------------// +#define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustBloodDialysateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDurationRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationStateRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationEditRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationConfirmRequestData ) +//===============================================================================// #define ACTION_RECEIVE_SIGNALS \ ACTION_RECEIVE_SIGNAL( BloodFlowData ) \ ACTION_RECEIVE_SIGNAL( DialysateFlowData ) \