Index: sources/view/dg/data/VDGValvesStatesData.cpp
===================================================================
diff -u -r30a3a58cde0e82d66c8c5f242ec550007e20b694 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/view/dg/data/VDGValvesStatesData.cpp	(.../VDGValvesStatesData.cpp)	(revision 30a3a58cde0e82d66c8c5f242ec550007e20b694)
+++ sources/view/dg/data/VDGValvesStatesData.cpp	(.../VDGValvesStatesData.cpp)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2020-2022 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    VDGValvesStatesData.cpp
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      16-Oct-2020
+ * \date    (last)      28-Mar-2023
  * \author  (original)  Behrouz NemaiPour
  * \date    (original)  02-Jul-2020
  *
@@ -21,39 +21,34 @@
 
 void VDGValvesStates::onActionReceive(const DGValvesStatesData &vData)
 {
-    valveStates_01 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_01 ));
-    valveStates_02 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_02 ));
-    valveStates_03 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_03 ));
-    valveStates_04 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_04 ));
-    valveStates_05 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_05 ));
-    valveStates_06 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_06 ));
-    valveStates_07 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_07 ));
-    valveStates_08 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_08 ));
-    valveStates_09 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_09 ));
-    valveStates_10 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_10 ));
-    valveStates_11 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_11 ));
-    valveStates_12 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_12 ));
-    valveStates_13 ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_13 ));
+    valveStates_VRF  ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRF  ));
+    valveStates_VRI  ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRI  ));
+    valveStates_RES  ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_RES  ));
+    valveStates_VRO  ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRO  ));
+    valveStates_VPO  ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VPO  ));
+    valveStates_VBF  ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VBF  ));
+    valveStates_VRC  ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRC  ));
+    valveStates_VDR  ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VDR  ));
+    valveStates_VPI  ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VPI  ));
+    valveStates_VSP  ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VSP  ));
+    valveStates_VR1  ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VR1  ));
+    valveStates_VR2  ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VR2  ));
+    valveStates_VPD  ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VPD  ));
 
+    valveStatus_VRF  ( vData.mVRf  );
+    valveStatus_VRI  ( vData.mVRi  );
+    valveStatus_RES  ( vData.mRes  );
+    valveStatus_VRO  ( vData.mVRo  );
+    valveStatus_VPO  ( vData.mVPo  );
+    valveStatus_VBF  ( vData.mVBf  );
+    valveStatus_VRC  ( vData.mVRc  );
+    valveStatus_VDR  ( vData.mVDr  );
+    valveStatus_VPI  ( vData.mVPi  );
+    valveStatus_VSP  ( vData.mVSP  );
+    valveStatus_VR1  ( vData.mVR1  );
+    valveStatus_VR2  ( vData.mVR2  );
+    valveStatus_VPD  ( vData.mVPd  );
+
     // Trigger should be the last
     refresh(true);
 }
-
-QString VDGValvesStates::text()
-{
-    // order changed in reverse by request.
-    QString text = QString() +
-       (valveStates_12() ? "1" : "0" ) + "" +
-       (valveStates_11() ? "1" : "0" ) + "" +
-       (valveStates_10() ? "1" : "0" ) + "" +
-       (valveStates_09() ? "1" : "0" ) + "" +
-       (valveStates_08() ? "1" : "0" ) + "" +
-       (valveStates_07() ? "1" : "0" ) + "" +
-       (valveStates_06() ? "1" : "0" ) + "" +
-       (valveStates_05() ? "1" : "0" ) + "" +
-       (valveStates_04() ? "1" : "0" ) + "" +
-       (valveStates_03() ? "1" : "0" ) + "" +
-       (valveStates_02() ? "1" : "0" ) + "" +
-       (valveStates_01() ? "1" : "0" );
-    return text;
-}