Index: denali.pro
===================================================================
diff -u -r53134008481fd775533e8988b7436f2f75e47336 -r7c895d9b6c198a48ab75ac2090b0a61d99bbd1ab
--- denali.pro	(.../denali.pro)	(revision 53134008481fd775533e8988b7436f2f75e47336)
+++ denali.pro	(.../denali.pro)	(revision 7c895d9b6c198a48ab75ac2090b0a61d99bbd1ab)
@@ -52,14 +52,6 @@
     common/MsgDefs.h \
     \ # Main
     sources/main.h \
-    sources/model/MEndTreatmentResponse.h \
-    sources/model/MStartTreatmentResponse.h \
-    sources/model/hd/data/MPrimingData.h \
-    sources/model/MTreatmentParametersResp.h \
-    sources/storage/FileSaver.h \
-    sources/model/MDGDebugText.h \
-    sources/model/MHDDebugText.h \
-    sources/storage/DriveWatcher.h \
     sources/Threads.h \
     sources/MainTimer.h \
     sources/ApplicationPost.h \
@@ -69,6 +61,11 @@
     sources/model/MModel.h \
     sources/model/MAbstract.h \
     sources/model/MPowerOff.h \
+    sources/model/MEndTreatmentResponse.h \
+    sources/model/MStartTreatmentResponse.h \
+    sources/model/MTreatmentParametersResp.h \
+    sources/model/MDGDebugText.h \
+    sources/model/MHDDebugText.h \
     \ # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmCleared.h \
     sources/model/hd/alarm/MAlarmTriggered.h \
@@ -90,6 +87,7 @@
     sources/model/hd/data/MTreatmentStatesData.h \
     sources/model/hd/data/MHDOperationModeData.h \
     sources/model/hd/data/MTreatmentSalineData.h \
+    sources/model/hd/data/MPrimingData.h \
     \ # ---------- Models - DG - Data
     sources/model/dg/data/MDGDrainPumpData.h \
     sources/model/dg/data/MDGHeatersData.h \
@@ -155,6 +153,8 @@
     sources/storage/StorageGlobals.h \
     sources/storage/Logger.h \
     sources/storage/FileHandler.h \
+    sources/storage/FileSaver.h \
+    sources/storage/DriveWatcher.h \
     \ # Utility
     sources/utility/crc.h \
     sources/utility/format.h \
@@ -167,10 +167,6 @@
     \ # common
     \ # Main
     main.cpp \
-    sources/model/MEndTreatmentResponse.cpp \
-    sources/model/MStartTreatmentResponse.cpp \
-    sources/model/hd/data/MPrimingData.cpp \
-    sources/model/MTreatmentParametersResp.cpp \
     sources/Threads.cpp \
     sources/MainTimer.cpp \
     sources/ApplicationPost.cpp \
@@ -180,6 +176,10 @@
     sources/model/MAbstract.cpp \
     sources/model/MPowerOff.cpp \
     sources/model/MHDDebugText.cpp \
+    sources/model/MEndTreatmentResponse.cpp \
+    sources/model/MStartTreatmentResponse.cpp \
+    sources/model/MTreatmentParametersResp.cpp \
+    sources/model/MDGDebugText.cpp \
     \ # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmCleared.cpp \
     sources/model/hd/alarm/MAlarmTriggered.cpp \
@@ -200,8 +200,8 @@
     sources/model/hd/data/MTreatmentStatesData.cpp \
     sources/model/hd/data/MHDOperationModeData.cpp \
     sources/model/hd/data/MTreatmentSalineData.cpp \
+    sources/model/hd/data/MPrimingData.cpp \
     \ # ---------- Models - DG - Data
-    sources/model/MDGDebugText.cpp \
     sources/model/dg/data/MDGDrainPumpData.cpp \
     sources/model/dg/data/MDGHeatersData.cpp \
     sources/model/dg/data/MDGLoadCellReadingsData.cpp \
Index: denali.pro.user
===================================================================
diff -u -r9e234daa89b49df33be6faeaa597e6592526b539 -r7c895d9b6c198a48ab75ac2090b0a61d99bbd1ab
--- denali.pro.user	(.../denali.pro.user)	(revision 9e234daa89b49df33be6faeaa597e6592526b539)
+++ denali.pro.user	(.../denali.pro.user)	(revision 7c895d9b6c198a48ab75ac2090b0a61d99bbd1ab)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2020-11-02T08:53:04. -->
+<!-- Written by QtCreator 4.10.0, 2020-11-03T16:15:17. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -89,7 +89,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.12.5 GCC 64bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.12.5 GCC 64bit</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5125.gcc_64_kit</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">9</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -1185,7 +1185,7 @@
     <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
     <value type="QString" key="RunConfiguration.WorkingDirectory"></value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/denali/Projects/tmp/build/unittest/tst_views</value>
+    <value type="QString" key="RunConfiguration.WorkingDirectory.default">/home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Release</value>
    </valuemap>
    <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
   </valuemap>
Index: sources/model/MEndTreatmentResponse.h
===================================================================
diff -u -r53134008481fd775533e8988b7436f2f75e47336 -r7c895d9b6c198a48ab75ac2090b0a61d99bbd1ab
--- sources/model/MEndTreatmentResponse.h	(.../MEndTreatmentResponse.h)	(revision 53134008481fd775533e8988b7436f2f75e47336)
+++ sources/model/MEndTreatmentResponse.h	(.../MEndTreatmentResponse.h)	(revision 7c895d9b6c198a48ab75ac2090b0a61d99bbd1ab)
@@ -41,11 +41,8 @@
     bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr)       override;
     Data    data            (                                                       ) const         ;
 };
-
 }
 
 typedef Model::MEndTreatmentResponse::Data EndTreatmentResponseData;
 
-
-
 #endif // MENDTREATMENTRESPONSE_H
Index: sources/model/MStartTreatmentResponse.h
===================================================================
diff -u -r074b32b5cc08f41f2d9ce0d021f2151b76bba5ad -r7c895d9b6c198a48ab75ac2090b0a61d99bbd1ab
--- sources/model/MStartTreatmentResponse.h	(.../MStartTreatmentResponse.h)	(revision 074b32b5cc08f41f2d9ce0d021f2151b76bba5ad)
+++ sources/model/MStartTreatmentResponse.h	(.../MStartTreatmentResponse.h)	(revision 7c895d9b6c198a48ab75ac2090b0a61d99bbd1ab)
@@ -43,10 +43,8 @@
     bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr)       override;
     Data    data            (                                                       ) const         ;
 };
-
 }
 
 typedef Model::MStartTreatmentResponse::Data StartTreatmentResponseData;
 
-
 #endif // MSTARTTREATMENTRESPONSE_H
Index: sources/model/hd/data/MPrimingData.h
===================================================================
diff -u -rd9f8e4e8356bd081f84dc08c4d65d727c0ee707f -r7c895d9b6c198a48ab75ac2090b0a61d99bbd1ab
--- sources/model/hd/data/MPrimingData.h	(.../MPrimingData.h)	(revision d9f8e4e8356bd081f84dc08c4d65d727c0ee707f)
+++ sources/model/hd/data/MPrimingData.h	(.../MPrimingData.h)	(revision 7c895d9b6c198a48ab75ac2090b0a61d99bbd1ab)
@@ -39,10 +39,8 @@
     bool    fromByteArray   (const QByteArray   &vByteArray  , int *vIndex = nullptr)       override;
     Data    data            (                                                       ) const         ;
 };
-
 }
 
 typedef Model::MPrimingData::Data PrimingData;
 
-
 #endif // MPRIMINGDATA_H
Index: sources/view/hd/alarm/VAlarmStatus.h
===================================================================
diff -u -r53134008481fd775533e8988b7436f2f75e47336 -r7c895d9b6c198a48ab75ac2090b0a61d99bbd1ab
--- sources/view/hd/alarm/VAlarmStatus.h	(.../VAlarmStatus.h)	(revision 53134008481fd775533e8988b7436f2f75e47336)
+++ sources/view/hd/alarm/VAlarmStatus.h	(.../VAlarmStatus.h)	(revision 7c895d9b6c198a48ab75ac2090b0a61d99bbd1ab)
@@ -70,13 +70,9 @@
     PROPERTY( bool    , alarm_Flag_UserAcknowledged , false)
     PROPERTY( bool    , minimizeAlarm               , false)
     // coco end
-
-
     Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged)
     Q_PROPERTY(QString id READ id NOTIFY alarm_AlarmIDChanged)
 
-
-
 signals:
     void raiseAlarm();
     void noAlarm();