Index: sources/model/MModel.h =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r667baa15f6fc3a9438dae68ded8cee26c2ca7450 --- sources/model/MModel.h (.../MModel.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/model/MModel.h (.../MModel.h) (revision 667baa15f6fc3a9438dae68ded8cee26c2ca7450) @@ -29,6 +29,12 @@ #include "MAlarmActiveList.h" #include "MAdjustHDAlarmVolumeResponse.h" +// POST +#include "MHDPostSingleResultData.h" +#include "MHDPostFinalResultData.h" +#include "MDGPostSingleResultData.h" +#include "MDGPostFinalResultData.h" + // States Messages #include "MHDOperationModeData.h" #include "MPreTreatmentStatesData.h" @@ -242,6 +248,12 @@ \details Registers the models in the Qt MetaType so it can be used in signal/slots between threads. */ #define REGISTER_MODEL_METATYPES \ + /* POST */ \ + REGISTER_METATYPE( HDPostSingleResultData ) \ + REGISTER_METATYPE( HDPostFinalResultData ) \ + REGISTER_METATYPE( DGPostSingleResultData ) \ + REGISTER_METATYPE( DGPostFinalResultData ) \ + REGISTER_METATYPE( AdjustUIPostFinalResultRequestData ) \ /* Devices */ \ REGISTER_METATYPE( DeviceBrightnessRequestData ) \ REGISTER_METATYPE( DeviceBrightnessResponseData ) \ @@ -405,6 +417,12 @@ */ #define ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ \ + /* POST */ \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDPostSingleResultData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDPostFinalResultData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGPostSingleResultData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGPostFinalResultData ) \ + /* */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, SettingsData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDOperationModeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PreTreatmentStatesData ) \ @@ -500,6 +518,8 @@ // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ + /* POST */ \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUIPostFinalResultRequestData ) \ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDurationRequestData ) \ @@ -563,6 +583,11 @@ This macro should be used with its counterpart macro \ref ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS */ #define ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS \ + /* POST */ \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDPostSingleResultData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( HDPostFinalResultData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DGPostSingleResultData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DGPostFinalResultData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( SettingsData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDOperationModeData ) \ @@ -659,6 +684,8 @@ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ /* Request --------------------------------------------------------- */ \ + /* POST */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPatientDisconnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisposablesRemovalConfirmRequestData ) \ @@ -706,6 +733,8 @@ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT \ /* Request ----------------------- NoEmit -------------------------- */ \ + /* POST */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPatientDisconnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisposablesRemovalConfirmRequestData ) \ @@ -753,6 +782,8 @@ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC \ /* Request ----------------------- public -------------------------- */ \ + /* POST */ \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUIPostFinalResultRequestData ) \ /* Post-Treatment */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPatientDisconnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisposablesRemovalConfirmRequestData ) \ @@ -800,6 +831,11 @@ //===============================================================================// #define ACTION_RECEIVE_SIGNALS \ + /* POST */ \ + ACTION_RECEIVE_SIGNAL( HDPostSingleResultData ) \ + ACTION_RECEIVE_SIGNAL( HDPostFinalResultData ) \ + ACTION_RECEIVE_SIGNAL( DGPostSingleResultData ) \ + ACTION_RECEIVE_SIGNAL( DGPostFinalResultData ) \ /* Received signals */ \ /* NO RESPONSE message model here */ \ ACTION_RECEIVE_SIGNAL( SettingsData ) \