Index: sources/model/dd/data/MDDGenDialysateData.cpp =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -rc82f27ac6f0c015db70c66272f9b67e62b2f83fd --- sources/model/dd/data/MDDGenDialysateData.cpp (.../MDDGenDialysateData.cpp) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/model/dd/data/MDDGenDialysateData.cpp (.../MDDGenDialysateData.cpp) (revision c82f27ac6f0c015db70c66272f9b67e62b2f83fd) @@ -19,27 +19,17 @@ return { _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.mIsDialGood .value, + _data.mCurrentQd .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.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.mIsDialGood )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCurrentQd )) goto lError; return true ; @@ -58,12 +48,7 @@ Data data; 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.mSpentPressure = _data.mD51Pressure .value; data.mIsDialGood = _data.mIsDialGood .value; + data.mCurrentQd = _data.mCurrentQd .value; return data; }