Index: sources/model/dg/data/MDGValvesStatesData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rfff4ebfd528e1ca2b4475e375130d0d4c90fe38a --- sources/model/dg/data/MDGValvesStatesData.cpp (.../MDGValvesStatesData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGValvesStatesData.cpp (.../MDGValvesStatesData.cpp) (revision fff4ebfd528e1ca2b4475e375130d0d4c90fe38a) @@ -8,7 +8,7 @@ * \file MDGValvesStatesData.cpp * \author (last) Behrouz NematiPour * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour + * \author (original) Behrouz NematiPour * \date (original) 02-Jul-2020 * */ @@ -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; }