Index: sources/model/dg/data/MDGValvesStatesData.cpp
===================================================================
diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/model/dg/data/MDGValvesStatesData.cpp	(.../MDGValvesStatesData.cpp)	(revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997)
+++ sources/model/dg/data/MDGValvesStatesData.cpp	(.../MDGValvesStatesData.cpp)	(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 MDGValvesStatesData.cpp
- * \author (last) Behrouz NemaiPour
- * \date (last) 04-Jul-2020
- * \author (original) Behrouz NemaiPour
- * \date (original) 02-Jul-2020
+ * \file    MDGValvesStatesData.cpp
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      28-Mar-2023
+ * \author  (original)  Behrouz NemaiPour
+ * \date    (original)  02-Jul-2020
  *
  */
 #include "MDGValvesStatesData.h"
@@ -18,17 +18,56 @@
 
 QVariantList MDGValvesStates::parameters() const {
     QVariantList mData;
-    for (int i = 0; i < _data.mStates.count(); i++) {
-        mData += _data.mStates.at(i);
+    for (int i = 0; i < eFlag_Bits_Length; i++) {
+        mData += _data.mStates.at(i) ? "T" : "-"; // Converting "bool QBitArray::at(int i) const" to int.
     }
+    mData += _data.mVRf .value;
+    mData += _data.mVRi .value;
+    mData += _data.mRes .value;
+    mData += _data.mVRo .value;
+    mData += _data.mVPo .value;
+    mData += _data.mVBf .value;
+    mData += _data.mVRc .value;
+    mData += _data.mVDr .value;
+    mData += _data.mVPi .value;
+    mData += _data.mVSP .value;
+    mData += _data.mVR1 .value;
+    mData += _data.mVR2 .value;
+    mData += _data.mVPd .value;
     return mData;
 }
 
 bool MDGValvesStates::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
     int index = 0; // message data start position
     if (GetBits (vByteArray, index, _data.mStates, eFlag_Bits_Length))
-                            return true ;
+    if (GetValue(vByteArray, index, _data.mVRf      ))
+    if (GetValue(vByteArray, index, _data.mVRi      ))
+    if (GetValue(vByteArray, index, _data.mRes      ))
+    if (GetValue(vByteArray, index, _data.mVRo      ))
+    if (GetValue(vByteArray, index, _data.mVPo      ))
+    if (GetValue(vByteArray, index, _data.mVBf      ))
+    if (GetValue(vByteArray, index, _data.mVRc      ))
+    if (GetValue(vByteArray, index, _data.mVDr      ))
+    if (GetValue(vByteArray, index, _data.mVPi      ))
+    if (GetValue(vByteArray, index, _data.mVSP      ))
+    if (GetValue(vByteArray, index, _data.mVR1      ))
+    if (GetValue(vByteArray, index, _data.mVR2      ))
+    if (GetValue(vByteArray, index, _data.mVPd      ))
+        return true;
     else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
+    else { if(vIndex) *vIndex = index; return false; }
 }
 
 /*!
@@ -38,6 +77,19 @@
  */
 MDGValvesStates::Data MDGValvesStates::data() const {
     Data data;
-    data.mStates = _data.mStates;
+    data.mStates = _data.mStates    ;
+    data.mVRf    = _data.mVRf .value;
+    data.mVRi    = _data.mVRi .value;
+    data.mRes    = _data.mRes .value;
+    data.mVRo    = _data.mVRo .value;
+    data.mVPo    = _data.mVPo .value;
+    data.mVBf    = _data.mVBf .value;
+    data.mVRc    = _data.mVRc .value;
+    data.mVDr    = _data.mVDr .value;
+    data.mVPi    = _data.mVPi .value;
+    data.mVSP    = _data.mVSP .value;
+    data.mVR1    = _data.mVR1 .value;
+    data.mVR2    = _data.mVR2 .value;
+    data.mVPd    = _data.mVPd .value;
     return data;
 }