Index: sources/view/dg/data/VDGValvesStatesData.cpp
===================================================================
diff -u -r0c983aea7de7480e86739469f5a64ad18b244634 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/view/dg/data/VDGValvesStatesData.cpp	(.../VDGValvesStatesData.cpp)	(revision 0c983aea7de7480e86739469f5a64ad18b244634)
+++ 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)      Michael Garthwaite
- * \date    (last)      24-Feb-2022
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      28-Mar-2023
  * \author  (original)  Behrouz NemaiPour
  * \date    (original)  02-Jul-2020
  *
@@ -23,7 +23,7 @@
 {
     valveStates_VRF  ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRF  ));
     valveStates_VRI  ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRI  ));
-    valveStates_VRD  ( vData.mStates.at( DGValvesStatesFlag::eFlag_ValveStates_VRD  ));
+    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  ));
@@ -35,26 +35,20 @@
     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_VRF () ? "1" : "0" ) + "" +
-       (valveStates_VRI () ? "1" : "0" ) + "" +
-       (valveStates_VRD () ? "1" : "0" ) + "" +
-       (valveStates_VRO () ? "1" : "0" ) + "" +
-       (valveStates_VPO () ? "1" : "0" ) + "" +
-       (valveStates_VBF () ? "1" : "0" ) + "" +
-       (valveStates_VRC () ? "1" : "0" ) + "" +
-       (valveStates_VDR () ? "1" : "0" ) + "" +
-       (valveStates_VPI () ? "1" : "0" ) + "" +
-       (valveStates_VSP () ? "1" : "0" ) + "" +
-       (valveStates_VR1 () ? "1" : "0" ) + "" +
-       (valveStates_VR2 () ? "1" : "0" ) + "" +
-       (valveStates_VPD () ? "1" : "0" );
-    return text;
-}