diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/sensors/sensors.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/sensors/android/src/androidcompass.cpp | 16 | ||||
| -rw-r--r-- | src/sensors/doc/src/compatmap.qdoc | 2 |
3 files changed, 12 insertions, 15 deletions
diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp index ffa09d80..fa4cb3c2 100644 --- a/src/imports/sensors/sensors.cpp +++ b/src/imports/sensors/sensors.cpp @@ -78,13 +78,6 @@ #include "qmlsensorgesture.h" #include "qmllidsensor.h" -static void initResources() -{ -#ifdef QT_STATIC - Q_INIT_RESOURCE(qmake_QtSensors); -#endif -} - QT_BEGIN_NAMESPACE static QObject *global_object_50(QQmlEngine *, QJSEngine *) @@ -97,7 +90,7 @@ class QtSensorsDeclarativeModule : public QQmlExtensionPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid FILE "plugin.json") public: - QtSensorsDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } + QtSensorsDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { } void registerTypes(const char *uri) override { char const * const package = "QtSensors"; diff --git a/src/plugins/sensors/android/src/androidcompass.cpp b/src/plugins/sensors/android/src/androidcompass.cpp index 610dcde7..0911d901 100644 --- a/src/plugins/sensors/android/src/androidcompass.cpp +++ b/src/plugins/sensors/android/src/androidcompass.cpp @@ -49,7 +49,7 @@ class AndroidAccelerometerListener : public AndroidSensors::AndroidSensorsListen public: AndroidAccelerometerListener(AndroidCompass *parent) - : m_compass(parent) + : accuracy(0), m_compass(parent) { memset(reading, 0, sizeof(reading)); } @@ -64,9 +64,9 @@ public: AndroidSensors::unregisterListener(AndroidSensors::TYPE_ACCELEROMETER, this); } - void onAccuracyChanged(jint accuracy) override + void onAccuracyChanged(jint value) override { - Q_UNUSED(accuracy); + accuracy = value; } void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) override @@ -80,6 +80,7 @@ public: } jfloat reading[3]; + jint accuracy; private: AndroidCompass *m_compass; @@ -89,7 +90,7 @@ class AndroidMagnetometerListener : public AndroidSensors::AndroidSensorsListene { public: AndroidMagnetometerListener(AndroidCompass *parent) - :m_compass(parent) + : accuracy(0), m_compass(parent) { memset(reading, 0, sizeof(reading)); } @@ -104,9 +105,9 @@ public: AndroidSensors::unregisterListener(AndroidSensors::TYPE_MAGNETIC_FIELD, this); } - void onAccuracyChanged(jint accuracy) override + void onAccuracyChanged(jint value) override { - Q_UNUSED(accuracy); + accuracy = value; } void onSensorChanged(jlong /*timestamp*/, const jfloat *values, uint size) override @@ -120,6 +121,7 @@ public: } jfloat reading[3]; + jint accuracy; private: AndroidCompass *m_compass; }; @@ -169,5 +171,7 @@ void AndroidCompass::testStuff() qreal azimuth = AndroidSensors::getCompassAzimuth(m_accelerometerListener->reading, m_magnetometerListener->reading); m_reading.setAzimuth(qRadiansToDegrees(azimuth)); + const qreal accuracyValue = (m_accelerometerListener->accuracy + m_magnetometerListener->accuracy) / 6; + m_reading.setCalibrationLevel(accuracyValue); newReadingAvailable(); } diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc index d91c0c55..6db9f708 100644 --- a/src/sensors/doc/src/compatmap.qdoc +++ b/src/sensors/doc/src/compatmap.qdoc @@ -85,7 +85,7 @@ <td nowrap="nowrap">Ambient Light Sensor</td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> - <td bgcolor="green"></td> + <td bgcolor="gray"></td> <td bgcolor="green"></td> <td bgcolor="green"></td> <td bgcolor="green"></td> |