Index: sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp =================================================================== diff -u -rf8b74fc25bbcbc5bd4efba33a84695dee0813ce3 -r301c0a2101eb9374145ae274c8d91460fc9a6a62 --- sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp (.../MTreatmentRinsebackData.cpp) (revision f8b74fc25bbcbc5bd4efba33a84695dee0813ce3) +++ sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp (.../MTreatmentRinsebackData.cpp) (revision 301c0a2101eb9374145ae274c8d91460fc9a6a62) @@ -18,23 +18,23 @@ QVariantList MTreatmentRinseback::parameters() const { return { - _data.mTarget .value, - _data.mCurrent .value, - _data.mRate .value, - _data.mTimeoutTotal .value, - _data.mTimeoutCountDown .value, - _data.mIsCompleted .value, + _data.mTarget .value, + _data.mCurrent .value, + _data.mRate .value, + _data.mTimeoutTotal .value, + _data.mTimeoutCountDown.value, + _data.mIsCompleted .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.mTimeoutTotal )) - if (GetValue(vByteArray, index, _data.mTimeoutCountDown )) - if (GetValue(vByteArray, index, _data.mIsCompleted )) + 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)) + if (GetValue(vByteArray, index, _data.mIsCompleted )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -51,11 +51,11 @@ */ MTreatmentRinseback::Data MTreatmentRinseback::data() const { Data data; - 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; - data.mIsCompleted = _data.mIsCompleted .value? true : false; + 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; + data.mIsCompleted = _data.mIsCompleted .value; return data; }