Index: sources/model/dd/data/MDDLevelData.cpp =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/model/dd/data/MDDLevelData.cpp (.../MDDLevelData.cpp) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/model/dd/data/MDDLevelData.cpp (.../MDDLevelData.cpp) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -18,17 +18,21 @@ QVariantList MDDLevelData::parameters() const { return { - _data.d6Level .value, - _data.d63Level .value, - _data.d46Level .value, + _data.mD46Level .value, + _data.mD63Level .value, + _data.mD98Level .value, + _data.mD6Level .value, + _data.mBicardLevel .value, }; } bool MDDLevelData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.d6Level )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d63Level )) goto lError; - if ( ! GetValue(vByteArray, index, _data.d46Level )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD46Level )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD63Level )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD98Level )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD6Level )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBicardLevel )) goto lError; return true; @@ -40,8 +44,10 @@ MDDLevelData::Data MDDLevelData::data() const { Data data; - data.mFloaterLevel = _data.d6Level .value; - data.mBicarbLevel = _data.d63Level .value; - data.mSpentDialysateLevel = _data.d46Level .value; + data.mD46Level = _data.mD46Level .value; + data.mD63Level = _data.mD63Level .value; + data.mD98Level = _data.mD98Level .value; + data.mD6Level = _data.mD6Level .value; + data.mBicardLevel = _data.mBicardLevel .value; return data; }