Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rb2db816026524a19086e900eef867d7f5a3aa6f2 -r59a1b4dceeb629ed08a434775d819ce108fe894b --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision b2db816026524a19086e900eef867d7f5a3aa6f2) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) @@ -272,7 +272,9 @@ void MessageDispatcher::onAdjustment(const AdjustDurationConfirmRequestData &vData) { QVariantList mData; - mData += vData.duration; + mData += vData.duration ; + mData += vData.heparinDuration ; + mData += vData.rate ; onActionTransmit(GuiActionType::ID_AdjustDurationConfirmReq, mData); } @@ -300,6 +302,23 @@ /*! * \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 AdjustVitalsAlarmLimitsRequestData &vData) +{ + QVariantList mData; + mData += vData.systolicBpLowAlarmLimit ; + mData += vData.systolicBpHighAlarmLimit ; + mData += vData.heartRateLowAlarmLimit ; + mData += vData.heartRateHighAlarmLimit ; + mData += vData.vitalsInterval ; + onActionTransmit(GuiActionType::ID_AdjustVitalsAlarmLimitsReq, 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 @@ -373,6 +392,7 @@ { QVariantList mData; mData += vData.volume; + mData += vData.rate; onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationConfirmReq, mData); } @@ -656,6 +676,7 @@ void MessageDispatcher::onAdjustment(const AdjustParametersValidationRequestData &vData) { QVariantList mData; + mData += vData.mFinalConfirmation ; mData += vData.mTreatmentModality ; mData += vData.mHDFTreatmentMode ; mData += vData.mBloodFlowRate ; @@ -684,42 +705,17 @@ onActionTransmit(GuiActionType::ID_AdjustParametersValidationReq, mData); } -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Confirm Treatment request message. - * \param vData - Data model contains the confirm treatment request - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustParametersConfirmRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustParametersConfirmReq, mData); -} /*! * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Water Sample Adjustment Denali message. - * \param vData - Data model contains Water Sample adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustWaterSampleRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustWaterSampleReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment * \details This method transmits the Water Sample Result Adjustment Denali message. * \param vData - Data model contains Water Sample Result adjustment. * \return void */ void MessageDispatcher::onAdjustment(const AdjustWaterSampleResultRequestData &vData) { QVariantList mData; - mData += vData.requestedState; + mData += vData.result; onActionTransmit(GuiActionType::ID_AdjustWaterSampleResultReq, mData); }