Index: sources/model/td/data/treatment/MTreatmentSalineData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -re224214d2346bf98de254d6ab3793e7ec0f5f07c --- sources/model/td/data/treatment/MTreatmentSalineData.cpp (.../MTreatmentSalineData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/treatment/MTreatmentSalineData.cpp (.../MTreatmentSalineData.cpp) (revision e224214d2346bf98de254d6ab3793e7ec0f5f07c) @@ -18,19 +18,19 @@ QVariantList MTreatmentSaline::parameters() const { return { - _data.mTarget .value, - _data.mCumulative .value, - _data.mDelivered .value, - _data.mState .value, + _data.mTarget .value, + _data.mDelivered .value, + _data.mCumulative .value, + _data.mBolusPermitted .value, }; } bool MTreatmentSaline::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mTarget )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mCumulative )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDelivered )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTarget )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDelivered )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCumulative )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBolusPermitted )) goto lError; return true ; @@ -47,9 +47,9 @@ */ MTreatmentSaline::Data MTreatmentSaline::data() const { Data data; - data.mTarget = _data.mTarget .value; - data.mCumulative = _data.mCumulative .value; - data.mDelivered = _data.mDelivered .value; - data.mState = _data.mState .value; + data.mTarget = _data.mTarget .value; + data.mDelivered = _data.mDelivered .value; + data.mCumulative = _data.mCumulative .value; + data.mBolusPermitted = _data.mBolusPermitted .value; return data; }