Index: sources/model/hd/data/treatment/MTreatmentStatesData.cpp =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r78b3d1f4e6675e6a8c5ae3801d134e2d7a49ad06 --- sources/model/hd/data/treatment/MTreatmentStatesData.cpp (.../MTreatmentStatesData.cpp) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/model/hd/data/treatment/MTreatmentStatesData.cpp (.../MTreatmentStatesData.cpp) (revision 78b3d1f4e6675e6a8c5ae3801d134e2d7a49ad06) @@ -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 MTreatmentStatesData.cpp - * \author (last) Behrouz NematiPour - * \date (last) 07-Feb-2021 + * \author (last) Dara Navaei + * \date (last) 06-Nov-2024 * \author (original) Behrouz NematiPour - * \date (original) 02-Jul-2020 + * \date (original) 11-Apr-2021 * */ #include "MTreatmentStatesData.h" @@ -18,29 +18,33 @@ QVariantList MTreatmentStates::parameters() const { return { - _data.mSubMode .value, - _data.mUFState .value, - _data.mSalineState .value, - _data.mHeparinState .value, - _data.mRinsebackState .value, - _data.mRecirculateState .value, - _data.mBloodPrimeState .value, - _data.mTreatmentEndState .value, - _data.mTreatmentStopState .value, + _data.mSubMode .value, + _data.mUFState .value, + _data.mSalineState .value, + _data.mHeparinState .value, + _data.mRinsebackState .value, + _data.mRecirculateState .value, + _data.mBloodPrimeState .value, + _data.mTreatmentEndState .value, + _data.mTreatmentStopState .value, + _data.mDialysisState .value, + _data.mBloodLeakZeoringState .value, }; } bool MTreatmentStates::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mSubMode )) - if (GetValue(vByteArray, index, _data.mUFState )) - if (GetValue(vByteArray, index, _data.mSalineState )) - if (GetValue(vByteArray, index, _data.mHeparinState )) - if (GetValue(vByteArray, index, _data.mRinsebackState )) - if (GetValue(vByteArray, index, _data.mRecirculateState )) - if (GetValue(vByteArray, index, _data.mBloodPrimeState )) - if (GetValue(vByteArray, index, _data.mTreatmentEndState )) - if (GetValue(vByteArray, index, _data.mTreatmentStopState )) + if (GetValue(vByteArray, index, _data.mSubMode )) + if (GetValue(vByteArray, index, _data.mUFState )) + if (GetValue(vByteArray, index, _data.mSalineState )) + if (GetValue(vByteArray, index, _data.mHeparinState )) + if (GetValue(vByteArray, index, _data.mRinsebackState )) + if (GetValue(vByteArray, index, _data.mRecirculateState )) + if (GetValue(vByteArray, index, _data.mBloodPrimeState )) + if (GetValue(vByteArray, index, _data.mTreatmentEndState )) + if (GetValue(vByteArray, index, _data.mTreatmentStopState )) + if (GetValue(vByteArray, index, _data.mDialysisState )) + if (GetValue(vByteArray, index, _data.mBloodLeakZeoringState )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -51,6 +55,8 @@ 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; } } /*! @@ -60,14 +66,16 @@ */ MTreatmentStates::Data MTreatmentStates::data() const { Data data; - data.mSubMode = _data.mSubMode .value; - data.mUFState = _data.mUFState .value; - data.mSalineState = _data.mSalineState .value; - data.mHeparinState = _data.mHeparinState .value; - data.mRinsebackState = _data.mRinsebackState .value; - data.mRecirculateState = _data.mRecirculateState .value; - data.mBloodPrimeState = _data.mBloodPrimeState .value; - data.mTreatmentEndState = _data.mTreatmentEndState .value; - data.mTreatmentStopState = _data.mTreatmentStopState .value; + data.mSubMode = _data.mSubMode .value; + data.mUFState = _data.mUFState .value; + data.mSalineState = _data.mSalineState .value; + data.mHeparinState = _data.mHeparinState .value; + data.mRinsebackState = _data.mRinsebackState .value; + data.mRecirculateState = _data.mRecirculateState .value; + data.mBloodPrimeState = _data.mBloodPrimeState .value; + data.mTreatmentEndState = _data.mTreatmentEndState .value; + data.mTreatmentStopState = _data.mTreatmentStopState .value; + data.mDialysisState = _data.mDialysisState .value; + data.mBloodLeakZeoringState = _data.mBloodLeakZeoringState .value; return data; }