Index: sources/model/hd/data/MTreatmentRinsebackData.cpp =================================================================== diff -u -rfd25d67f37410037f22be9c6e958b100e3790de9 -r07e0c7bd409782cab96a4ae761ee3f819bdb8639 --- sources/model/hd/data/MTreatmentRinsebackData.cpp (.../MTreatmentRinsebackData.cpp) (revision fd25d67f37410037f22be9c6e958b100e3790de9) +++ sources/model/hd/data/MTreatmentRinsebackData.cpp (.../MTreatmentRinsebackData.cpp) (revision 07e0c7bd409782cab96a4ae761ee3f819bdb8639) @@ -18,21 +18,27 @@ QVariantList MTreatmentRinseback::parameters() const { return { - _data.mTarget .value, - _data.mCurrent.value, - _data.mRate .value, + _data.mTarget .value, + _data.mCurrent .value, + _data.mRate .value, + _data.mTimeoutTotal .value, + _data.mTimeoutCountDown.value, }; } bool MTreatmentRinseback::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mTarget )) - if (GetValue(vByteArray, index, _data.mCurrent)) - if (GetValue(vByteArray, index, _data.mRate )) + if (GetValue(vByteArray, index, _data.mTarget )) + if (GetValue(vByteArray, index, _data.mCurrent )) + if (GetValue(vByteArray, index, _data.mRate )) + if (GetValue(vByteArray, index, _data.mTimeoutTotal )) + if (GetValue(vByteArray, index, _data.mTimeoutCountDown)) 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; } } /*! @@ -42,8 +48,10 @@ */ MTreatmentRinseback::Data MTreatmentRinseback::data() const { Data data; - data.mTarget = _data.mTarget .value; - data.mCurrent = _data.mCurrent.value; - data.mRate = _data.mRate .value; + data.mTarget = _data.mTarget .value; + data.mCurrent = _data.mCurrent .value; + data.mRate = _data.mRate .value; + data.mTimeoutTotal = _data.mTimeoutTotal .value; + data.mTimeoutCountDown = _data.mTimeoutCountDown.value; return data; }