Index: sources/applicationcontroller.cpp =================================================================== diff -u -r03de7d132838c54a23862809357c42102b6dab99 -r524fee2471717bf627eae41c6a599c9b5f4fbe55 --- sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision 03de7d132838c54a23862809357c42102b6dab99) +++ sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision 524fee2471717bf627eae41c6a599c9b5f4fbe55) @@ -111,18 +111,17 @@ connect(&_Logger , SIGNAL(didExport()), this , SLOT( onExport())); - connect(&_GuiController , SIGNAL(didAdjustment(const AdjustBloodDialysateRequestData &)), - this , SLOT( onAdjustment(const AdjustBloodDialysateRequestData &))); + connect(&_GuiController , SIGNAL(didAdjustment(const AdjustBloodDialysateRequestData &)), + this , SLOT( onAdjustment(const AdjustBloodDialysateRequestData &))); + connect(&_GuiController , SIGNAL(didAdjustment(const AdjustDurationRequestData &)), + this , SLOT( onAdjustment(const AdjustDurationRequestData &))); + connect(&_GuiController , SIGNAL(didAdjustment(const AdjustUltrafiltrationStateRequestData &)), + this , SLOT( onAdjustment(const AdjustUltrafiltrationStateRequestData &))); + connect(&_GuiController , SIGNAL(didAdjustment(const AdjustUltrafiltrationRequestData &)), + this , SLOT( onAdjustment(const AdjustUltrafiltrationRequestData &))); + connect(&_GuiController , SIGNAL(didAdjustment(const AdjustUltrafiltrationConfirmRequestData &)), + this , SLOT( onAdjustment(const AdjustUltrafiltrationConfirmRequestData &))); - connect(&_GuiController , SIGNAL(didAdjustment(const AdjustDurationRequestData &)), - this , SLOT( onAdjustment(const AdjustDurationRequestData &))); - - connect(&_GuiController , SIGNAL(didAdjustment(const AdjustUltrafiltrationRequestData &)), - this , SLOT( onAdjustment(const AdjustUltrafiltrationRequestData &))); - - connect(&_GuiController , SIGNAL(didAdjustment(const AdjustUltrafiltrationStateRequestData &)), - this , SLOT( onAdjustment(const AdjustUltrafiltrationStateRequestData &))); - ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(_MessageDispatcher) } @@ -258,54 +257,6 @@ // coco end /*! - * \brief ApplicationController::onAdjustment - * \details This method transmits the Blood/Dialysate Adjustment Denali message. - * \param vData - Data model contains Blood Flow Rate - and Dialysate Flow Rate - * \return void - */ -void ApplicationController::onAdjustment(const AdjustBloodDialysateRequestData &vData) -{ - QVariantList mData; - mData += vData.bloodFlow; - mData += vData.dialysateFlow; - onActionTransmit(GuiActionType::AdjustBloodDialysateReq, mData); -} - -/*! - * \brief ApplicationController::onAdjustment - * \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(const AdjustDurationRequestData &vData) -{ - QVariantList mData; - mData += vData.duratoin; - onActionTransmit(GuiActionType::AdjustDurationReq, mData); -} - -/*! - * \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::onAdjustment(const AdjustUltrafiltrationStateRequestData &vDate) -{ - QVariantList mData; - mData += vDate.requestedState; - onActionTransmit(GuiActionType::UltrafiltrationState, mData); -} - -/*! * \brief ApplicationController::keepAlive * \details This is the message which has to be send over the CANBUS * as an monitor for other nodes on the bus to notify UI is alive