Index: sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp (.../MPostTreatmentStatesData.cpp) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp (.../MPostTreatmentStatesData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,13 @@ /*! * - * 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 MPostTreatmentStatesData.cpp * \author (last) Behrouz NematiPour - * \date (last) 11-Apr-2021 + * \date (last) 22-Mar-2023 * \author (original) Behrouz NematiPour * \date (original) 11-Apr-2021 * @@ -18,15 +18,18 @@ QVariantList MPostTreatmentStates::parameters() const { return { - _data.mSubMode.value, + _data.mSubMode .value, + _data.mDrainState .value, }; } bool MPostTreatmentStates::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mSubMode )) + if (GetValue(vByteArray, index, _data.mSubMode )) + if (GetValue(vByteArray, index, _data.mDrainState )) return true ; - else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -36,6 +39,7 @@ */ MPostTreatmentStates::Data MPostTreatmentStates::data() const { Data data; - data.mSubMode = _data.mSubMode.value; + data.mSubMode = _data.mSubMode .value; + data.mDrainState = _data.mDrainState .value; return data; }