diff options
Diffstat (limited to 'src/plugins/sensors/android/src')
5 files changed, 13 insertions, 14 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/androidpressure.h b/src/plugins/sensors/android/src/androidpressure.h index eae1ae6d..dbb59c1b 100644 --- a/src/plugins/sensors/android/src/androidpressure.h +++ b/src/plugins/sensors/android/src/androidpressure.h @@ -49,8 +49,8 @@ class AndroidPressure : public AndroidCommonSensor<QPressureReading> public: AndroidPressure(AndroidSensors::AndroidSensorType type, QSensor *sensor); private: - virtual void onAccuracyChanged(jint accuracy); - virtual void onSensorChanged(jlong timestamp, const jfloat *values, uint size); + void onAccuracyChanged(jint accuracy) override; + void onSensorChanged(jlong timestamp, const jfloat *values, uint size) override; }; #endif // ANDROIDPRESSURE_H 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(); } diff --git a/src/plugins/sensors/android/src/main.cpp b/src/plugins/sensors/android/src/main.cpp index 18da9d0a..fc80a273 100644 --- a/src/plugins/sensors/android/src/main.cpp +++ b/src/plugins/sensors/android/src/main.cpp @@ -61,7 +61,7 @@ class AndroidSensorPlugin : public QObject, public QSensorPluginInterface, publi Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") Q_INTERFACES(QSensorPluginInterface) public: - void registerSensors() + void registerSensors() override { bool accelerometer = false; bool magnetometer = false; @@ -114,7 +114,7 @@ public: QSensorManager::registerBackend(QCompass::type, AndroidCompass::id, this); } - QSensorBackend *createBackend(QSensor *sensor) + QSensorBackend *createBackend(QSensor *sensor) override { if (sensor->identifier() == AndroidCompass::id) return new AndroidCompass(sensor); |