Index: sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp (.../MAdjustDGVersionsResponse.cpp) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp (.../MAdjustDGVersionsResponse.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-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 MTreatmentAdjustDGVersionsResponse.cpp - * \author (last) Peman Montazemi - * \date (last) 10-Dec-2020 - * \author (original) Peman Montazemi - * \date (original) 10-Dec-2020 + * \file MAdjustDGVersionsResponse.cpp + * \author (last) Michael Garthwaite + * \date (last) 28-Feb-2022 + * \author (original) Behrouz NematiPour + * \date (original) 16-Apr-2021 * */ #include "MAdjustDGVersionsResponse.h" @@ -18,27 +18,29 @@ QVariantList MAdjustVersionsDGResponse::parameters() const { return { - _data.mMajor .value, - _data.mMinor .value, - _data.mMicro .value, - _data.mBuild .value, - _data.mFPGAId .value, - _data.mFPGAMajor.value, - _data.mFPGAMinor.value, - _data.mFPGALab .value + _data.mMajor .value, + _data.mMinor .value, + _data.mMicro .value, + _data.mBuild .value, + _data.mFPGAId .value, + _data.mFPGAMajor .value, + _data.mFPGAMinor .value, + _data.mFPGALab .value, + _data.mCompatibilityRev .value, }; } bool MAdjustVersionsDGResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mMajor )) - if (GetValue(vByteArray, index, _data.mMinor )) - if (GetValue(vByteArray, index, _data.mMicro )) - if (GetValue(vByteArray, index, _data.mBuild )) - if (GetValue(vByteArray, index, _data.mFPGAId )) - if (GetValue(vByteArray, index, _data.mFPGAMajor)) - if (GetValue(vByteArray, index, _data.mFPGAMinor)) - if (GetValue(vByteArray, index, _data.mFPGALab )) + if (GetValue(vByteArray, index, _data.mMajor )) + if (GetValue(vByteArray, index, _data.mMinor )) + if (GetValue(vByteArray, index, _data.mMicro )) + if (GetValue(vByteArray, index, _data.mBuild )) + if (GetValue(vByteArray, index, _data.mFPGAId )) + if (GetValue(vByteArray, index, _data.mFPGAMajor )) + if (GetValue(vByteArray, index, _data.mFPGAMinor )) + if (GetValue(vByteArray, index, _data.mFPGALab )) + if (GetValue(vByteArray, index, _data.mCompatibilityRev )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -48,17 +50,19 @@ 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; } } AdjustVersionsDGResponseData MAdjustVersionsDGResponse::data() const { Data data; - data.mMajor = _data.mMajor .value; - data.mMinor = _data.mMinor .value; - data.mMicro = _data.mMicro .value; - data.mBuild = _data.mBuild .value; - data.mFPGAId = _data.mFPGAId .value; - data.mFPGAMajor = _data.mFPGAMajor.value; - data.mFPGAMinor = _data.mFPGAMinor.value; - data.mFPGALab = _data.mFPGALab .value; + data.mMajor = _data.mMajor .value; + data.mMinor = _data.mMinor .value; + data.mMicro = _data.mMicro .value; + data.mBuild = _data.mBuild .value; + data.mFPGAId = _data.mFPGAId .value; + data.mFPGAMajor = _data.mFPGAMajor .value; + data.mFPGAMinor = _data.mFPGAMinor .value; + data.mFPGALab = _data.mFPGALab .value; + data.mCompatibilityRev = _data.mCompatibilityRev .value; return data; }