Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r54aae98b72e3804008acad0bbbb7573be8e35707 -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 54aae98b72e3804008acad0bbbb7573be8e35707) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -343,14 +343,14 @@ * \param vData - Data model contains the user acknowledge request information. * \return void */ -/* coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. +/* // coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. void MessageDispatcher::onAdjustment(const AlarmClearedConditionRequestData &vData) { QVariantList mData; mData += vData.alarmID; onActionTransmit(GuiActionType::ID_AlarmClearedConditionReq, mData); } -coco end */ +// coco end */ /*! * \brief MessageDispatcher::onAdjustment @@ -365,20 +365,6 @@ onActionTransmit(GuiActionType::ID_TreatmentConfirmReq, mData); } -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the End Treatment request message. - * \param vData - Data model contains the end treatment request - * \return void - */ -void MessageDispatcher::onAdjustment(const TreatmentEndRequestData &vData) -{ - Q_UNUSED(vData) - QVariantList mData; - onActionTransmit(GuiActionType::ID_TreatmentEndReq, mData); -} - - /** * \details This method transmits the Saline Bolus Adjustment Denali message. * \param vData - Data model contains treatment Saline Bolus adjustment state. @@ -403,8 +389,57 @@ onActionTransmit(GuiActionType::ID_AdjustHeparinReq, mData); } +/** + * \details This method transmits the Rinseback Adjustment Denali message. + * \param vData - Data model contains treatment Rinseback adjustment state. + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustRinsebackRequestData &vData) +{ + QVariantList mData; + mData += vData.requestedState; + onActionTransmit(GuiActionType::ID_AdjustRinsebackReq, mData); +} + +/** + * \details This method transmits the Recirculate Adjustment Denali message. + * \param vData - Data model contains treatment Recirculate adjustment state. + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustRecirculateRequestData &vData) +{ + QVariantList mData; + mData += vData.requestedState; + onActionTransmit(GuiActionType::ID_AdjustRecirculateReq, mData); +} + +/** + * \details This method transmits the Treatment End Adjustment Denali message. + * \param vData - Data model contains treatment end adjustment state. + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustTreatmentEndRequestData &vData) +{ + QVariantList mData; + mData += vData.requestedState; + onActionTransmit(GuiActionType::ID_AdjustTreatmentEndReq, mData); +} + /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the HD Version Denali message. + * \param vData - Data model contains HD Version state. + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustVersionsRequestData &vData) +{ + Q_UNUSED(vData); + QVariantList mData; + onActionTransmit(GuiActionType::ID_AdjustVersionsReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Pressures Limits Adjustment Denali message. * \param vData - Data model contains treatment Pressures Limits adjustment. * \return void