Index: denali.pro
===================================================================
diff -u -rb8dd541d377ad1e8d7b988ce0163d99bff53843f -rfef971047be21dd255a497fbf54c170316d617a9
--- denali.pro	(.../denali.pro)	(revision b8dd541d377ad1e8d7b988ce0163d99bff53843f)
+++ denali.pro	(.../denali.pro)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -270,11 +270,8 @@
     VER_MINOR="\\\"${minorVersion}\\\""                 \
     VER_MICRO="\\\"${microVersion}\\\""                 \
     VER_REVIS="\\\"${buildNumber}\\\""                  \
-    VER_MAJOR_DEV=\\\"0\\\"                             \
-    VER_MINOR_DEV=\\\"0\\\"                             \
-    VER_MICRO_DEV=\\\"0\\\"                             \
     VER_REVIS_DEV=\\\"$$system( date "+%m%d%H%M" )\\\"  \
-    VER_APPLY=\\\"$$system( touch -m main.cpp )\\\"      \
+    VER_APPLY=\\\"$$system( touch -m main.cpp )\\\"     \
     VER_BRANCH=\\\"$$system( git rev-parse --abbrev-ref HEAD )\\\"
 
 CodeCoverage {
Index: denali.pro.user
===================================================================
diff -u -r9f63306043e9a184ce3e71c573ef0a15d8644f95 -rfef971047be21dd255a497fbf54c170316d617a9
--- denali.pro.user	(.../denali.pro.user)	(revision 9f63306043e9a184ce3e71c573ef0a15d8644f95)
+++ denali.pro.user	(.../denali.pro.user)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2020-10-06T12:38:59. -->
+<!-- Written by QtCreator 4.10.0, 2020-10-16T20:33:59. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -1122,15 +1122,6 @@
    <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
-    <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
-    <valuelist type="QVariantList" key="Analyzer.Perf.Events">
-     <value type="QString">cpu-cycles</value>
-    </valuelist>
-    <valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/>
-    <value type="int" key="Analyzer.Perf.Frequency">250</value>
-    <value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
-    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
-    <value type="int" key="Analyzer.Perf.StackSize">4096</value>
     <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
     <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
     <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
@@ -1423,15 +1414,6 @@
    <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
-    <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
-    <valuelist type="QVariantList" key="Analyzer.Perf.Events">
-     <value type="QString">cpu-cycles</value>
-    </valuelist>
-    <valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/>
-    <value type="int" key="Analyzer.Perf.Frequency">250</value>
-    <value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
-    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
-    <value type="int" key="Analyzer.Perf.StackSize">4096</value>
     <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
     <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
     <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
Index: main.cpp
===================================================================
diff -u -r6782f49ad8830bb088b7608f14d2bbad42777cbd -rfef971047be21dd255a497fbf54c170316d617a9
--- main.cpp	(.../main.cpp)	(revision 6782f49ad8830bb088b7608f14d2bbad42777cbd)
+++ main.cpp	(.../main.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -208,7 +208,8 @@
     QString ver_revis   = QString("%1").arg(VER_REVIS   );
     QString ver_branch  = QString("%1").arg(VER_BRANCH  );
 
-    if (ver_revis.isEmpty())  { ver_revis = VER_REVIS_DEV;
+    if (ver_revis.isEmpty())  {
+        ver_revis = VER_REVIS_DEV;
         ver_revis_empty = true;
     }
 
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -141,12 +141,6 @@
             Timeout     = 0x01,
         };
 
-        enum Saline_States { // FW currently doesn't have enum for Saline Bolus when provided better to be replaced.
-            SALINE_STOP_STATE    = 0,    ///< Saline is not delivered
-            SALINE_START_STATE      ,    ///< Saline being Delivered
-            SALINE_DISABLE_STATE    ,    ///< Saline cumulative volume delivery has reached the maximum
-        };
-
         Q_ENUM(GuiActionsType_Enum)
         Q_ENUM(GuiActionsData_Enum)
 
@@ -162,7 +156,7 @@
         Q_ENUM(UF_Adjustments)
         Q_ENUM(Treatment_States)
         Q_ENUM(UF_States)
-        Q_ENUM(Saline_States)
+        Q_ENUM(Saline_Bolus_States)
 
         #include "DGDefs.h"
         Q_ENUM(DG_Op_Modes)
@@ -181,9 +175,9 @@
     typedef GuiActions::DG_Op_Modes             GuiDGOpModes;
 
     typedef GuiActions::UF_Adjustments          GuiUFAdjustment;
-    typedef GuiActions::Treatment_States        GuiTreatment_States;
+    typedef GuiActions::Treatment_States        GuiTreatmentStates;
     typedef GuiActions::UF_States               GuiUFStates;
-    typedef GuiActions::Saline_States           GuiSalineStates;
+    typedef GuiActions::Saline_Bolus_States     GuiSalineStates;
 
     void registerTypes();
     void registerQmlTypes();
Index: sources/gui/qml/components/ImageClock.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/gui/qml/components/ImageClock.qml	(.../ImageClock.qml)	(revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/components/ImageClock.qml	(.../ImageClock.qml)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -6,7 +6,7 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file ImageClock.qml
- * \author (last) Behrouz NemaiPour
+ * \author (last) Behrouz NematiPour
  * \date (last) 28-May-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 18-May-2020
Index: sources/gui/qml/components/ImageWave.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/gui/qml/components/ImageWave.qml	(.../ImageWave.qml)	(revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/components/ImageWave.qml	(.../ImageWave.qml)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -6,7 +6,7 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file ImageWave.qml
- * \author (last) Behrouz NemaiPour
+ * \author (last) Behrouz NematiPour
  * \date (last) 28-May-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 18-May-2020
Index: sources/gui/qml/components/MainMenu.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/gui/qml/components/MainMenu.qml	(.../MainMenu.qml)	(revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/components/MainMenu.qml	(.../MainMenu.qml)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -6,7 +6,7 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file MainMenu.qml
- * \author (last) Behrouz NemaiPour
+ * \author (last) Behrouz NematiPour
  * \date (last) 18-Jun-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 17-Oct-2019
Index: sources/gui/qml/components/ProgressBar.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/gui/qml/components/ProgressBar.qml	(.../ProgressBar.qml)	(revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/components/ProgressBar.qml	(.../ProgressBar.qml)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -6,7 +6,7 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file ProgressBar.qml
- * \author (last) Behrouz NemaiPour
+ * \author (last) Behrouz NematiPour
  * \date (last) 04-Jun-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 23-Jan-2020
Index: sources/gui/qml/components/ProgressBarEx.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/gui/qml/components/ProgressBarEx.qml	(.../ProgressBarEx.qml)	(revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/components/ProgressBarEx.qml	(.../ProgressBarEx.qml)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -6,7 +6,7 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file ProgressBarEx.qml
- * \author (last) Behrouz NemaiPour
+ * \author (last) Behrouz NematiPour
  * \date (last) 04-Jun-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 18-Mar-2020
Index: sources/gui/qml/components/ProgressRect.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/gui/qml/components/ProgressRect.qml	(.../ProgressRect.qml)	(revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/components/ProgressRect.qml	(.../ProgressRect.qml)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -6,7 +6,7 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file ProgressRect.qml
- * \author (last) Behrouz NemaiPour
+ * \author (last) Behrouz NematiPour
  * \date (last) 04-Jun-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 23-Jan-2020
Index: sources/gui/qml/components/RangeBar.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/gui/qml/components/RangeBar.qml	(.../RangeBar.qml)	(revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/components/RangeBar.qml	(.../RangeBar.qml)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -6,7 +6,7 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file RangeBar.qml
- * \author (last) Behrouz NemaiPour
+ * \author (last) Behrouz NematiPour
  * \date (last) 04-Jun-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 27-Jan-2020
Index: sources/gui/qml/components/RangeMarker.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/gui/qml/components/RangeMarker.qml	(.../RangeMarker.qml)	(revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/components/RangeMarker.qml	(.../RangeMarker.qml)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -6,7 +6,7 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file RangeMarker.qml
- * \author (last) Behrouz NemaiPour
+ * \author (last) Behrouz NematiPour
  * \date (last) 04-Jun-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 27-Jan-2020
Index: sources/gui/qml/components/TickMarks.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/gui/qml/components/TickMarks.qml	(.../TickMarks.qml)	(revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/components/TickMarks.qml	(.../TickMarks.qml)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -6,7 +6,7 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file TickMarks.qml
- * \author (last) Behrouz NemaiPour
+ * \author (last) Behrouz NematiPour
  * \date (last) 04-Jun-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 22-Mar-2020
Index: sources/gui/qml/components/UltrafiltrationButton.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/gui/qml/components/UltrafiltrationButton.qml	(.../UltrafiltrationButton.qml)	(revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/components/UltrafiltrationButton.qml	(.../UltrafiltrationButton.qml)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -6,7 +6,7 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file UltrafiltrationButton.qml
- * \author (last) Behrouz NemaiPour
+ * \author (last) Behrouz NematiPour
  * \date (last) 22-Jun-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 18-May-2020
Index: sources/gui/qml/dialogs/AutoHideInfo.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/gui/qml/dialogs/AutoHideInfo.qml	(.../AutoHideInfo.qml)	(revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/dialogs/AutoHideInfo.qml	(.../AutoHideInfo.qml)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -6,7 +6,7 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file AutoHideInfo.qml
- * \author (last) Behrouz NemaiPour
+ * \author (last) Behrouz NematiPour
  * \date (last) 18-Jun-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 11-Feb-2020
Index: sources/gui/qml/dialogs/PowerOff.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/gui/qml/dialogs/PowerOff.qml	(.../PowerOff.qml)	(revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/dialogs/PowerOff.qml	(.../PowerOff.qml)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -6,7 +6,7 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file PowerOff.qml
- * \author (last) Behrouz NemaiPour
+ * \author (last) Behrouz NematiPour
  * \date (last) 18-Jun-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 18-Oct-2019
Index: sources/gui/qml/pages/ManagerHome.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/gui/qml/pages/ManagerHome.qml	(.../ManagerHome.qml)	(revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/pages/ManagerHome.qml	(.../ManagerHome.qml)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -187,8 +187,8 @@
         y: row(3)
         title: qsTr("  Dlyst O ")
         model: [
-                  vTreatmentUltrafiltration.ultrafiltration_RefUFVol       .toFixed(2) ,
-                  vTreatmentUltrafiltration.ultrafiltration_MeasUFVol      .toFixed(2) ,
+                  vTreatmentUltrafiltration.ultrafiltration_RefUFVol       .toFixed(3) ,
+                  vTreatmentUltrafiltration.ultrafiltration_MeasUFVol      .toFixed(3) ,
                   vTreatmentUltrafiltration.ultrafiltration_RotorSpeed     .toFixed(2) ,
                   vTreatmentUltrafiltration.ultrafiltration_MotorSpeed     .toFixed(2) ,
                   vTreatmentUltrafiltration.ultrafiltration_MotorCtlSpeed  .toFixed(2) ,
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -rb84d1c20f9bad35e1406bbc84cd70bfa8bef810f -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision b84d1c20f9bad35e1406bbc84cd70bfa8bef810f)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml	(.../TreatmentStack.qml)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -41,8 +41,8 @@
     VTreatmentRanges            { id: vTreatmentRanges           }
     VTreatmentAdjustmentSaline  { id: vTreatmentAdjustmentSaline }
     VHDTreatmentStates          { id: vHDTreatmentStates
-        property bool ufPaused  : ufState ===   GuiActions.UF_PAUSED_STATE
-        property bool txPaused  : subMode === ! GuiActions.TREATMENT_DIALYSIS_STATE
+        property bool ufPaused  : ufState === GuiActions.UF_PAUSED_STATE
+        property bool txPaused  : subMode !== GuiActions.TREATMENT_DIALYSIS_STATE
     }
 
     // Components
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml	(.../TreatmentAdjustmentDuration.qml)	(revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml	(.../TreatmentAdjustmentDuration.qml)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -6,7 +6,7 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file TreatmentAdjustmentDuration.qml
- * \author (last) Behrouz NemaiPour
+ * \author (last) Behrouz NematiPour
  * \date (last) 18-Jun-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 27-Apr-2020
Index: sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml	(.../TreatmentPressure.qml)	(revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml	(.../TreatmentPressure.qml)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -6,7 +6,7 @@
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file TreatmentPressure.qml
- * \author (last) Behrouz NemaiPour
+ * \author (last) Behrouz NematiPour
  * \date (last) 10-Jun-2020
  * \author (original) Behrouz NematiPour
  * \date (original) 27-Jan-2020
Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml
===================================================================
diff -u -rb84d1c20f9bad35e1406bbc84cd70bfa8bef810f -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml	(.../TreatmentSaline.qml)	(revision b84d1c20f9bad35e1406bbc84cd70bfa8bef810f)
+++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml	(.../TreatmentSaline.qml)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -41,7 +41,7 @@
     }
 
     isTouchable : ! _root.isDisabled
-    buttonText  :   _root.isDisabled ? _private.textStart : _root.isStarted ? _private.textStop : _private.textStart + " " + _private.textVolumeTarget
+    buttonText  :   _root.isDisabled ? _private.textStart : _root.isStarted ? _private.textStop : _private.textStart
     title       : qsTr("SALINE BOLUS")
     unit        : Variables.unitTextSaline
 
Index: sources/model/MAbstract.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/MAbstract.cpp	(.../MAbstract.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/MAbstract.cpp	(.../MAbstract.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MAbstract.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 04-Jul-2020
  *
  */
Index: sources/model/MAbstract.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/MAbstract.h	(.../MAbstract.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/MAbstract.h	(.../MAbstract.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -24,8 +24,8 @@
 namespace Model {
 
 /*!
- * \page   GeneralModelsDescription General Models Description
- *         The Models are the entities which keep the data and methods to manipulate the data.
+ * \page    GeneralModelsDescription General Models Description
+ *          The Models are the entities which keep the data and methods to manipulate the data.
  *          The UI Application is using different types of models in different situations.
  *          One use case, as the Denali Device is using the Denali Message Protocol over the CANBus for all the messaging transactions
  *          and almost all the Messages carrying data payloads of a model object for each message,
Index: sources/model/MDGDebugText.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/MDGDebugText.cpp	(.../MDGDebugText.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/MDGDebugText.cpp	(.../MDGDebugText.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGDebugText.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 13-Jul-2020
  *
  */
Index: sources/model/MDGDebugText.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/MDGDebugText.h	(.../MDGDebugText.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/MDGDebugText.h	(.../MDGDebugText.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGDebugText.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 13-Jul-2020
  *
  */
Index: sources/model/MHDDebugText.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/MHDDebugText.cpp	(.../MHDDebugText.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/MHDDebugText.cpp	(.../MHDDebugText.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MHDDebugText.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 13-Jul-2020
  *
  */
Index: sources/model/MHDDebugText.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/MHDDebugText.h	(.../MHDDebugText.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/MHDDebugText.h	(.../MHDDebugText.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MHDDebugText.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 13-Jul-2020
  *
  */
Index: sources/model/MModel.h
===================================================================
diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/MModel.h	(.../MModel.h)	(revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac)
+++ sources/model/MModel.h	(.../MModel.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MModel.h
  * \author (last) Peter Lucia
  * \date (last) 15-Oct-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/MPowerOff.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/MPowerOff.cpp	(.../MPowerOff.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/MPowerOff.cpp	(.../MPowerOff.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MPowerOff.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/MPowerOff.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/MPowerOff.h	(.../MPowerOff.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/MPowerOff.h	(.../MPowerOff.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MPowerOff.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/dg/data/MDGDrainPumpData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/dg/data/MDGDrainPumpData.cpp	(.../MDGDrainPumpData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/dg/data/MDGDrainPumpData.cpp	(.../MDGDrainPumpData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGDrainPumpData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/dg/data/MDGDrainPumpData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/dg/data/MDGDrainPumpData.h	(.../MDGDrainPumpData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/dg/data/MDGDrainPumpData.h	(.../MDGDrainPumpData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGDrainPumpData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/dg/data/MDGHeatersData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/dg/data/MDGHeatersData.cpp	(.../MDGHeatersData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/dg/data/MDGHeatersData.cpp	(.../MDGHeatersData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGHeatersData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/dg/data/MDGHeatersData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/dg/data/MDGHeatersData.h	(.../MDGHeatersData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/dg/data/MDGHeatersData.h	(.../MDGHeatersData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGHeatersData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/dg/data/MDGLoadCellReadingsData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/dg/data/MDGLoadCellReadingsData.cpp	(.../MDGLoadCellReadingsData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/dg/data/MDGLoadCellReadingsData.cpp	(.../MDGLoadCellReadingsData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGLoadCellReadingsData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/dg/data/MDGLoadCellReadingsData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/dg/data/MDGLoadCellReadingsData.h	(.../MDGLoadCellReadingsData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/dg/data/MDGLoadCellReadingsData.h	(.../MDGLoadCellReadingsData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGLoadCellReadingsData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/dg/data/MDGOperationModeData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/dg/data/MDGOperationModeData.cpp	(.../MDGOperationModeData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/dg/data/MDGOperationModeData.cpp	(.../MDGOperationModeData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGOperationModeData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/dg/data/MDGOperationModeData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/dg/data/MDGOperationModeData.h	(.../MDGOperationModeData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/dg/data/MDGOperationModeData.h	(.../MDGOperationModeData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGOperationModeData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/dg/data/MDGPressuresData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/dg/data/MDGPressuresData.cpp	(.../MDGPressuresData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/dg/data/MDGPressuresData.cpp	(.../MDGPressuresData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGPressuresData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/dg/data/MDGPressuresData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/dg/data/MDGPressuresData.h	(.../MDGPressuresData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/dg/data/MDGPressuresData.h	(.../MDGPressuresData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGPressuresData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/dg/data/MDGROPumpData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/dg/data/MDGROPumpData.cpp	(.../MDGROPumpData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/dg/data/MDGROPumpData.cpp	(.../MDGROPumpData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGROPumpData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/dg/data/MDGROPumpData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/dg/data/MDGROPumpData.h	(.../MDGROPumpData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/dg/data/MDGROPumpData.h	(.../MDGROPumpData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGROPumpData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/dg/data/MDGReservoirData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/dg/data/MDGReservoirData.cpp	(.../MDGReservoirData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/dg/data/MDGReservoirData.cpp	(.../MDGReservoirData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGReservoirData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/dg/data/MDGReservoirData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/dg/data/MDGReservoirData.h	(.../MDGReservoirData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/dg/data/MDGReservoirData.h	(.../MDGReservoirData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGReservoirData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/dg/data/MDGTemperaturesData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/dg/data/MDGTemperaturesData.cpp	(.../MDGTemperaturesData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/dg/data/MDGTemperaturesData.cpp	(.../MDGTemperaturesData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGTemperaturesData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/dg/data/MDGTemperaturesData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/dg/data/MDGTemperaturesData.h	(.../MDGTemperaturesData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/dg/data/MDGTemperaturesData.h	(.../MDGTemperaturesData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGTemperaturesData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/dg/data/MDGValvesStatesData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/dg/data/MDGValvesStatesData.cpp	(.../MDGValvesStatesData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/dg/data/MDGValvesStatesData.cpp	(.../MDGValvesStatesData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGValvesStatesData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/dg/data/MDGValvesStatesData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/dg/data/MDGValvesStatesData.h	(.../MDGValvesStatesData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/dg/data/MDGValvesStatesData.h	(.../MDGValvesStatesData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MDGValvesStatesData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp	(.../MTreatmentAdjustBloodDialysateResponse.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp	(.../MTreatmentAdjustBloodDialysateResponse.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentAdjustBloodDialysateResponse.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h	(.../MTreatmentAdjustBloodDialysateResponse.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h	(.../MTreatmentAdjustBloodDialysateResponse.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentAdjustBloodDialysateResponse.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp	(.../MTreatmentAdjustDurationResponse.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp	(.../MTreatmentAdjustDurationResponse.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentAdjustDurationResponse.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h	(.../MTreatmentAdjustDurationResponse.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h	(.../MTreatmentAdjustDurationResponse.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentAdjustDurationResponse.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/adjustment/MTreatmentAdjustRequests.h	(.../MTreatmentAdjustRequests.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h	(.../MTreatmentAdjustRequests.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentAdjustRequests.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp	(.../MTreatmentAdjustUltrafiltrationConfirmResponse.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp	(.../MTreatmentAdjustUltrafiltrationConfirmResponse.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentAdjustUltrafiltrationConfirmResponse.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h	(.../MTreatmentAdjustUltrafiltrationConfirmResponse.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h	(.../MTreatmentAdjustUltrafiltrationConfirmResponse.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentAdjustUltrafiltrationConfirmResponse.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp	(.../MTreatmentAdjustUltrafiltrationEditResponse.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp	(.../MTreatmentAdjustUltrafiltrationEditResponse.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentAdjustUltrafiltrationEditResponse.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h	(.../MTreatmentAdjustUltrafiltrationEditResponse.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h	(.../MTreatmentAdjustUltrafiltrationEditResponse.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentAdjustUltrafiltrationEditResponse.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp	(.../MTreatmentAdjustUltrafiltrationStateResponse.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp	(.../MTreatmentAdjustUltrafiltrationStateResponse.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentAdjustUltrafiltrationStateResponse.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h	(.../MTreatmentAdjustUltrafiltrationStateResponse.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h	(.../MTreatmentAdjustUltrafiltrationStateResponse.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentAdjustUltrafiltrationStateResponse.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/alarm/MAlarmCleared.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/alarm/MAlarmCleared.cpp	(.../MAlarmCleared.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/alarm/MAlarmCleared.cpp	(.../MAlarmCleared.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MAlarmCleared.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/alarm/MAlarmCleared.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/alarm/MAlarmCleared.h	(.../MAlarmCleared.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/alarm/MAlarmCleared.h	(.../MAlarmCleared.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MAlarmCleared.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/alarm/MAlarmStatusData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/alarm/MAlarmStatusData.cpp	(.../MAlarmStatusData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/alarm/MAlarmStatusData.cpp	(.../MAlarmStatusData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MAlarmStatusData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/alarm/MAlarmStatusData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/alarm/MAlarmStatusData.h	(.../MAlarmStatusData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/alarm/MAlarmStatusData.h	(.../MAlarmStatusData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MAlarmStatusData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/alarm/MAlarmTriggered.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/alarm/MAlarmTriggered.cpp	(.../MAlarmTriggered.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/alarm/MAlarmTriggered.cpp	(.../MAlarmTriggered.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MAlarmTriggered.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/alarm/MAlarmTriggered.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/alarm/MAlarmTriggered.h	(.../MAlarmTriggered.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/alarm/MAlarmTriggered.h	(.../MAlarmTriggered.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MAlarmTriggered.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/data/MHDOperationModeData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/data/MHDOperationModeData.cpp	(.../MHDOperationModeData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/data/MHDOperationModeData.cpp	(.../MHDOperationModeData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MHDOperationModeData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/data/MHDOperationModeData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/data/MHDOperationModeData.h	(.../MHDOperationModeData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/data/MHDOperationModeData.h	(.../MHDOperationModeData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MHDOperationModeData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/data/MTreatmentFlowsData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/data/MTreatmentFlowsData.cpp	(.../MTreatmentFlowsData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/data/MTreatmentFlowsData.cpp	(.../MTreatmentFlowsData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentFlowsData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/data/MTreatmentFlowsData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/data/MTreatmentFlowsData.h	(.../MTreatmentFlowsData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/data/MTreatmentFlowsData.h	(.../MTreatmentFlowsData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentFlowsData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/data/MTreatmentOutletFlowData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/data/MTreatmentOutletFlowData.cpp	(.../MTreatmentOutletFlowData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/data/MTreatmentOutletFlowData.cpp	(.../MTreatmentOutletFlowData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentOutletFlowData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/data/MTreatmentOutletFlowData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/data/MTreatmentOutletFlowData.h	(.../MTreatmentOutletFlowData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/data/MTreatmentOutletFlowData.h	(.../MTreatmentOutletFlowData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentOutletFlowData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/data/MTreatmentPressureOcclusionData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/data/MTreatmentPressureOcclusionData.cpp	(.../MTreatmentPressureOcclusionData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/data/MTreatmentPressureOcclusionData.cpp	(.../MTreatmentPressureOcclusionData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentPressureOcclusionData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/data/MTreatmentPressureOcclusionData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/data/MTreatmentPressureOcclusionData.h	(.../MTreatmentPressureOcclusionData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/data/MTreatmentPressureOcclusionData.h	(.../MTreatmentPressureOcclusionData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentPressureOcclusionData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/data/MTreatmentRangesData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/data/MTreatmentRangesData.cpp	(.../MTreatmentRangesData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/data/MTreatmentRangesData.cpp	(.../MTreatmentRangesData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentRangesData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/data/MTreatmentRangesData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/data/MTreatmentRangesData.h	(.../MTreatmentRangesData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/data/MTreatmentRangesData.h	(.../MTreatmentRangesData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentRangesData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/data/MTreatmentStatesData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/data/MTreatmentStatesData.cpp	(.../MTreatmentStatesData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/data/MTreatmentStatesData.cpp	(.../MTreatmentStatesData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentStatesData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/data/MTreatmentStatesData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/data/MTreatmentStatesData.h	(.../MTreatmentStatesData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/data/MTreatmentStatesData.h	(.../MTreatmentStatesData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentStatesData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/data/MTreatmentTimeData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/data/MTreatmentTimeData.cpp	(.../MTreatmentTimeData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/data/MTreatmentTimeData.cpp	(.../MTreatmentTimeData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentTimeData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/model/hd/data/MTreatmentTimeData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/model/hd/data/MTreatmentTimeData.h	(.../MTreatmentTimeData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/model/hd/data/MTreatmentTimeData.h	(.../MTreatmentTimeData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file MTreatmentTimeData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 25-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/storage/DriveWatcher.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/storage/DriveWatcher.cpp	(.../DriveWatcher.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/storage/DriveWatcher.cpp	(.../DriveWatcher.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file DriveWatcher.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 17-Jul-2020
  *
  */
Index: sources/storage/DriveWatcher.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/storage/DriveWatcher.h	(.../DriveWatcher.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/storage/DriveWatcher.h	(.../DriveWatcher.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file DriveWatcher.h
  * \author (last) Behrouz NematiPour
  * \date (last) 12-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 17-Jul-2020
  *
  */
Index: sources/view/VEventSpy.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/VEventSpy.cpp	(.../VEventSpy.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/VEventSpy.cpp	(.../VEventSpy.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -22,6 +22,7 @@
 #include "GuiGlobals.h"
 #include "Logger.h"
 
+// #define SPY_MOUSE_EVENT
 using namespace View;
 
 VEventSpy::VEventSpy(QObject *)
@@ -74,15 +75,22 @@
 }
 
 /*!
- * \brief VEventSpy::mouseEventSpy
+ * \brief   VEventSpy::mouseEventSpy
  * \details Mouse event spy
- * \param vEvent    - mouse event
- * \param typeName  - mouse button type name
+ *          if needs to spy on the mouse events
+ *          (which is happening on the desktop only since there is not mouse attached to the device)
+ *          Remove comment of the #define SPY_MOUSE_EVENT
+ * \param   vEvent    - mouse event
+ * \param   vTypeName - mouse button type name
  */
 // coco begin validated: this code has been manually tested.
 // the only intention of this code is to be used for EMC testing and has been tested and is working fine.
-void VEventSpy::mouseEventSpy(QEvent *vEvent, const QString &typeName)
+void VEventSpy::mouseEventSpy(QEvent *vEvent, const QString &vTypeName)
 {
+#ifndef SPY_MOUSE_EVENT
+    Q_UNUSED(vEvent)
+    Q_UNUSED(vTypeName)
+#else
     QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(vEvent);
     int x = mouseEvent->x();
     int y = mouseEvent->y();
@@ -110,10 +118,11 @@
     default                 :            break;
     }
 
-    LOG_DEBUG( btn + typeName + mdf +
+    LOG_DEBUG( btn + vTypeName + mdf +
                QString(",%1,%2")
                .arg(x, 4, 10, QChar('0'))
                .arg(y, 4, 10, QChar('0')));
+#endif
 }
 // coco end
 
@@ -129,7 +138,7 @@
 /*!
  * \brief VEventSpy::touchEventSpy
  * \param vEvent    - touch event
- * \param typeName  - The type of the QEvent which has been shortened e.g. tB: TouchBegin
+ * \param vTypeName - The type of the QEvent which has been shortened e.g. tB: TouchBegin
  */
 // coco begin validated: this code has been manually tested.
 // the only intention of this code is to be used for EMC testing and has been tested and is working fine.
Index: sources/view/dg/data/VDGDrainPumpData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/dg/data/VDGDrainPumpData.cpp	(.../VDGDrainPumpData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/dg/data/VDGDrainPumpData.cpp	(.../VDGDrainPumpData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file VDGDrainPumpData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/view/dg/data/VDGDrainPumpData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/dg/data/VDGDrainPumpData.h	(.../VDGDrainPumpData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/dg/data/VDGDrainPumpData.h	(.../VDGDrainPumpData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file VDGDrainPumpData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/view/dg/data/VDGHeatersData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/dg/data/VDGHeatersData.cpp	(.../VDGHeatersData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/dg/data/VDGHeatersData.cpp	(.../VDGHeatersData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file VDGHeatersData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/view/dg/data/VDGHeatersData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/dg/data/VDGHeatersData.h	(.../VDGHeatersData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/dg/data/VDGHeatersData.h	(.../VDGHeatersData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file VDGHeatersData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/view/dg/data/VDGLoadCellReadingsData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/dg/data/VDGLoadCellReadingsData.cpp	(.../VDGLoadCellReadingsData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/dg/data/VDGLoadCellReadingsData.cpp	(.../VDGLoadCellReadingsData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file VDGLoadCellReadingsData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/view/dg/data/VDGLoadCellReadingsData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/dg/data/VDGLoadCellReadingsData.h	(.../VDGLoadCellReadingsData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/dg/data/VDGLoadCellReadingsData.h	(.../VDGLoadCellReadingsData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file VDGLoadCellReadingsData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/view/dg/data/VDGOperationModeData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/dg/data/VDGOperationModeData.cpp	(.../VDGOperationModeData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/dg/data/VDGOperationModeData.cpp	(.../VDGOperationModeData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file VDGOperationModeData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/view/dg/data/VDGOperationModeData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/dg/data/VDGOperationModeData.h	(.../VDGOperationModeData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/dg/data/VDGOperationModeData.h	(.../VDGOperationModeData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file VDGOperationModeData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/view/dg/data/VDGPressuresData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/dg/data/VDGPressuresData.cpp	(.../VDGPressuresData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/dg/data/VDGPressuresData.cpp	(.../VDGPressuresData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file VDGPressuresData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/view/dg/data/VDGPressuresData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/dg/data/VDGPressuresData.h	(.../VDGPressuresData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/dg/data/VDGPressuresData.h	(.../VDGPressuresData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file VDGPressuresData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/view/dg/data/VDGROPumpData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/dg/data/VDGROPumpData.cpp	(.../VDGROPumpData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/dg/data/VDGROPumpData.cpp	(.../VDGROPumpData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file VDGROPumpData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/view/dg/data/VDGROPumpData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/dg/data/VDGROPumpData.h	(.../VDGROPumpData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/dg/data/VDGROPumpData.h	(.../VDGROPumpData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file VDGROPumpData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/view/dg/data/VDGReservoirData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/dg/data/VDGReservoirData.cpp	(.../VDGReservoirData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/dg/data/VDGReservoirData.cpp	(.../VDGReservoirData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file VDGReservoirData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/view/dg/data/VDGReservoirData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/dg/data/VDGReservoirData.h	(.../VDGReservoirData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/dg/data/VDGReservoirData.h	(.../VDGReservoirData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file VDGReservoirData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/view/dg/data/VDGTemperaturesData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/dg/data/VDGTemperaturesData.cpp	(.../VDGTemperaturesData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/dg/data/VDGTemperaturesData.cpp	(.../VDGTemperaturesData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file VDGTemperaturesData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/view/dg/data/VDGTemperaturesData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/dg/data/VDGTemperaturesData.h	(.../VDGTemperaturesData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/dg/data/VDGTemperaturesData.h	(.../VDGTemperaturesData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file VDGTemperaturesData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/view/dg/data/VDGValvesStatesData.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/dg/data/VDGValvesStatesData.cpp	(.../VDGValvesStatesData.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/dg/data/VDGValvesStatesData.cpp	(.../VDGValvesStatesData.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file VDGValvesStatesData.cpp
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/view/dg/data/VDGValvesStatesData.h
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/dg/data/VDGValvesStatesData.h	(.../VDGValvesStatesData.h)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/dg/data/VDGValvesStatesData.h	(.../VDGValvesStatesData.h)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -8,7 +8,7 @@
  * \file VDGValvesStatesData.h
  * \author (last) Behrouz NematiPour
  * \date (last) 08-Sep-2020
- * \author (original) Behrouz NemaiPour
+ * \author (original) Behrouz NematiPour
  * \date (original) 02-Jul-2020
  *
  */
Index: sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp	(.../VTreatmentAdjustmentResponseBase.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp	(.../VTreatmentAdjustmentResponseBase.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -45,7 +45,7 @@
 
 /*!
  * \brief   View::VTreatmentAdjustmentResponseBase::text
- * \details The slot to ge the Reason Description
+ * \details The slot to get the Reason Description
  * \return  Reason description as string
  */
 QString View::VTreatmentAdjustmentResponseBase::text()
Index: sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp	(.../VTreatmentAdjustmentSaline.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp	(.../VTreatmentAdjustmentSaline.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -51,8 +51,8 @@
  */
 void VTreatmentAdjustmentSaline::onActionReceive(const TreatmentStatesData &vData)
 {
-    isStarted ( vData.mSalineState == GuiSalineStates::SALINE_START_STATE   );
-    isDisabled( vData.mSalineState == GuiSalineStates::SALINE_DISABLE_STATE );
+    isStarted ( vData.mSalineState == GuiSalineStates::SALINE_BOLUS_STATE_IN_PROGRESS   );
+    isDisabled( vData.mSalineState == GuiSalineStates::SALINE_BOLUS_STATE_MAX_DELIVERED );
 }
 
 /*!
Index: sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rfef971047be21dd255a497fbf54c170316d617a9
--- sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp	(.../VTreatmentAdjustmentUltrafiltrationState.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp	(.../VTreatmentAdjustmentUltrafiltrationState.cpp)	(revision fef971047be21dd255a497fbf54c170316d617a9)
@@ -44,7 +44,7 @@
 void View::VTreatmentAdjustmentUltrafiltrationState::doPause()
 {
     _data.requestedState = AdjustUltrafiltrationStateRequestData::ePaused;
-    emit didAdjustment(_data);
+    emit didAdjustment(_data); // notify the controllers to do the adjustment
 }
 
 /*!
@@ -54,7 +54,7 @@
 void View::VTreatmentAdjustmentUltrafiltrationState::doResume()
 {
     _data.requestedState = AdjustUltrafiltrationStateRequestData::eRunning;
-    emit didAdjustment(_data);
+    emit didAdjustment(_data); // notify the controllers to do the adjustment
 }
 
 /*!