Index: sources/model/fp/data/MFPPressuresData.cpp =================================================================== diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/model/fp/data/MFPPressuresData.cpp (.../MFPPressuresData.cpp) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b) +++ sources/model/fp/data/MFPPressuresData.cpp (.../MFPPressuresData.cpp) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -18,29 +18,21 @@ QVariantList MFPPressures::parameters() const { return { - _data.m1Pressure .value, - _data.m3Pressure .value, - _data.p8Pressure .value, - _data.p13Pressure .value, - _data.p17Pressure .value, - _data.x1Pressure .value, - _data.x2Pressure .value, - _data.x3Pressure .value, - _data.x4Pressure .value, + _data.mM3Pressure .value, + _data.mP8Pressure .value, + _data.mP13Pressure .value, + _data.mP17Pressure .value, + _data.mP46Pressure .value, }; } bool MFPPressures::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.m1Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.m3Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.p8Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.p13Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.p17Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.x1Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.x2Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.x3Pressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.x4Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mM3Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP8Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP13Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP17Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP46Pressure )) goto lError; return true ; @@ -57,14 +49,11 @@ */ MFPPressures::Data MFPPressures::data() const { Data data; - data.mBeforePresureRegulator = _data.m1Pressure .value; - data.mAfterPressureRegulator = _data.m3Pressure .value; - data.mBeforeInletConductivity = _data.p8Pressure .value; - data.mBeforeROFilter = _data.p13Pressure .value; - data.mAfterROFilter = _data.p17Pressure .value; - data.mBeforeROPump = _data.x1Pressure .value; - data.mROConcentrate = _data.x2Pressure .value; - data.mROConcentrateDrop = _data.x3Pressure .value; - data.mDrainDrop = _data.x4Pressure .value; + data.mM3Pressure = _data.mM3Pressure .value; + data.mP8Pressure = _data.mP8Pressure .value; + data.mP13Pressure = _data.mP13Pressure .value; + data.mP17Pressure = _data.mP17Pressure .value; + data.mP46Pressure = _data.mP46Pressure .value; + return data; }