Index: sources/view/VView.h
===================================================================
diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4
--- sources/view/VView.h	(.../VView.h)	(revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16)
+++ sources/view/VView.h	(.../VView.h)	(revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4)
@@ -5,11 +5,11 @@
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  * 
- * \file vview.h
- * \author (last) Behrouz NematiPour
- * \date (last) 13-Aug-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 10-Mar-2020
+ * \file    vview.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      01-Mar-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  10-Mar-2020
  * 
  */
 #pragma once
@@ -88,7 +88,7 @@
     VIEW_DEC_CLASS(vCLASS)                          \
     VIEW_DEC_SLOT(vDATATYPE)                        \
 //--------------------------------------------------------------------------------//
-#define VIEW_DEF_CLASS_ADJUSTMENT(vCLASS, vDATATYPE)                                \
+#define VIEW_DEF_CLASS_ADJUSTMENT(vCLASS)                                           \
     using namespace View;                                                           \
     vCLASS::vCLASS(QObject *parent) : VTreatmentAdjustmentResponseBase(parent) {    \
         initConnections();                                                          \
@@ -102,9 +102,15 @@
 #define REGISTER_VIEW_TYPES                                       \
     using namespace View;                                         \
                                                                   \
+    REGISTER_TYPE( VSettings                                    ) \
+                                                                  \
     REGISTER_TYPE( VAlarmStatus                                 ) \
     REGISTER_TYPE( VPowerOff                                    ) \
-                                                                  \
+    /* Data - States */                                           \
+    REGISTER_TYPE( VHDOperationMode                             ) \
+    REGISTER_TYPE( VPreTreatmentStates                          ) \
+    REGISTER_TYPE( VHDTreatmentStates                           ) \
+    /* In-Treatment - Data */                                     \
     REGISTER_TYPE( VTreatmentBloodFlow                          ) \
     REGISTER_TYPE( VTreatmentDialysateFlow                      ) \
     REGISTER_TYPE( VTreatmentUltrafiltration                    ) \
@@ -113,13 +119,13 @@
     REGISTER_TYPE( VTreatmentRanges                             ) \
     REGISTER_TYPE( VTreatmentSaline                             ) \
     REGISTER_TYPE( VTreatmentHeparin                            ) \
+    /* Post-Treatment */                                          \
     REGISTER_TYPE( VTreatmentRinseback                          ) \
     REGISTER_TYPE( VTreatmentRecirculate                        ) \
     REGISTER_TYPE( VTreatmentBloodPrime                         ) \
-    REGISTER_TYPE( VHDOperationMode                             ) \
-    REGISTER_TYPE( VHDTreatmentStates                           ) \
+    /* Device - Data */                                           \
     REGISTER_TYPE( VHDAccelerometer                             ) \
-                                                                  \
+    /* DG - Data */                                               \
     REGISTER_TYPE( VDGDrainPump                                 ) \
     REGISTER_TYPE( VDGHeaters                                   ) \
     REGISTER_TYPE( VDGLoadCellReadings                          ) \
@@ -130,10 +136,23 @@
     REGISTER_TYPE( VDGTemperatures                              ) \
     REGISTER_TYPE( VDGValvesStates                              ) \
     REGISTER_TYPE( VDGAccelerometer                             ) \
-                                                                  \
+    /* Pre-Treatment */                                           \
+    REGISTER_TYPE( VPreTreatmentAdjustmentInitTreatment         ) \
+    REGISTER_TYPE( VDGFilterFlush                               ) \
+    REGISTER_TYPE( VPreTreatmentAdjustmentWaterSample           ) \
+    REGISTER_TYPE( VPreTreatmentAdjustmentConsumablesConfirm    ) \
+    REGISTER_TYPE( VPreTreatmentSelfTestNoCartridge             ) \
+    REGISTER_TYPE( VPreTreatmentAdjustmentDisposablesConfirm    ) \
+    REGISTER_TYPE( VPreTreatmentSelfTestDry                     ) \
+    REGISTER_TYPE( VPreTreatmentAdjustmentDisposablesPrime      ) \
+    REGISTER_TYPE( VPreTreatmentDisposablesPrime                ) \
+    REGISTER_TYPE( VPreTreatmentAdjustmentPatientConnectionBegin) \
+    REGISTER_TYPE( VPreTreatmentAdjustmentUltrafiltrationInit   ) \
+    REGISTER_TYPE( VPreTreatmentAdjustmentPatientConnectionConfirm  ) \
+    REGISTER_TYPE( VPreTreatmentAdjustmentStartTreatment        ) \
+    /* In-Treatment */                                            \
     REGISTER_TYPE( VTreatmentAdjustmentDuration                 ) \
     REGISTER_TYPE( VTreatmentAdjustmentFlows                    ) \
-    REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationInit      ) \
     REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationState     ) \
     REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationEdit      ) \
     REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationConfirm   ) \
@@ -144,8 +163,6 @@
     REGISTER_TYPE( VTreatmentAdjustmentEnd                      ) \
     REGISTER_TYPE( VTreatmentAdjustmentPressuresLimits          ) \
     REGISTER_TYPE( VTreatmentCreate                             ) \
-    REGISTER_TYPE( VPriming                                     ) \
-    REGISTER_TYPE( VTreatmentBegin                              ) \
     REGISTER_TYPE( VTreatmentAdjustmentVersions                 ) \
 
 //--------------------------------------------------------------------------------//