Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca -rd53e02ed37354a7d81d713a2c56547b669604cc0 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision d53e02ed37354a7d81d713a2c56547b669604cc0) @@ -574,8 +574,8 @@ case Gui::GuiActionType::ID_AdjustDisinfectModeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectModeRsp ); break; case Gui::GuiActionType::ID_AdjustDisinfectStartRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectStartRsp ); break; // these need to be standard and use notify as well - case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp : ok = adjustUltrafiltrationEdit (vMessage, vData); /* TODO : implement notify<>() */ break; - case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp : ok = adjustUltrafiltrationConfirm (vMessage, vData); /* TODO : implement notify<>() */ break; + case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp ); break; + case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp ); break; // ----- Alarms case Gui::GuiActionType::ID_AlarmStatus : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus ); break; @@ -727,54 +727,6 @@ // ---------- ---------- ---------- ---------- ---------- Adjustments ---------- ---------- ---------- ---------- ---------- // /*! - * \brief MessageInterpreter::adjustUltrafiltrationEditData - * \details This method interprets Treatment Ultrafiltration Volume Adjustment Response message data - * in vMessage of type Message. - * \param vMessage - The vMessage of type Message which contains all the data, - * require to be interpreted. - * \param vData - Treatment Ultrafiltration Volume Adjustment Response data - * \return true if the data can be extracted as defined for Treatment Ultrafiltration Volume Adjustment Response Message ID - */ -bool MessageInterpreter::adjustUltrafiltrationEdit(const Message &vMessage, QVariantList &vData) -{ - bool ok = false; - if ( ! isValidMessage(vMessage, Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp) ) return ok; - - Model::MAdjustUltrafiltrationEditResponse mData; - ok = mData.fromByteArray(vMessage.data); - LOG_APPED("HD," + mData.toString()); // TODO : Not Standard - - mData.toVariantList(vData); - emit didActionReceive(mData.data()); - - return ok; -} - -/*! - * \brief MessageInterpreter::adjustUltrafiltrationConfirmData - * \details This method interprets Treatment Ultrafiltration Volume Adjustment Confirm Response message data - * in vMessage of type Message. - * \param vMessage - The vMessage of type Message which contains all the data, - * require to be interpreted. - * \param vData - Treatment Ultrafiltration Volume Adjustment Confirm Response data - * \return true if the data can be extracted as defined for Treatment Ultrafiltration Volume Adjustment Confirm Response Message ID - */ -bool MessageInterpreter::adjustUltrafiltrationConfirm(const Message &vMessage, QVariantList &vData) -{ - bool ok = false; - if ( ! isValidMessage(vMessage, Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp) ) return ok; - - Model::MAdjustUltrafiltrationConfirmResponse mData; - ok = mData.fromByteArray(vMessage.data); - LOG_APPED("HD," + mData.toString()); // TODO : Not Standard - - mData.toVariantList(vData); - emit didActionReceive(mData.data()); - - return ok; -} - -/*! * \brief MessageInterpreter::updateUnhandledMessages * \return this method is converting the general settings messages/unhandled (Storage::Settings_Category_MessagesUnhandled) group of settings to the message interpreter specific map structure. * it is done for performance to keep the lookup table shorter and faster.