Index: sources/model/dd/data/MDDConductivityData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/model/dd/data/MDDConductivityData.cpp (.../MDDConductivityData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/dd/data/MDDConductivityData.cpp (.../MDDConductivityData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -18,21 +18,21 @@ QVariantList MDDConductivityData::parameters() const { return { - _data.mCD1 .value, - _data.mCD2 .value, - _data.mCD3 .value, - _data.mCD4 .value, - _data.mCD5 .value, + _data.mD17Conductivity .value, + _data.mD27Conductivity .value, + _data.mD29Conductivity .value, + _data.mD43Conductivity .value, + _data.mD74Conductivity .value, }; } bool MDDConductivityData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mCD1 )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mCD2 )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mCD3 )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mCD4 )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mCD5 )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD17Conductivity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD27Conductivity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD29Conductivity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD43Conductivity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD74Conductivity )) goto lError; return true ; @@ -49,10 +49,10 @@ */ MDDConductivityData::Data MDDConductivityData::data() const { Data data; - data.mCD1 = _data.mCD1 .value; - data.mCD2 = _data.mCD2 .value; - data.mCD3 = _data.mCD3 .value; - data.mCD4 = _data.mCD4 .value; - data.mCD5 = _data.mCD5 .value; + data.mBicarbCondutivity1 = _data.mD17Conductivity .value; + data.mAcidBicarbCondutivity1 = _data.mD27Conductivity .value; + data.mAcidBicarbCondutivity2 = _data.mD29Conductivity .value; + data.mSpentCondutivity1 = _data.mD43Conductivity .value; + data.mBicarbCondutivity2 = _data.mD74Conductivity .value; return data; }