Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r0583a63307936f09e184dfe16acca25f9e3fd81c -r66e87ea403ec12a273553284919684282d87bc6a --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 0583a63307936f09e184dfe16acca25f9e3fd81c) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 66e87ea403ec12a273553284919684282d87bc6a) @@ -292,11 +292,11 @@ * \param vData - Data model contains the start treatment request information. * \return void */ -void MessageDispatcher::onAdjustment(const StartTreatmentRequestData &vData) +void MessageDispatcher::onAdjustment(const TreatmentStartRequestData &vData) { QVariantList mData; mData += vData.request; - onActionTransmit(GuiActionType::ID_StartTreatmentReq, mData); + onActionTransmit(GuiActionType::ID_TreatmentStartReq, mData); } /*! @@ -331,11 +331,11 @@ * \param vData - Data model contains the confirm treatment request * \return void */ -void MessageDispatcher::onAdjustment(const ConfirmTreatmentRequestData &vData) +void MessageDispatcher::onAdjustment(const TreatmentConfirmRequestData &vData) { QVariantList mData; mData += vData.request; - onActionTransmit(GuiActionType::ID_ConfirmTreatmentReq, mData); + onActionTransmit(GuiActionType::ID_TreatmentConfirmReq, mData); } /*! @@ -344,11 +344,11 @@ * \param vData - Data model contains the end treatment request * \return void */ -void MessageDispatcher::onAdjustment(const EndTreatmentRequestData &vData) +void MessageDispatcher::onAdjustment(const TreatmentEndRequestData &vData) { Q_UNUSED(vData) QVariantList mData; - onActionTransmit(GuiActionType::ID_EndTreatmentReq, mData); + onActionTransmit(GuiActionType::ID_TreatmentEndReq, mData); } @@ -365,6 +365,34 @@ } /** + * \details This method transmits the Heparin Adjustment Denali message. + * \param vData - Data model contains treatment Heparin adjustment state. + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustHeparinRequestData &vData) +{ + QVariantList mData; + mData += vData.requestedState; + onActionTransmit(GuiActionType::ID_AdjustHeparinReq, 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 + */ +void MessageDispatcher::onAdjustment(const AdjustPressuresLimitsRequestData &vData) +{ + QVariantList mData; + mData += vData.mArterialLimitLow ; + mData += vData.mArterialLimitHigh; + mData += vData.mVenousLimitLow ; + mData += vData.mVenousLimitHigh ; + onActionTransmit(GuiActionType::ID_AdjustPressuresLimitsReq, mData); +} + +/** * \details This method transmits the Treatment Parameter request message. * \param vData - Data model contains treatment parameter adjustment data structure * \return void @@ -390,10 +418,9 @@ mData += vData.heparinBolusVolume ; mData += vData.dialysateTemp ; - onActionTransmit(GuiActionType::ID_CreateTreatmentReq, mData); + onActionTransmit(GuiActionType::ID_TreatmentCreateReq, mData); } - /*! * \brief MessageDispatcher::actionTransmit * \details This method is called by slot MessageDispatcher::onActionTransmit