Index: sources/model/hd/data/MHDAccelerometerData.cpp =================================================================== diff -u -rc8fc31f15b8a6f26f40824963577ed2d0957c946 -r63107b136b69d7275b63ecfc5d64527874366124 --- sources/model/hd/data/MHDAccelerometerData.cpp (.../MHDAccelerometerData.cpp) (revision c8fc31f15b8a6f26f40824963577ed2d0957c946) +++ sources/model/hd/data/MHDAccelerometerData.cpp (.../MHDAccelerometerData.cpp) (revision 63107b136b69d7275b63ecfc5d64527874366124) @@ -18,29 +18,29 @@ QVariantList MHDAccelerometer::parameters() const { return { - _data.mx .value, - _data.my .value, - _data.mz .value, - _data.mxMax .value, - _data.myMax .value, - _data.mzMax .value, - _data.mxTilt .value, - _data.myTilt .value, - _data.mzTilt .value, + _data.mX .value, + _data.mY .value, + _data.mZ .value, + _data.mXMax .value, + _data.mYMax .value, + _data.mZMax .value, + _data.mXTilt .value, + _data.mYTilt .value, + _data.mZTilt .value, }; } bool MHDAccelerometer::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mx )) - if (GetValue(vByteArray, index, _data.my )) - if (GetValue(vByteArray, index, _data.mz )) - if (GetValue(vByteArray, index, _data.mxMax )) - if (GetValue(vByteArray, index, _data.myMax )) - if (GetValue(vByteArray, index, _data.mzMax )) - if (GetValue(vByteArray, index, _data.mxTilt )) - if (GetValue(vByteArray, index, _data.myTilt )) - if (GetValue(vByteArray, index, _data.mzTilt )) + if (GetValue(vByteArray, index, _data.mX )) + if (GetValue(vByteArray, index, _data.mY )) + if (GetValue(vByteArray, index, _data.mZ )) + if (GetValue(vByteArray, index, _data.mXMax )) + if (GetValue(vByteArray, index, _data.mYMax )) + if (GetValue(vByteArray, index, _data.mZMax )) + if (GetValue(vByteArray, index, _data.mXTilt )) + if (GetValue(vByteArray, index, _data.mYTilt )) + if (GetValue(vByteArray, index, _data.mZTilt )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -55,14 +55,14 @@ MHDAccelerometer::Data MHDAccelerometer::data() const { Data data; - data.mx = _data.mx .value; - data.my = _data.my .value; - data.mz = _data.mz .value; - data.mxMax = _data.mxMax .value; - data.myMax = _data.myMax .value; - data.mzMax = _data.mzMax .value; - data.mxTilt = _data.mxTilt .value; - data.myTilt = _data.myTilt .value; - data.mzTilt = _data.mzTilt .value; + data.mX = _data.mX .value; + data.mY = _data.mY .value; + data.mZ = _data.mZ .value; + data.mXMax = _data.mXMax .value; + data.mYMax = _data.mYMax .value; + data.mZMax = _data.mZMax .value; + data.mXTilt = _data.mXTilt .value; + data.mYTilt = _data.mYTilt .value; + data.mZTilt = _data.mZTilt .value; return data; } Index: sources/model/hd/data/MHDAccelerometerData.h =================================================================== diff -u -rc8fc31f15b8a6f26f40824963577ed2d0957c946 -r63107b136b69d7275b63ecfc5d64527874366124 --- sources/model/hd/data/MHDAccelerometerData.h (.../MHDAccelerometerData.h) (revision c8fc31f15b8a6f26f40824963577ed2d0957c946) +++ sources/model/hd/data/MHDAccelerometerData.h (.../MHDAccelerometerData.h) (revision 63107b136b69d7275b63ecfc5d64527874366124) @@ -35,15 +35,15 @@ QVariantList parameters() const override; struct { - Types::F32 mx ; - Types::F32 my ; - Types::F32 mz ; - Types::F32 mxMax ; - Types::F32 myMax ; - Types::F32 mzMax ; - Types::F32 mxTilt ; - Types::F32 myTilt ; - Types::F32 mzTilt ; + Types::F32 mX ; + Types::F32 mY ; + Types::F32 mZ ; + Types::F32 mXMax ; + Types::F32 mYMax ; + Types::F32 mZMax ; + Types::F32 mXTilt ; + Types::F32 mYTilt ; + Types::F32 mZTilt ; } _data; public: @@ -53,15 +53,15 @@ QString infoText() const override { return QString("HDAccelData") ; } struct Data { - float mx = 0; /*!< x Magnitude of acceleration vector in x axis in g units */ - float my = 0; /*!< y Magnitude of acceleration vector in y axis in g units */ - float mz = 0; /*!< z Magnitude of acceleration vector in z axis in g units */ - float mxMax = 0; /*!< x Max Maximum magnitude of acceleration vector in x axis in g units */ - float myMax = 0; /*!< y Max Maximum magnitude of acceleration vector in y axis in g units */ - float mzMax = 0; /*!< z Max Maximum magnitude of acceleration vector in z axis in g units */ - float mxTilt = 0; /*!< x Tilt Tilt angle in the x axis in degrees */ - float myTilt = 0; /*!< y Tilt Tilt angle in the y axis in degrees */ - float mzTilt = 0; /*!< z Tilt Tilt angle in the z axis in degrees */ + float mX = 0; /*!< x Magnitude of acceleration vector in x axis in g units */ + float mY = 0; /*!< y Magnitude of acceleration vector in y axis in g units */ + float mZ = 0; /*!< z Magnitude of acceleration vector in z axis in g units */ + float mXMax = 0; /*!< x Max Maximum magnitude of acceleration vector in x axis in g units */ + float mYMax = 0; /*!< y Max Maximum magnitude of acceleration vector in y axis in g units */ + float mZMax = 0; /*!< z Max Maximum magnitude of acceleration vector in z axis in g units */ + float mXTilt = 0; /*!< x Tilt Tilt angle in the x axis in degrees */ + float mYTilt = 0; /*!< y Tilt Tilt angle in the y axis in degrees */ + float mZTilt = 0; /*!< z Tilt Tilt angle in the z axis in degrees */ }; public: Index: sources/view/hd/data/VHDAccelerometerData.cpp =================================================================== diff -u -rc8fc31f15b8a6f26f40824963577ed2d0957c946 -r63107b136b69d7275b63ecfc5d64527874366124 --- sources/view/hd/data/VHDAccelerometerData.cpp (.../VHDAccelerometerData.cpp) (revision c8fc31f15b8a6f26f40824963577ed2d0957c946) +++ sources/view/hd/data/VHDAccelerometerData.cpp (.../VHDAccelerometerData.cpp) (revision 63107b136b69d7275b63ecfc5d64527874366124) @@ -21,13 +21,13 @@ void VHDAccelerometer::onActionReceive(const HDAccelerometerData &vData) { - x (vData.mx ); - y (vData.my ); - z (vData.mz ); - xMax (vData.mxMax ); - yMax (vData.myMax ); - zMax (vData.mzMax ); - zTilt (vData.mxTilt ); - yTilt (vData.myTilt ); - zTilt (vData.mzTilt ); + x (vData.mX ); + y (vData.mY ); + z (vData.mZ ); + xMax (vData.mXMax ); + yMax (vData.mYMax ); + zMax (vData.mZMax ); + zTilt (vData.mXTilt ); + yTilt (vData.mYTilt ); + zTilt (vData.mZTilt ); }