Index: sources/view/hd/data/VTreatmentRanges.h
===================================================================
diff -u -r5db87178d372acd2cc4e5d75bf99f4c0cb11f1f2 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/view/hd/data/VTreatmentRanges.h	(.../VTreatmentRanges.h)	(revision 5db87178d372acd2cc4e5d75bf99f4c0cb11f1f2)
+++ sources/view/hd/data/VTreatmentRanges.h	(.../VTreatmentRanges.h)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved.
  * \copyright
  * 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 VTreatmentRanges.h
- * \author (last) Behrouz NematiPour
- * \date (last) 07-May-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 31-Mar-2020
+ * \file    VTreatmentRanges.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      06-Aug-2023
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  26-Aug-2020
  *
  */
 #pragma once
@@ -18,10 +18,10 @@
 #include <QObject>
 
 // Project
-#include "main.h" // Doxygen : don't remove
-#include "MModel.h"
+#include "main.h" // Doxygen : do not remove
 #include "VView.h"
-
+#include "MTreatmentRangesData.h"
+#include "MSettings.h"
 // namespace
 namespace View {
 
@@ -36,13 +36,44 @@
 {
     Q_OBJECT
 
-    PROPERTY( quint32, treatmentRanges_Duration_Min              , 0)
-    PROPERTY( quint32, treatmentRanges_Duration_Max              , 0)
-    PROPERTY( float  , treatmentRanges_Ultrafiltration_Volume_Min, 0)
-    PROPERTY( float  , treatmentRanges_Ultrafiltration_Volume_Max, 0)
-    PROPERTY( quint32, treatmentRanges_Dialysate_Flow_Min        , 0)
-    PROPERTY( quint32, treatmentRanges_Dialysate_Flow_Max        , 0)
+    // Real-time properties received from HD
+    READONLY( quint32       , treatmentRanges_Duration_Min                  , 0)
+    READONLY( quint32       , treatmentRanges_Duration_Max                  , 0)
+    READONLY( float         , treatmentRanges_Ultrafiltration_Volume_Min    , 0)
+    READONLY( float         , treatmentRanges_Ultrafiltration_Volume_Max    , 0)
+    READONLY( quint32       , treatmentRanges_Dialysate_Flow_Min            , 0)
+    READONLY( quint32       , treatmentRanges_Dialysate_Flow_Max            , 0)
 
-    VIEW_DEC(VTreatmentRanges, TreatmentRangesData)
+    // constant properties coming from the settings
+    RANGESET( quint32       , bloodFlowRate                                 , 0)
+    RANGESET( quint32       , dialysateFlowRate                             , 0)
+    RANGESET( quint32       , treatmentDuration                             , 0)
+    RANGESET( float         , heparinDispensingRate                         , 0)
+    RANGESET( float         , heparinBolusVolume                            , 0)
+    RANGESET( quint32       , heparinStopTime                               , 0)
+    RANGESET( quint32       , salineBolusVolume                             , 0)
+
+    READONLY( QStringList   , heparinTypeOptions                            ,{})
+    READONLY( QStringList   , acidConcentrateOptions                        ,{})
+    READONLY( QStringList   , bicarbonateConcentrateOptions                 ,{})
+    READONLY( QStringList   , dialyzerTypeOptions                           ,{})
+
+    RANGESET( float         , dialysateTemp                                 , 0)
+    RANGESET( qint32        , arterialPressureLimitWindow                   , 0)
+    RANGESET( qint32        , venousPressureLimitWindow                     , 0)
+    RANGESET( qint32        , venousPressureLimitAsymtrc                    , 0)
+    RANGESET( quint32       , bloodPressureMeasureInterval                  , 0)
+    RANGESET( quint32       , rinsebackFlowRate                             , 0)
+
+    // monitoring ranges
+    RANGESET( qint32        , arterialPressureMonitor                       , 0)
+    RANGESET( qint32        , venousPressureMonitor                         , 0)
+
+    VIEW_DEC_CLASS(VTreatmentRanges                 )
+    VIEW_DEC_SLOT(TreatmentRangesData               )
+    VIEW_DEC_SLOT(SettingsData                      )
+
+signals:
+    void didTreatmentRangesDone(bool vPass);
 };
 }