Index: sources/model/hd/data/treatment/MTreatmentStatesData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rf0bb3c517e51b85632a794f4ea62c12205b33031 --- sources/model/hd/data/treatment/MTreatmentStatesData.cpp (.../MTreatmentStatesData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/treatment/MTreatmentStatesData.cpp (.../MTreatmentStatesData.cpp) (revision f0bb3c517e51b85632a794f4ea62c12205b33031) @@ -18,31 +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.mDialysisState .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.mDialysisState )) + 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; } @@ -54,6 +56,7 @@ 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; } } /*! @@ -63,15 +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.mDialysisState = _data.mDialysisState .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; }