Index: sources/canbus/messageinterpreter.cpp
===================================================================
diff -u -r93b6ad6b18c505fedab37d95dc87be61db48641c -r9cc1608f615e66d0f1c3a022aa6d19579d76b241
--- sources/canbus/messageinterpreter.cpp	(.../messageinterpreter.cpp)	(revision 93b6ad6b18c505fedab37d95dc87be61db48641c)
+++ sources/canbus/messageinterpreter.cpp	(.../messageinterpreter.cpp)	(revision 9cc1608f615e66d0f1c3a022aa6d19579d76b241)
@@ -24,18 +24,8 @@
 
 using namespace Can;
 
-#define DEBUG_RECEIVE_SIGNAL(vID, vMODEL) // Debug() << #vID << #vMODEL;
+#define DEBUG_RECEIVE_SIGNAL(vID, vMODEL) qDebug() << vID << vMODEL;
 
-// This define helps to prevent having multiple overloaded functions for each model
-#define EMIT_RECEIVE_SIGNAL(vID, vMODEL) {          \
-    vMODEL mModel;                                  \
-    ok = prepareData(vMessage, vID, mModel, vData); \
-    if ( ! ok ) return false;                       \
-    emit didActionReceive(mModel.data());           \
-    logReceivedMessage(mModel);                     \
-    DEBUG_RECEIVE_SIGNAL(vID, vMODEL)               \
-}
-
 /*!
  * \brief MessageInterpreter::MessageInterpreter
  * \details Constructor
@@ -45,6 +35,32 @@
 MessageInterpreter::MessageInterpreter(QObject *parent) : QObject(parent) { }
 
 /*!
+ * \brief MessageInterpreter::notify
+ * \details Checks and Prepaires the model with the Message Data
+ *          Regarding the type of message logs the message recived.
+ *          Notofies observers by emiting the didActionReceive( < Data > ) signal
+ * \param   vMessage - The Denali message
+ * \param   vID      - The Message ID to be checked against
+ * \param   vModel   - The appropriate model for the Message Data
+ * \param   vData    - A QVariant list of the Message Data which will be used for debugging if needed.
+ * \return  true on successful check and prepare.
+ */
+template<typename TModel>
+bool MessageInterpreter::notify(const Message &vMessage, QVariantList &vData, Gui::GuiActionType vIdCheck)
+{
+    bool ok = false;
+    TModel mModel;
+    if ( ! isValidMessage(vMessage, vIdCheck) ) return ok;
+    ok = mModel.fromByteArray(vMessage.data);
+    mModel.toVariantList(vData);
+    if ( ! ok ) return false;
+    emit didActionReceive(mModel.data());
+    logReceivedMessage(mModel);
+    DEBUG_RECEIVE_SIGNAL(vIdCheck, typeid(TModel).name())
+    return ok;
+}
+
+/*!
  * \brief   MessageInterpreter::isType
  * \details Checks if this is the message intended to be
  * \param   vMessage - The message
@@ -125,24 +141,6 @@
 }
 
 /*!
- * \brief   MessageInterpreter::prepareData
- * \details Checks and Prepaires the model with the Message Data
- * \param   vMessage - The Denali message
- * \param   vID      - The Message ID to be checked against
- * \param   vModel   - The appropriate model for the Message Data
- * \param   vData    - A QVariant list of the Message Data which will be used for debugging if needed.
- * \return  true on successful check and prepare.
- */
-bool MessageInterpreter::prepareData(const Message &vMessage, Gui::GuiActionType vID, Model::MAbstract &vModel, QVariantList &vData)
-{
-    bool ok = false;
-    if ( ! isValidMessage(vMessage, vID) ) return ok;
-    ok = vModel.fromByteArray(vMessage.data);
-    vModel.toVariantList(vData);
-    return ok;
-}
-
-/*!
  * \brief   MessageInterpreter::logReceived
  * \details Regarding the type of message logs the message recived.
  * \param   vModel - the MAbstract model type
@@ -302,38 +300,38 @@
     vData.clear();
     switch (vMessage.actionId) { // notice we are in receive mode
     // ----- Debug
-    case Gui::GuiActionType::ID_CANBusFaultCount                : ok = canbusFaultCountData         (vMessage, vData); break;
+    case Gui::GuiActionType::ID_CANBusFaultCount                : ok = canbusFaultCountData         (vMessage, vData); break; // TODO : implement notify<>()
 
     // ----- Datum
-    case Gui::GuiActionType::ID_TreatmentTime                   : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_TreatmentTime          , Model::MTreatmentTime     ); break;
-    case Gui::GuiActionType::ID_BloodFlow                       : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_BloodFlow              , Model::MBloodFlow         ); break;
-    case Gui::GuiActionType::ID_DialysateInletFlow              : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DialysateInletFlow     , Model::MDialysateFlow     ); break;
-    case Gui::GuiActionType::ID_DialysateOutletFlow             : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DialysateOutletFlow    , Model::MOutletFlow        ); break;
-    case Gui::GuiActionType::ID_TreatmentRanges                 : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_TreatmentRanges        , Model::MTreatmentRanges   ); break;
-    case Gui::GuiActionType::ID_PressureOcclusion               : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_PressureOcclusion      , Model::MPressureOcclusion ); break;
-    case Gui::GuiActionType::ID_TreatmentStates                 : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_TreatmentStates        , Model::MTreatmentStates   ); break;
+    case Gui::GuiActionType::ID_TreatmentTime                   : ok = notify<Model::MTreatmentTime               >(vMessage, vData, Gui::GuiActionType::ID_TreatmentTime          ); break;
+    case Gui::GuiActionType::ID_BloodFlow                       : ok = notify<Model::MBloodFlow                   >(vMessage, vData, Gui::GuiActionType::ID_BloodFlow              ); break;
+    case Gui::GuiActionType::ID_DialysateInletFlow              : ok = notify<Model::MDialysateFlow               >(vMessage, vData, Gui::GuiActionType::ID_DialysateInletFlow     ); break;
+    case Gui::GuiActionType::ID_DialysateOutletFlow             : ok = notify<Model::MOutletFlow                  >(vMessage, vData, Gui::GuiActionType::ID_DialysateOutletFlow    ); break;
+    case Gui::GuiActionType::ID_TreatmentRanges                 : ok = notify<Model::MTreatmentRanges             >(vMessage, vData, Gui::GuiActionType::ID_TreatmentRanges        ); break;
+    case Gui::GuiActionType::ID_PressureOcclusion               : ok = notify<Model::MPressureOcclusion           >(vMessage, vData, Gui::GuiActionType::ID_PressureOcclusion      ); break;
+    case Gui::GuiActionType::ID_TreatmentStates                 : ok = notify<Model::MTreatmentStates             >(vMessage, vData, Gui::GuiActionType::ID_TreatmentStates        ); break;
 
     // ----- Events
-    case Gui::GuiActionType::ID_HDOperationModeData             : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_HDOperationModeData    , Model::MHDOperationMode   ); break;
-    case Gui::GuiActionType::ID_HDDebugText                     : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_HDDebugText            , Model::MHDDebugText       ); break;
+    case Gui::GuiActionType::ID_HDOperationModeData             : ok = notify<Model::MHDOperationMode             >(vMessage, vData, Gui::GuiActionType::ID_HDOperationModeData    ); break;
+    case Gui::GuiActionType::ID_HDDebugText                     : ok = notify<Model::MHDDebugText                 >(vMessage, vData, Gui::GuiActionType::ID_HDDebugText            ); break;
 
-    case Gui::GuiActionType::ID_Acknow                          : ok = true;                                           break; // Needs more investigation for EMIT_RECEIVE_SIGNAL consistency
-    case Gui::GuiActionType::ID_PowerOff                        : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_PowerOff               , Model::MPowerOff          ); break;
-    case Gui::GuiActionType::ID_ShuttingDown                    : ok = true; LOG_EVENT("HD,ShuttingDown");             break; // Needs more investigation for EMIT_RECEIVE_SIGNAL consistency
-    case Gui::GuiActionType::ID_AlarmStatus                     : ok = alarmStatus                  (vMessage, vData); break;
-    case Gui::GuiActionType::ID_AlarmTriggered                  : ok = alarmTriggered               (vMessage, vData); break;
-    case Gui::GuiActionType::ID_AlarmCleared                    : ok = alarmCleared                 (vMessage, vData); break;
+    case Gui::GuiActionType::ID_Acknow                          : ok = true;                                           break; // TODO : implement notify<>()
+    case Gui::GuiActionType::ID_PowerOff                        : ok = notify<Model::MPowerOff                    >(vMessage, vData, Gui::GuiActionType::ID_PowerOff               ); break;
+    case Gui::GuiActionType::ID_ShuttingDown                    : ok = true; LOG_EVENT("HD,ShuttingDown");             break; // TODO : implement notify<>()
+    case Gui::GuiActionType::ID_AlarmStatus                     : ok = alarmStatus                  (vMessage, vData); break; // TODO : implement notify<>()
+    case Gui::GuiActionType::ID_AlarmTriggered                  : ok = alarmTriggered               (vMessage, vData); break; // TODO : implement notify<>()
+    case Gui::GuiActionType::ID_AlarmCleared                    : ok = alarmCleared                 (vMessage, vData); break; // TODO : implement notify<>()
 
     // Adjustment Response Messages
-    case Gui::GuiActionType::ID_AdjustDurationRsp               : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_AdjustDurationRsp       , Model::MAdjustDurationResponse       ); break;
-    case Gui::GuiActionType::ID_AdjustBloodDialysateRsp         : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_AdjustBloodDialysateRsp , Model::MAdjustBloodDialysateResponse ); break;
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq   : ok = adjustUltrafiltrationState   (vMessage, vData); break; // Needs more investigation for EMIT_RECEIVE_SIGNAL consistency
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp    : ok = adjustUltrafiltrationEdit    (vMessage, vData); break; // Needs more investigation for EMIT_RECEIVE_SIGNAL consistency
-    case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp : ok = adjustUltrafiltrationConfirm (vMessage, vData); break; // Needs more investigation for EMIT_RECEIVE_SIGNAL consistency
+    case Gui::GuiActionType::ID_AdjustDurationRsp               : ok = notify<Model::MAdjustDurationResponse      >(vMessage, vData, Gui::GuiActionType::ID_AdjustDurationRsp      ); break;
+    case Gui::GuiActionType::ID_AdjustBloodDialysateRsp         : ok = notify<Model::MAdjustBloodDialysateResponse>(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp); break;
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq   : ok = adjustUltrafiltrationState   (vMessage, vData); break; // TODO : implement notify<>()
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp    : ok = adjustUltrafiltrationEdit    (vMessage, vData); break; // TODO : implement notify<>()
+    case Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp : ok = adjustUltrafiltrationConfirm (vMessage, vData); break; // TODO : implement notify<>()
 
     // unhandles messages: these will only be logged as received message
     // there has nothing been defined for these messages.
-    default                                                 :      printUnhandled               (vMessage       ); break;
+    default                                                 :      printUnhandled                   (vMessage       ); break;
     }
 
     return ok;
@@ -357,23 +355,22 @@
     bool    ok = false;
     vData.clear();
     switch (vMessage.actionId) { // notice we are in receive mode
-    case Gui::GuiActionType::ID_DGCheckIn:
+    case Gui::GuiActionType::ID_DGCheckIn: // TODO : implement notify<>()
         ok = true;
         LOG_EVENT(QString("DG,CheckIn," + QVariant(vData).toStringList().join(',')));
         break;
 
-    case Gui::GuiActionType::ID_DGROPumpData            : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGROPumpData           , Model::MDGROPump             ); break;
-    case Gui::GuiActionType::ID_DGPressuresData         : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGPressuresData        , Model::MDGPressures          ); break;
-    case Gui::GuiActionType::ID_DGDrainPumpData         : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGDrainPumpData        , Model::MDGDrainPump          ); break;
-    case Gui::GuiActionType::ID_DGOperationModeData     : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGOperationModeData    , Model::MDGOperationMode      ); break;
-    case Gui::GuiActionType::ID_DGReservoirData         : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGReservoirData        , Model::MDGReservoir          ); break;
-    case Gui::GuiActionType::ID_DGValvesStatesData      : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGValvesStatesData     , Model::MDGValvesStates       ); break;
-    case Gui::GuiActionType::ID_DGHeatersData           : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGHeatersData          , Model::MDGHeaters            ); break;
-    case Gui::GuiActionType::ID_DGLoadCellReadingsData  : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGLoadCellReadingsData , Model::MDGLoadCellReadings   ); break;
-    case Gui::GuiActionType::ID_DGTemperaturesData      : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGTemperaturesData     , Model::MDGTemperatures       ); break;
+    case Gui::GuiActionType::ID_DGROPumpData            : ok = notify<Model::MDGROPump           >(vMessage, vData, Gui::GuiActionType::ID_DGROPumpData          ); break;
+    case Gui::GuiActionType::ID_DGPressuresData         : ok = notify<Model::MDGPressures        >(vMessage, vData, Gui::GuiActionType::ID_DGPressuresData       ); break;
+    case Gui::GuiActionType::ID_DGDrainPumpData         : ok = notify<Model::MDGDrainPump        >(vMessage, vData, Gui::GuiActionType::ID_DGDrainPumpData       ); break;
+    case Gui::GuiActionType::ID_DGOperationModeData     : ok = notify<Model::MDGOperationMode    >(vMessage, vData, Gui::GuiActionType::ID_DGOperationModeData   ); break;
+    case Gui::GuiActionType::ID_DGReservoirData         : ok = notify<Model::MDGReservoir        >(vMessage, vData, Gui::GuiActionType::ID_DGReservoirData       ); break;
+    case Gui::GuiActionType::ID_DGValvesStatesData      : ok = notify<Model::MDGValvesStates     >(vMessage, vData, Gui::GuiActionType::ID_DGValvesStatesData    ); break;
+    case Gui::GuiActionType::ID_DGHeatersData           : ok = notify<Model::MDGHeaters          >(vMessage, vData, Gui::GuiActionType::ID_DGHeatersData         ); break;
+    case Gui::GuiActionType::ID_DGLoadCellReadingsData  : ok = notify<Model::MDGLoadCellReadings >(vMessage, vData, Gui::GuiActionType::ID_DGLoadCellReadingsData); break;
+    case Gui::GuiActionType::ID_DGTemperaturesData      : ok = notify<Model::MDGTemperatures     >(vMessage, vData, Gui::GuiActionType::ID_DGTemperaturesData    ); break;
+    case Gui::GuiActionType::ID_DGDebugText             : ok = notify<Model::MDGDebugText        >(vMessage, vData, Gui::GuiActionType::ID_DGDebugText           ); break;
 
-    case Gui::GuiActionType::ID_DGDebugText             : EMIT_RECEIVE_SIGNAL(Gui::GuiActionType::ID_DGDebugText            , Model::MDGDebugText          ); break;
-
     // unhandles messages: these will only be logged as received message
     // there has nothing been defined for these messages.
     default: