Index: sources/model/hd/data/MTreatmentStatesData.cpp =================================================================== diff -u -r58014dae52ee6357e88b9b03bcad457ddcb432e8 -r07e0c7bd409782cab96a4ae761ee3f819bdb8639 --- sources/model/hd/data/MTreatmentStatesData.cpp (.../MTreatmentStatesData.cpp) (revision 58014dae52ee6357e88b9b03bcad457ddcb432e8) +++ sources/model/hd/data/MTreatmentStatesData.cpp (.../MTreatmentStatesData.cpp) (revision 07e0c7bd409782cab96a4ae761ee3f819bdb8639) @@ -18,30 +18,39 @@ QVariantList MTreatmentStates::parameters() const { return { - _data.mSubMode .value, - _data.mUFState .value, - _data.mSalineState .value, - _data.mHeparinState .value, - _data.mRinsebackState .value, - _data.mRecirculateState .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, }; } 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.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 )) return true ; 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; } 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; } } /*! @@ -51,11 +60,14 @@ */ 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.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; return data; }