Index: sources/model/fp/data/MFPTemperatureData.cpp =================================================================== diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra7719c04d88da7ba4046e5c24c3ba22d632bedad --- sources/model/fp/data/MFPTemperatureData.cpp (.../MFPTemperatureData.cpp) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b) +++ sources/model/fp/data/MFPTemperatureData.cpp (.../MFPTemperatureData.cpp) (revision a7719c04d88da7ba4046e5c24c3ba22d632bedad) @@ -18,37 +18,33 @@ QVariantList MFPTemperature::parameters() const { return { - _data.mP10Temp .value, - _data.mP19Temp .value, - _data.mM1Temp .value, - _data.mM3Temp .value, - _data.mP8Temp .value, - _data.mP13Temp .value, - _data.mP17Temp .value, - _data.mX1Temp .value, - _data.mX2Temp .value, - _data.mX3Temp .value, - _data.mX4Temp .value, - _data.mP7Temp .value, - _data.mP16Temp .value, + _data.mM3Temp .value, + _data.mP8Temp .value, + _data.mP13Temp .value, + _data.mP17Temp .value, + _data.mP46Temp .value, + _data.mP10Temp .value, + _data.mP19Temp .value, + _data.mP7Temp .value, + _data.mP16Temp .value, + _data.mP7InternalTemp .value, + _data.mP16InternalTemp .value, }; } bool MFPTemperature::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mP10Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mP19Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mM1Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mM3Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mP8Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mP13Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mP17Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mX1Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mX2Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mX3Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mX4Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mP7Temp )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mP16Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mM3Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP8Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP13Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP17Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP46Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP10Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP19Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP7Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP16Temp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP7InternalTemp )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mP16InternalTemp )) goto lError; return true ; @@ -65,18 +61,17 @@ */ MFPTemperature::Data MFPTemperature::data() const { Data data; - data.mInletConductivityTemp = _data.mP10Temp .value; - data.mOutletConductivityTemp = _data.mP19Temp .value; - data.mBeforePressureRegulatorTemp = _data.mM1Temp .value; - data.mAfterPressureRegulatorTemp = _data.mM3Temp .value; - data.mBeforeInletConductivityTemp = _data.mP8Temp .value; - data.mBeforeROFilterTemp = _data.mP13Temp .value; - data.mAfterROFilterTemp = _data.mP17Temp .value; - data.mBeforeROPumpTemp = _data.mX1Temp .value; - data.mROConcentrateTemp = _data.mX2Temp .value; - data.mROConcentratePumpTemp = _data.mX3Temp .value; - data.mDrainDropTemp = _data.mX4Temp .value; - data.mROInletTemp = _data.mP7Temp .value; - data.mROOutletTemp = _data.mP16Temp .value; + data.mM3Temp = _data.mM3Temp .value; + data.mP8Temp = _data.mP8Temp .value; + data.mP13Temp = _data.mP13Temp .value; + data.mP17Temp = _data.mP17Temp .value; + data.mP46Temp = _data.mP46Temp .value; + data.mP10Temp = _data.mP10Temp .value; + data.mP19Temp = _data.mP19Temp .value; + data.mP7Temp = _data.mP7Temp .value; + data.mP16Temp = _data.mP16Temp .value; + data.mP7InternalTemp = _data.mP7InternalTemp .value; + data.mP16InternalTemp = _data.mP16InternalTemp .value; + return data; }