Index: sources/model/hd/data/treatment/MTreatmentSalineData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r0052e2d170a431e1e1b70ba292afc898c1c997a7 --- sources/model/hd/data/treatment/MTreatmentSalineData.cpp (.../MTreatmentSalineData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/treatment/MTreatmentSalineData.cpp (.../MTreatmentSalineData.cpp) (revision 0052e2d170a431e1e1b70ba292afc898c1c997a7) @@ -18,21 +18,30 @@ QVariantList MTreatmentSaline::parameters() const { return { - _data.mTarget .value, - _data.mCumulative .value, - _data.mDelivered .value, + _data.mTarget .value, + _data.mCumulative .value, + _data.mDelivered .value, + _data.mDPI2BLDVolML .value, + _data.mRSRVR2DPIVolML .value, + _data.mZeroingRqstStatus .value, }; } bool MTreatmentSaline::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mTarget )) - if (GetValue(vByteArray, index, _data.mCumulative )) - if (GetValue(vByteArray, index, _data.mDelivered )) + if (GetValue(vByteArray, index, _data.mTarget )) + if (GetValue(vByteArray, index, _data.mCumulative )) + if (GetValue(vByteArray, index, _data.mDelivered )) + if (GetValue(vByteArray, index, _data.mDPI2BLDVolML )) + if (GetValue(vByteArray, index, _data.mRSRVR2DPIVolML )) + if (GetValue(vByteArray, index, _data.mZeroingRqstStatus )) 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; } } /*! @@ -42,8 +51,10 @@ */ MTreatmentSaline::Data MTreatmentSaline::data() const { Data data; - data.mTarget = _data.mTarget .value; - data.mCumulative = _data.mCumulative .value; - data.mDelivered = _data.mDelivered .value; + data.mTarget = _data.mTarget .value; + data.mCumulative = _data.mCumulative .value; + data.mDelivered = _data.mDelivered .value; + data.mDPI2BLDVolML = _data.mDPI2BLDVolML .value; + data.mRSRVR2DPIVolML = _data.mRSRVR2DPIVolML .value; return data; }