Index: sources/model/mmodel.h =================================================================== diff -u -r03de7d132838c54a23862809357c42102b6dab99 -r524fee2471717bf627eae41c6a599c9b5f4fbe55 --- sources/model/mmodel.h (.../mmodel.h) (revision 03de7d132838c54a23862809357c42102b6dab99) +++ sources/model/mmodel.h (.../mmodel.h) (revision 524fee2471717bf627eae41c6a599c9b5f4fbe55) @@ -114,6 +114,8 @@ */ namespace Model { +#include "HDDefs.h" + class MAdjustBloodDialysateReq { public: quint32 bloodFlow = 0; @@ -139,14 +141,24 @@ float volume = 0; }; +class MAdjustUltrafiltrationConfirmReq { +public: + enum Options : quint32 { + eDuration = UF_Adjustments::UF_ADJ_TREATMENT_TIME, + eRate = UF_Adjustments::UF_ADJ_UF_RATE, + }; + float volume = 0; + Options option = eDuration; +}; + } +typedef Model:: MAdjustBloodDialysateReq AdjustBloodDialysateRequestData; +typedef Model:: MAdjustDurationReq AdjustDurationRequestData; +typedef Model:: MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData; +typedef Model:: MAdjustUltrafiltrationReq AdjustUltrafiltrationRequestData; +typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData; -typedef Model:: MAdjustBloodDialysateReq AdjustBloodDialysateRequestData; -typedef Model:: MAdjustDurationReq AdjustDurationRequestData; -typedef Model::MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData; -typedef Model:: MAdjustUltrafiltrationReq AdjustUltrafiltrationRequestData; - //--------------------------------------------------------------------------------// //-------- Please add the model type to the lists below to register them ---------// //--------------------------------------------------------------------------------// @@ -167,7 +179,8 @@ REGISTER_METATYPE( AdjustUltrafiltrationStateRequestData ) \ REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ REGISTER_METATYPE( AdjustDurationRequestData ) \ - REGISTER_METATYPE( AdjustUltrafiltrationRequestData ) + REGISTER_METATYPE( AdjustUltrafiltrationRequestData ) \ + REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) //--------------------------------------------------------------------------------// #define ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \