Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -re6ffa6d5d1b7820875de07cdbb15f06617400344 -r54dac829fccaf4646e2e21c18226893afd3d8e73 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision e6ffa6d5d1b7820875de07cdbb15f06617400344) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 54dac829fccaf4646e2e21c18226893afd3d8e73) @@ -659,6 +659,7 @@ void MessageDispatcher::onAdjustment(const AdjustParametersValidationRequestData &vData) { QVariantList mData; + mData += vData.mFinalConfirmation ; mData += vData.mTreatmentModality ; mData += vData.mHDFTreatmentMode ; mData += vData.mBloodFlowRate ; @@ -687,42 +688,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); }