diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2017-02-22 20:35:39 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2017-03-06 14:43:34 +0000 |
commit | 9a1b163e1fdd99a838c082805c687205b766da25 (patch) | |
tree | c9ce4b7fc05d93280628043c98c4e24b5c34e901 /src/plugins/sensors/android | |
parent | bd1e063980355c82bb20af81a826a2860248ce6a (diff) |
Use qRadiansToDegrees() and qDegreesToRadians() more widely
They document intent more clearly than arithmetic with pi does.
Also eliminate some hand-rolled RADIANS_TO_DEGREES constants in
favor of calling qRadiansToDegrees().
Change-Id: I7ca5e876b3591433bf681b56ad51c4cb409ac59f
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/plugins/sensors/android')
-rw-r--r-- | src/plugins/sensors/android/src/androidcompass.cpp | 3 | ||||
-rw-r--r-- | src/plugins/sensors/android/src/androidgyroscope.cpp | 8 | ||||
-rw-r--r-- | src/plugins/sensors/android/src/androidrotation.cpp | 8 |
3 files changed, 9 insertions, 10 deletions
diff --git a/src/plugins/sensors/android/src/androidcompass.cpp b/src/plugins/sensors/android/src/androidcompass.cpp index e98f0484..610dcde7 100644 --- a/src/plugins/sensors/android/src/androidcompass.cpp +++ b/src/plugins/sensors/android/src/androidcompass.cpp @@ -168,7 +168,6 @@ void AndroidCompass::testStuff() return; qreal azimuth = AndroidSensors::getCompassAzimuth(m_accelerometerListener->reading, m_magnetometerListener->reading); - azimuth = azimuth * 180.0 / M_PI; - m_reading.setAzimuth(azimuth); + m_reading.setAzimuth(qRadiansToDegrees(azimuth)); newReadingAvailable(); } diff --git a/src/plugins/sensors/android/src/androidgyroscope.cpp b/src/plugins/sensors/android/src/androidgyroscope.cpp index 623838db..c963761b 100644 --- a/src/plugins/sensors/android/src/androidgyroscope.cpp +++ b/src/plugins/sensors/android/src/androidgyroscope.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "androidgyroscope.h" -#include <math.h> +#include <QtCore/qmath.h> AndroidGyroscope::AndroidGyroscope(AndroidSensors::AndroidSensorType type, QSensor *sensor) : AndroidCommonSensor<QGyroscopeReading>(type, sensor) @@ -50,9 +50,9 @@ void AndroidGyroscope::onSensorChanged(jlong timestamp, const jfloat *values, ui return; m_reader.setTimestamp(timestamp/1000); // check https://developer.android.com/reference/android/hardware/SensorEvent.html#values - m_reader.setX(values[0]*180/M_PI); - m_reader.setY(values[1]*180/M_PI); - m_reader.setZ(values[2]*180/M_PI); + m_reader.setX(qRadiansToDegrees(values[0])); + m_reader.setY(qRadiansToDegrees(values[1])); + m_reader.setZ(qRadiansToDegrees(values[2])); newReadingAvailable(); } diff --git a/src/plugins/sensors/android/src/androidrotation.cpp b/src/plugins/sensors/android/src/androidrotation.cpp index dfe4f2ad..f7d02257 100644 --- a/src/plugins/sensors/android/src/androidrotation.cpp +++ b/src/plugins/sensors/android/src/androidrotation.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "androidrotation.h" -#include <math.h> +#include <QtCore/qmath.h> AndroidRotation::AndroidRotation(AndroidSensors::AndroidSensorType type, QSensor *sensor) : AndroidCommonSensor<QRotationReading>(type, sensor) @@ -55,9 +55,9 @@ void AndroidRotation::onSensorChanged(jlong timestamp, const jfloat *values, uin return; m_reader.setTimestamp(timestamp/1000); - float rz = -values[0]*180/M_PI; - float rx = -values[1]*180/M_PI; - float ry = values[2]*180/M_PI; + float rz = -qRadiansToDegrees(values[0]); + float rx = -qRadiansToDegrees(values[1]); + float ry = qRadiansToDegrees(values[2]); m_reader.setFromEuler(rx, ry, rz); newReadingAvailable(); } |