Index: sources/applicationcontroller.cpp =================================================================== diff -u -rb789046c096cfdddb39adcd3d5be1e129769aac6 -r03de7d132838c54a23862809357c42102b6dab99 --- sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision b789046c096cfdddb39adcd3d5be1e129769aac6) +++ sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision 03de7d132838c54a23862809357c42102b6dab99) @@ -111,17 +111,17 @@ connect(&_Logger , SIGNAL(didExport()), this , SLOT( onExport())); - connect(&_GuiController , SIGNAL(didAdjustment(quint32, quint32)), - this , SLOT( onAdjustment(quint32, quint32))); + connect(&_GuiController , SIGNAL(didAdjustment(const AdjustBloodDialysateRequestData &)), + this , SLOT( onAdjustment(const AdjustBloodDialysateRequestData &))); - connect(&_GuiController , SIGNAL(didAdjustment(quint32)), - this , SLOT( onAdjustment(quint32))); + connect(&_GuiController , SIGNAL(didAdjustment(const AdjustDurationRequestData &)), + this , SLOT( onAdjustment(const AdjustDurationRequestData &))); - connect(&_GuiController , SIGNAL(didAdjustment(const MAdjustUltrafiltrationReq &)), - this , SLOT( onAdjustment(const MAdjustUltrafiltrationReq &))); + connect(&_GuiController , SIGNAL(didAdjustment(const AdjustUltrafiltrationRequestData &)), + this , SLOT( onAdjustment(const AdjustUltrafiltrationRequestData &))); - connect(&_GuiController , SIGNAL(didUltrafiltrationStateRequest(quint32)), - this , SLOT( onUltrafiltrationStateRequest(quint32))); + connect(&_GuiController , SIGNAL(didAdjustment(const AdjustUltrafiltrationStateRequestData &)), + this , SLOT( onAdjustment(const AdjustUltrafiltrationStateRequestData &))); ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(_MessageDispatcher) } @@ -260,42 +260,48 @@ /*! * \brief ApplicationController::onAdjustment * \details This method transmits the Blood/Dialysate Adjustment Denali message. - * \param vBloodFlow - Blood Flow Rate - * \param vDialysateFlow - Dialysate Flow Rate + * \param vData - Data model contains Blood Flow Rate + and Dialysate Flow Rate * \return void */ -void ApplicationController::onAdjustment(quint32 vBloodFlow, quint32 vDialysateFlow) +void ApplicationController::onAdjustment(const AdjustBloodDialysateRequestData &vData) { QVariantList mData; - mData += vBloodFlow; - mData += vDialysateFlow; + mData += vData.bloodFlow; + mData += vData.dialysateFlow; onActionTransmit(GuiActionType::AdjustBloodDialysateReq, mData); } /*! * \brief ApplicationController::onAdjustment - * \details This method transmits the Blood/Dialysate Adjustment Denali message. - * \param vDuration - Treatment duration adjustment value in minuts + * \details This method transmits the treatment duration Adjustment Denali message. + * \param vData - Data model contains treatment duration adjustment value in minuts * \return void */ -void ApplicationController::onAdjustment(quint32 vDuration) +void ApplicationController::onAdjustment(const AdjustDurationRequestData &vData) { QVariantList mData; - mData += vDuration; + mData += vData.duratoin; onActionTransmit(GuiActionType::AdjustDurationReq, mData); } -void ApplicationController::onAdjustment(const MAdjustUltrafiltrationReq &vData) +/*! + * \brief ApplicationController::onAdjustment + * \details This method transmits the Ultrafiltration Adjustment Denali message. + * \param vData - Data model contains treatment ultrafiltration adjustment volume + * \return void + */ +void ApplicationController::onAdjustment(const AdjustUltrafiltrationRequestData &vData) { QVariantList mData; mData += vData.volume; onActionTransmit(GuiActionType::AdjustUltrafiltrationReq, mData); } -void ApplicationController::onUltrafiltrationStateRequest(quint32 vState) +void ApplicationController::onAdjustment(const AdjustUltrafiltrationStateRequestData &vDate) { QVariantList mData; - mData += vState; + mData += vDate.requestedState; onActionTransmit(GuiActionType::UltrafiltrationState, mData); }