Index: sources/model/hd/data/MTreatmentSalineData.cpp =================================================================== diff -u -r3b4b381d23c267fbc5af29f29e231f03e26ca23b -r7ed86349cdad43d311f776a69ed54c2023265e53 --- sources/model/hd/data/MTreatmentSalineData.cpp (.../MTreatmentSalineData.cpp) (revision 3b4b381d23c267fbc5af29f29e231f03e26ca23b) +++ sources/model/hd/data/MTreatmentSalineData.cpp (.../MTreatmentSalineData.cpp) (revision 7ed86349cdad43d311f776a69ed54c2023265e53) @@ -15,29 +15,29 @@ using namespace Model; -QVariantList MTreatmentTime::parameters() const { +QVariantList MTreatmentSaline::parameters() const { return { _data.mTarget .value, _data.mCumulative .value, - _data.mDelivering .value, + _data.mDelivered .value, }; } -bool MTreatmentTime::fromByteArray(const QByteArray &vByteArray, int *vIndex) { +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.mDelivering )) + if (GetValue(vByteArray, index, _data.mDelivered )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } } -MTreatmentTime::Data MTreatmentTime::data() const { +MTreatmentSaline::Data MTreatmentSaline::data() const { Data data; data.mTarget = _data.mTarget .value; data.mCumulative = _data.mCumulative .value; - data.mDelivering = _data.mDelivering .value; + data.mDelivered = _data.mDelivered .value; return data; }