Index: sources/model/dd/data/MDDGenDialysateData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/model/dd/data/MDDGenDialysateData.cpp (.../MDDGenDialysateData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/dd/data/MDDGenDialysateData.cpp (.../MDDGenDialysateData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -17,29 +17,29 @@ QVariantList MDDGenDialysateData::parameters() const { return { - _data.mGenDialysateExec .value, - _data.mDDInProgress .value, - _data.mFltLevel1 .value, - _data.mBicarbLevel .value, - _data.mSpentLevel .value, - _data.mHydNegativePressure .value, - _data.mHydPositivePressure .value, - _data.mSpendPressure .value, - _data.mDialGood .value, + _data.mGenDialysateExec .value, + _data.mDDInProgress .value, + _data.mD6Level .value, + _data.mD63Level .value, + _data.mD46Level .value, + _data.mD9Pressure .value, + _data.mD18Pressure .value, + _data.mD51Pressure .value, + _data.mDialGood .value, }; } bool MDDGenDialysateData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mGenDialysateExec )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDDInProgress )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mFltLevel1 )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mBicarbLevel )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mSpentLevel )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mHydNegativePressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mHydPositivePressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mSpendPressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDialGood )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mGenDialysateExec )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDDInProgress )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD6Level )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD63Level )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD46Level )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD9Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD18Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD51Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDialGood )) goto lError; return true ; @@ -56,14 +56,14 @@ */ MDDGenDialysateData::Data MDDGenDialysateData::data() const { Data data; - data.mGenDialysateExec = _data.mGenDialysateExec .value; - data.mDDInProgress = _data.mDDInProgress .value; - data.mFltLevel1 = _data.mFltLevel1 .value; - data.mBicarbLevel = _data.mBicarbLevel .value; - data.mSpentLevel = _data.mSpentLevel .value; - data.mHydNegativePressure = _data.mHydNegativePressure .value; - data.mHydPositivePressure = _data.mHydPositivePressure .value; - data.mSpendPressure = _data.mSpendPressure .value; - data.mDialGood = _data.mDialGood .value; + data.mGenDialysateExec = _data.mGenDialysateExec .value; + data.mDDInProgress = _data.mDDInProgress .value; + data.mFltLevel1 = _data.mD6Level .value; + data.mBicarbLevel = _data.mD63Level .value; + data.mSpentLevel = _data.mD46Level .value; + data.mHydNegativePressure = _data.mD9Pressure .value; + data.mHydPositivePressure = _data.mD18Pressure .value; + data.mSpendPressure = _data.mD51Pressure .value; + data.mDialGood = _data.mDialGood .value; return data; }