Index: sources/model/dg/data/MDGOperationModeData.cpp =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r6816b783f50e08267aa016d64350bc020080d901 --- sources/model/dg/data/MDGOperationModeData.cpp (.../MDGOperationModeData.cpp) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/dg/data/MDGOperationModeData.cpp (.../MDGOperationModeData.cpp) (revision 6816b783f50e08267aa016d64350bc020080d901) @@ -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 MDGOperationModeData.cpp - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file MDGOperationModeData.cpp + * \author (last) Behrouz NematiPour + * \date (last) 17-May-2021 + * \author (original) Behrouz NematiPour + * \date (original) 02-Jul-2020 * */ #include "MDGOperationModeData.h" @@ -18,15 +18,18 @@ QVariantList MDGOperationMode::parameters() const { return { - _data.mOpMode.value + _data.mOpMode .value, + _data.mSubMode .value }; } bool MDGOperationMode::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mOpMode )) + if (GetValue(vByteArray, index, _data.mOpMode )) + if (GetValue(vByteArray, index, _data.mSubMode )) return true ; else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -36,6 +39,7 @@ */ MDGOperationMode::Data MDGOperationMode::data() const { Data data; - data.mOpMode = _data.mOpMode.value; + data.mOpMode = _data.mOpMode .value; + data.mSubMode = _data.mSubMode .value; return data; }