Index: sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp =================================================================== diff -u -r2d37cfe6593a90633a9db1fa5136f8fc43b56188 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp (.../MTreatmentRinsebackData.cpp) (revision 2d37cfe6593a90633a9db1fa5136f8fc43b56188) +++ sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp (.../MTreatmentRinsebackData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2021-2022 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 MTreatmentRinsebackData.cpp * \author (last) Behrouz NematiPour - * \date (last) 16-Sep-2021 + * \date (last) 09-Mar-2022 * \author (original) Behrouz NematiPour * \date (original) 11-Apr-2021 * @@ -18,23 +18,23 @@ QVariantList MTreatmentRinseback::parameters() const { return { - _data.mTarget .value, - _data.mCurrent .value, - _data.mRate .value, - _data.mTimeoutTotal .value, - _data.mTimeoutCountDown.value, - _data.mIsCompleted .value, + _data.mTarget .value, + _data.mCurrent .value, + _data.mRate .value, + _data.mTimeoutTotal .value, + _data.mTimeoutCountDown .value, + _data.mIsCompleted .value, }; } bool MTreatmentRinseback::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mTarget )) - if (GetValue(vByteArray, index, _data.mCurrent )) - if (GetValue(vByteArray, index, _data.mRate )) - if (GetValue(vByteArray, index, _data.mTimeoutTotal )) - if (GetValue(vByteArray, index, _data.mTimeoutCountDown)) - if (GetValue(vByteArray, index, _data.mIsCompleted )) + if (GetValue(vByteArray, index, _data.mTarget )) + if (GetValue(vByteArray, index, _data.mCurrent )) + if (GetValue(vByteArray, index, _data.mRate )) + if (GetValue(vByteArray, index, _data.mTimeoutTotal )) + if (GetValue(vByteArray, index, _data.mTimeoutCountDown )) + if (GetValue(vByteArray, index, _data.mIsCompleted )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -51,11 +51,11 @@ */ MTreatmentRinseback::Data MTreatmentRinseback::data() const { Data data; - data.mTarget = _data.mTarget .value; - data.mCurrent = _data.mCurrent .value; - data.mRate = _data.mRate .value; - data.mTimeoutTotal = _data.mTimeoutTotal .value; - data.mTimeoutCountDown = _data.mTimeoutCountDown.value; - data.mIsCompleted = _data.mIsCompleted .value; + data.mTarget = _data.mTarget .value; + data.mCurrent = _data.mCurrent .value; + data.mRate = _data.mRate .value; + data.mTimeoutTotal = _data.mTimeoutTotal .value; + data.mTimeoutCountDown = _data.mTimeoutCountDown .value; + data.mIsCompleted = _data.mIsCompleted .value? true : false; return data; }