Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rb2db816026524a19086e900eef867d7f5a3aa6f2 -rc70815ad2b3beadf61832f2e4d12eb90d476e020 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision b2db816026524a19086e900eef867d7f5a3aa6f2) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) @@ -656,6 +656,7 @@ void MessageDispatcher::onAdjustment(const AdjustParametersValidationRequestData &vData) { QVariantList mData; + mData += vData.mFinalConfirmation ; mData += vData.mTreatmentModality ; mData += vData.mHDFTreatmentMode ; mData += vData.mBloodFlowRate ; @@ -684,42 +685,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); }