Index: sources/view/hd/data/VHDTreatmentStatesData.cpp
===================================================================
diff -u -r3345651cca9723989785801ee25001dc3e4f28a1 -r58014dae52ee6357e88b9b03bcad457ddcb432e8
--- sources/view/hd/data/VHDTreatmentStatesData.cpp	(.../VHDTreatmentStatesData.cpp)	(revision 3345651cca9723989785801ee25001dc3e4f28a1)
+++ sources/view/hd/data/VHDTreatmentStatesData.cpp	(.../VHDTreatmentStatesData.cpp)	(revision 58014dae52ee6357e88b9b03bcad457ddcb432e8)
@@ -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 VHDTreatmentStatesData.cpp
- * \author (last) Behrouz NematiPour
- * \date (last) 08-Sep-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 13-Aug-2020
+ * \file    VHDTreatmentStatesData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      07-Feb-2021
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  13-Aug-2020
  *
  */
 #include "VHDTreatmentStatesData.h"
@@ -31,6 +31,10 @@
  */
 void VHDTreatmentStates::initConnections() {
     ACTION_VIEW_CONNECTION(TreatmentStatesData                      );
+    // these messages sending the same states as in message 15 (TreatmentStates above)
+    // it's redundant and with a better messaging protocol one must be removed
+    // perhaps the one in the Adjustment messages since it is not sent on each state change
+    // and will be sent only once to the request.
     ACTION_VIEW_CONNECTION(AdjustUltrafiltrationStateResponseData   );
     ACTION_VIEW_CONNECTION(AdjustSalineResponseData                 );
     ACTION_VIEW_CONNECTION(AdjustHeparinResponseData                );
@@ -48,41 +52,65 @@
     salineState             ( vData.mSalineState );
 
     // Ultrafiltration states
-    ufStart                 ( vData.mUFState        == GuiUFStates         ::UF_START_STATE                            );
-    ufPaused                ( vData.mUFState        == GuiUFStates         ::UF_PAUSED_STATE                           );
-    ufRunning               ( vData.mUFState        == GuiUFStates         ::UF_RUNNING_STATE                          );
-    ufOff                   ( vData.mUFState        == GuiUFStates         ::UF_OFF_STATE                              );
-    ufCompleted             ( vData.mUFState        == GuiUFStates         ::UF_COMPLETED_STATE                        );
+    ufStart                 ( vData.mUFState            == GuiUFStates         ::UF_START_STATE                             );
+    ufPaused                ( vData.mUFState            == GuiUFStates         ::UF_PAUSED_STATE                            );
+    ufRunning               ( vData.mUFState            == GuiUFStates         ::UF_RUNNING_STATE                           );
+    ufOff                   ( vData.mUFState            == GuiUFStates         ::UF_OFF_STATE                               );
+    ufCompleted             ( vData.mUFState            == GuiUFStates         ::UF_COMPLETED_STATE                         );
 
     // Saline Bolus states
-    sbIdle                  ( vData.mSalineState    == GuiSalineStates     ::SALINE_BOLUS_STATE_IDLE                   );
-    sbWaitPump              ( vData.mSalineState    == GuiSalineStates     ::SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP    );
-    sbRunning               ( vData.mSalineState    == GuiSalineStates     ::SALINE_BOLUS_STATE_IN_PROGRESS            );
-    sbMaxReached            ( vData.mSalineState    == GuiSalineStates     ::SALINE_BOLUS_STATE_MAX_DELIVERED          );
+    sbIdle                  ( vData.mSalineState        == GuiSalineStates     ::SALINE_BOLUS_STATE_IDLE                    );
+    sbWaitPump              ( vData.mSalineState        == GuiSalineStates     ::SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP     );
+    sbRunning               ( vData.mSalineState        == GuiSalineStates     ::SALINE_BOLUS_STATE_IN_PROGRESS             );
+    sbMaxReached            ( vData.mSalineState        == GuiSalineStates     ::SALINE_BOLUS_STATE_MAX_DELIVERED           );
 
     // Heparin States
-    hpOff                   ( vData.mHeparinState   == GuiHeparinStates    ::HEPARIN_STATE_OFF                         );
-    hpPaused                ( vData.mHeparinState   == GuiHeparinStates    ::HEPARIN_STATE_PAUSED                      );
-    hpInitial_bolus         ( vData.mHeparinState   == GuiHeparinStates    ::HEPARIN_STATE_INITIAL_BOLUS               );
-    hpDispensing            ( vData.mHeparinState   == GuiHeparinStates    ::HEPARIN_STATE_DISPENSING                  );
-    hpCompleted             ( vData.mHeparinState   == GuiHeparinStates    ::HEPARIN_STATE_COMPLETED                   );
-    hpEmpty                 ( vData.mHeparinState   == GuiHeparinStates    ::HEPARIN_STATE_EMPTY                       );
+    hpOff                   ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_OFF                          );
+    hpPaused                ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_PAUSED                       );
+    hpInitial_bolus         ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_INITIAL_BOLUS                );
+    hpDispensing            ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_DISPENSING                   );
+    hpCompleted             ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_COMPLETED                    );
+    hpEmpty                 ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_EMPTY                        );
 
     // Treatment states
     // Treatment states - Basics
-    txStart                 ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_START_STATE                     );
-    txStop                  ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_STOP_STATE                      );
-    txEnd                   ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_END_STATE                       );
+    txStart                 ( vData.mSubMode            == GuiTreatmentStates  ::TREATMENT_START_STATE                      );
+    txStop                  ( vData.mSubMode            == GuiTreatmentStates  ::TREATMENT_STOP_STATE                       );
+    txEnd                   ( vData.mSubMode            == GuiTreatmentStates  ::TREATMENT_END_STATE                        );
 
     // Treatment states - Dialysis
-    txDialysisRunning       ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_DIALYSIS_STATE                  );
-    txDialysisEnd           ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_DIALYSIS_END_STATE              );
+    txDialysisRunning       ( vData.mSubMode            == GuiTreatmentStates  ::TREATMENT_DIALYSIS_STATE                   );
+    txDialysisEnd           ( vData.mSubMode            == GuiTreatmentStates  ::TREATMENT_DIALYSIS_END_STATE               );
 
-    // Treatment states - Rinse back
-    txRinseback             ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_RINSEBACK_STATE                 );
+    // NOTE: For Rinseback and Recirculate
+    // 1 - it seems we may never need the txRinseback
+    // since in the Rinseback state parameter of the Treatment State the first state of each has the same meaning
+    // it may only be used to know when those parameter has valid values to update the properties.
+    // Kept for now because cannot be sure that it will change later or not.
+    // 2 - if there could be a way to export enums to qml and qml can raise an error if an incorrect enum used,
+    // then it would is absolutely preferred to use enum instead of properties
+    // currently if just one property being defined/used to send the current state to the qml, there is no way to make sure if incorrect/undefined
+    // enum is used or not.
+    // in Qt user/developer can literally type GuiActions.abcdefg and qml will never complain and only if compared with the state will return false.
 
+    // Treatment states - Rinse back
+    txRinseback             ( vData.mSubMode            == GuiTreatmentStates  ::TREATMENT_RINSEBACK_STATE                  );
+    // Rinseback states
+    if ( _txRinseback ) {
+        rbSInit                 ( vData.mRinsebackState     == GuiRinsebackStates   ::RINSEBACK_STOP_INIT_STATE                  );
+        rbRun                   ( vData.mRinsebackState     == GuiRinsebackStates   ::RINSEBACK_RUN_STATE                        );
+        rbPaused                ( vData.mRinsebackState     == GuiRinsebackStates   ::RINSEBACK_PAUSED_STATE                     );
+        rbStop                  ( vData.mRinsebackState     == GuiRinsebackStates   ::RINSEBACK_STOP_STATE                       );
+        rbRun_Additional        ( vData.mRinsebackState     == GuiRinsebackStates   ::RINSEBACK_RUN_ADDITIONAL_STATE             );
+    }
+    // NOTE: refer to the note above
     // Treatment states - Recirculate
-    txRecirculate           ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_RECIRC_STATE                    );
+    txRecirculate           ( vData.mSubMode            == GuiTreatmentStates  ::TREATMENT_RECIRC_STATE                     );
+    // Recirculate states
+    if ( _txRecirculate ) {
+        rcStarted               ( vData.mRecirculateState   == GuiRecirculateStates ::TREATMENT_RECIRC_RECIRC_STATE              );
+        rcStopped               ( vData.mRecirculateState   == GuiRecirculateStates ::TREATMENT_RECIRC_STOPPED_STATE             );
+    }
 }
 
 /*!