Index: sources/model/dg/data/MDGConductivityData.cpp =================================================================== diff -u -r95c2b1e716dedddbde9aa2176e746ed485a36944 -r5d13e39e54676ca4735e3f5da6aca65188486b45 --- sources/model/dg/data/MDGConductivityData.cpp (.../MDGConductivityData.cpp) (revision 95c2b1e716dedddbde9aa2176e746ed485a36944) +++ sources/model/dg/data/MDGConductivityData.cpp (.../MDGConductivityData.cpp) (revision 5d13e39e54676ca4735e3f5da6aca65188486b45) @@ -18,37 +18,37 @@ QVariantList MDGConductivityData::parameters() const { return { - _data.mRORejectionRatio .value, - _data.mCPi .value, - _data.mCPo .value, - _data.mCD1 .value, - _data.mCD2 .value, - _data.mCD2Raw .value, - _data.mCD1Raw .value, - _data.mCPoRaw .value, - _data.mCPiRaw .value, - _data.mCD2SensorStatus .value, - _data.mCD1SensorStatus .value, - _data.mCPoSensorStatus .value, - _data.mCPiSensorStatus .value, + _data.mRORejectionRatio .value, + _data.mCPi .value, + _data.mCPo .value, + _data.mCD1 .value, + _data.mCD2 .value, + _data.mCPiRaw .value, + _data.mCPoRaw .value, + _data.mCD1Raw .value, + _data.mCD2Raw .value, + _data.mCPiSensorStatus .value, + _data.mCPoSensorStatus .value, + _data.mCD1SensorStatus .value, + _data.mCD2SensorStatus .value, }; } bool MDGConductivityData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mRORejectionRatio )) - if (GetValue(vByteArray, index, _data.mCPi )) - if (GetValue(vByteArray, index, _data.mCPo )) - if (GetValue(vByteArray, index, _data.mCD1 )) - if (GetValue(vByteArray, index, _data.mCD2 )) - if (GetValue(vByteArray, index, _data.mCPiRaw )) - if (GetValue(vByteArray, index, _data.mCPoRaw )) - if (GetValue(vByteArray, index, _data.mCD1Raw )) - if (GetValue(vByteArray, index, _data.mCD2Raw )) - if (GetValue(vByteArray, index, _data.mCPiSensorStatus )) - if (GetValue(vByteArray, index, _data.mCPoSensorStatus )) - if (GetValue(vByteArray, index, _data.mCD1SensorStatus )) - if (GetValue(vByteArray, index, _data.mCD2SensorStatus )) + if (GetValue(vByteArray, index, _data.mRORejectionRatio )) + if (GetValue(vByteArray, index, _data.mCPi )) + if (GetValue(vByteArray, index, _data.mCPo )) + if (GetValue(vByteArray, index, _data.mCD1 )) + if (GetValue(vByteArray, index, _data.mCD2 )) + if (GetValue(vByteArray, index, _data.mCPiRaw )) + if (GetValue(vByteArray, index, _data.mCPoRaw )) + if (GetValue(vByteArray, index, _data.mCD1Raw )) + if (GetValue(vByteArray, index, _data.mCD2Raw )) + if (GetValue(vByteArray, index, _data.mCPiSensorStatus )) + if (GetValue(vByteArray, index, _data.mCPoSensorStatus )) + if (GetValue(vByteArray, index, _data.mCD1SensorStatus )) + if (GetValue(vByteArray, index, _data.mCD2SensorStatus )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -66,24 +66,24 @@ } /*! - * \brief MDGConductivity::data + * \brief MDGConductivityData * \details Provides model's Data from the received messages data values * \return Data */ MDGConductivityData::Data MDGConductivityData::data() const { Data data; - data.mRORejectionRatio = _data.mRORejectionRatio .value; - data.mCPi = _data.mCPi .value; - data.mCPo = _data.mCPo .value; - data.mCD1 = _data.mCD1 .value; - data.mCD2 = _data.mCD2 .value; - data.mCD2Raw = _data.mCD2Raw .value; - data.mCD1Raw = _data.mCD1Raw .value; - data.mCPoRaw = _data.mCPoRaw .value; - data.mCPiRaw = _data.mCPiRaw .value; - data.mCD2SensorStatus = _data.mCD2SensorStatus .value; - data.mCD1SensorStatus = _data.mCD1SensorStatus .value; - data.mCPoSensorStatus = _data.mCPoSensorStatus .value; - data.mCPiSensorStatus = _data.mCPiSensorStatus .value; + data.mRORejectionRatio = _data.mRORejectionRatio .value; + data.mCPi = _data.mCPi .value; + data.mCPo = _data.mCPo .value; + data.mCD1 = _data.mCD1 .value; + data.mCD2 = _data.mCD2 .value; + data.mCPiRaw = _data.mCPiRaw .value; + data.mCPoRaw = _data.mCPoRaw .value; + data.mCD1Raw = _data.mCD1Raw .value; + data.mCD2Raw = _data.mCD2Raw .value; + data.mCPiSensorStatus = _data.mCPiSensorStatus .value; + data.mCPoSensorStatus = _data.mCPoSensorStatus .value; + data.mCD1SensorStatus = _data.mCD1SensorStatus .value; + data.mCD2SensorStatus = _data.mCD2SensorStatus .value; return data; } Index: sources/model/dg/data/MDGConductivityData.h =================================================================== diff -u -r95c2b1e716dedddbde9aa2176e746ed485a36944 -r5d13e39e54676ca4735e3f5da6aca65188486b45 --- sources/model/dg/data/MDGConductivityData.h (.../MDGConductivityData.h) (revision 95c2b1e716dedddbde9aa2176e746ed485a36944) +++ sources/model/dg/data/MDGConductivityData.h (.../MDGConductivityData.h) (revision 5d13e39e54676ca4735e3f5da6aca65188486b45) @@ -35,7 +35,7 @@ * * | Payload || * | || - * | #01:(F32) | \ref Data::mRORejectioRatio | + * | #01:(F32) | \ref Data::mRORejectionRatio | * | #02:(F32) | \ref Data::mCPi | * | #03:(F32) | \ref Data::mCPo | * | #04:(F32) | \ref Data::mCD1 |