Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -r09fc72d1410ab86f8de7b00dd7de4ea5612cf470 -r5a505f86c26c8e1fd6d584cd53a3765c25120781
--- sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 09fc72d1410ab86f8de7b00dd7de4ea5612cf470)
+++ sources/canbus/MessageInterpreter.cpp	(.../MessageInterpreter.cpp)	(revision 5a505f86c26c8e1fd6d584cd53a3765c25120781)
@@ -266,6 +266,9 @@
     case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationStateRequestData          ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq            : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationEditRequestData           ); break;
     case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq         : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationConfirmRequestData        ); break;
+    case Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditReq         : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFDurationEditRequestData        ); break;
+    case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditReq           : INTERPRET_TRANSMIT_MESSAGE(AdjustIsolatedUFVolumeEditRequestData          ); break;
+    case Gui::GuiActionType::ID_AdjustIsolatedUFConfirmReq              : INTERPRET_TRSMT_MT_MESSAGE(AdjustIsolatedUFConfirmRequestData             ); break;
     // End-Treatment
     case Gui::GuiActionType::ID_AdjustRinsebackReq                      : INTERPRET_TRANSMIT_MESSAGE(AdjustRinsebackRequestData                     ); break;
     case Gui::GuiActionType::ID_AdjustRecirculateReq                    : INTERPRET_TRANSMIT_MESSAGE(AdjustRecirculateRequestData                   ); break;
@@ -537,6 +540,7 @@
     case Gui::GuiActionType::ID_BloodPrime                          : ok = notify<Model::MTreatmentBloodPrime                       >(vMessage, vData, Gui::GuiActionType::ID_BloodPrime                        ); break;
     case Gui::GuiActionType::ID_TreatmentStop                       : ok = notify<Model::MTreatmentStop                             >(vMessage, vData, Gui::GuiActionType::ID_TreatmentStop                     ); break;
     case Gui::GuiActionType::ID_Ultrafiltration                     : ok = notify<Model::MTreatmentUltrafiltration                  >(vMessage, vData, Gui::GuiActionType::ID_Ultrafiltration                   ); break;
+    case Gui::GuiActionType::ID_IsolatedUF                          : ok = notify<Model::MTreatmentIsolatedUF                       >(vMessage, vData, Gui::GuiActionType::ID_IsolatedUF                        ); break;
     case Gui::GuiActionType::ID_TreatmentParametersSetPointData     : ok = notify<Model::MTreatmentParametersSetPoint               >(vMessage, vData, Gui::GuiActionType::ID_TreatmentParametersSetPointData   ); break;
     // ----- In-Treatment Adjust
     case Gui::GuiActionType::ID_AdjustBloodPrimeRsp                 : ok = notify<Model::MAdjustBloodPrimeResponse                  >(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodPrimeRsp               ); break;
@@ -556,6 +560,9 @@
     case Gui::GuiActionType::ID_AdjustRinsebackRsp                  : ok = notify<Model::MAdjustRinsebackResponse                   >(vMessage, vData, Gui::GuiActionType::ID_AdjustRinsebackRsp                ); break;
     case Gui::GuiActionType::ID_AdjustRecirculateRsp                : ok = notify<Model::MAdjustRecirculateResponse                 >(vMessage, vData, Gui::GuiActionType::ID_AdjustRecirculateRsp              ); break;
     case Gui::GuiActionType::ID_AdjustTreatmentEndRsp               : ok = notify<Model::MAdjustTreatmentEndResponse                >(vMessage, vData, Gui::GuiActionType::ID_AdjustTreatmentEndRsp             ); break;
+    case Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp     : ok = notify<Model::MAdjustIsolatedUFDurationEditResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFDurationEditRsp   ); break;
+    case Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp       : ok = notify<Model::MAdjustIsolatedUFVolumeEditResponse        >(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFVolumeEditRsp     ); break;
+    case Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp          : ok = notify<Model::MAdjustIsolatedUFConfirmResponse           >(vMessage, vData, Gui::GuiActionType::ID_AdjustIsolatedUFConfirmRsp        ); break;
 
     // ----- Post-Treatment Adjust
     case Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp   : ok = notify<Model::MAdjustPatientDisconnectionConfirmResponse >(vMessage, vData, Gui::GuiActionType::ID_AdjustPatientDisconnectConfirmRsp ); break;
@@ -569,8 +576,8 @@
     case Gui::GuiActionType::ID_AdjustDisinfectModeRsp              : ok = notify<Model::MAdjustDisinfectModeResponse               >(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectModeRsp            ); break;
     case Gui::GuiActionType::ID_AdjustDisinfectStartRsp             : ok = notify<Model::MAdjustDisinfectStartResponse              >(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<Model::MAdjustUltrafiltrationEditResponse         >(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp      ); break;
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp     : ok = notify<Model::MAdjustUltrafiltrationConfirmResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp   ); break;
 
     // ----- Alarms
     case Gui::GuiActionType::ID_AlarmStatus                         : ok = notify<Model::MAlarmStatus                           >(vMessage, vData, Gui::GuiActionType::ID_AlarmStatus                           ); break;
@@ -722,54 +729,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.