Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -r6f84868686bf6d3e58887eb80c749c57cf07a00e --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision cb9c48c7c307690dcafcfd16ef412fe660291692) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 6f84868686bf6d3e58887eb80c749c57cf07a00e) @@ -239,19 +239,88 @@ /*! * \brief MessageDispatcher::onAdjustment - * \details This method transmits the treatment duration Adjustment Denali message. + * \details This method transmits the treatment duration adjustment edit message. * \param vData - Data model contains treatment duration adjustment value in minutes * \return void */ -void MessageDispatcher::onAdjustment(const AdjustDurationRequestData &vData) +void MessageDispatcher::onAdjustment(const AdjustDurationEditRequestData &vData) { QVariantList mData; mData += vData.duration; - onActionTransmit(GuiActionType::ID_AdjustDurationReq, mData); + onActionTransmit(GuiActionType::ID_AdjustDurationEditReq, mData); } /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the treatment duration adjustment confirm message. + * \param vData - Data model contains treatment duration adjustment value in minutes + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDurationConfirmRequestData &vData) +{ + QVariantList mData; + mData += vData.duration; + onActionTransmit(GuiActionType::ID_AdjustDurationConfirmReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the set points adjustment request message. + * \param vData - Data model contains set points adjustment values + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustSetPointsRequestData &vData) +{ + QVariantList mData; + mData += vData.bloodFlowRate ; + mData += vData.dialysateFlowRate ; + mData += vData.dialysateTemperature ; + mData += vData.acidConcentrate ; + mData += vData.bicarbConcentrate ; + onActionTransmit(GuiActionType::ID_AdjustSetPointsReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the dialysate temperature adjustment request message. + * \param vData - Data model contains dialysate temperature adjustment values + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDialysateTemperatureRequestData &vData) +{ + QVariantList mData; + mData += vData.dialysateTemperature; + onActionTransmit(GuiActionType::ID_AdjustDialysateTemperatureReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the dialysate rate adjustment request message. + * \param vData - Data model contains dialysate rate adjustment values + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDialysateFlowRateRequestData &vData) +{ + QVariantList mData; + mData += vData.dialysateFlowRate; + onActionTransmit(GuiActionType::ID_AdjustDialysateFlowRateReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the blood flow rate adjustment request message. + * \param vData - Data model contains blood flow rate adjustment values + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustBloodFlowRateRequestData &vData) +{ + QVariantList mData; + mData += vData.bloodFlowRate; + onActionTransmit(GuiActionType::ID_AdjustBloodFlowRateReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Ultrafiltration State Adjustment Denali message. * \param vData - Data model contains treatment ultrafiltration state adjustment * \return void @@ -472,6 +541,19 @@ /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Bolus Volume Adjustment message. + * \param vData - Data model contains treatment bolus volume adjustment. + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustBolusVolumeRequestData &vData) +{ + QVariantList mData; + mData += vData.mBolusVolume; + onActionTransmit(GuiActionType::ID_AdjustBolusVolumeReq, 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 @@ -482,6 +564,7 @@ mData += vData.mArterialPressureLimitWindow ; mData += vData.mVenousPressureLimitWindow ; mData += vData.mVenousPressureLimitAsymtrc ; + mData += vData.mTmpLimitWindow ; onActionTransmit(GuiActionType::ID_AdjustPressuresLimitsReq, mData); } @@ -521,7 +604,7 @@ mData += vData.mArterialPressureLimitWindow ; mData += vData.mVenousPressureLimitWindow ; mData += vData.mVenousPressureLimitAsymtrc ; - mData += vData.mTrancembrncPressureLimitWindow ; + mData += vData.mTransmembranePressureLimitWindow; mData += vData.mDialysateTemp ; mData += vData.mHeparinDispensingRate ; mData += vData.mHeparinBolusVolume ;