diff options
-rw-r--r-- | src/plugins/sensors/android/src/androidcompass.cpp | 16 | ||||
-rw-r--r-- | src/sensors/qirproximitysensor.cpp | 3 | ||||
-rw-r--r-- | src/sensors/qsensorplugin.cpp | 4 |
3 files changed, 17 insertions, 6 deletions
diff --git a/src/plugins/sensors/android/src/androidcompass.cpp b/src/plugins/sensors/android/src/androidcompass.cpp index 610dcde..0911d90 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/qirproximitysensor.cpp b/src/sensors/qirproximitysensor.cpp index cb25735..2be5a43 100644 --- a/src/sensors/qirproximitysensor.cpp +++ b/src/sensors/qirproximitysensor.cpp @@ -40,6 +40,8 @@ #include <qirproximitysensor.h> #include "qirproximitysensor_p.h" +QT_BEGIN_NAMESPACE + IMPLEMENT_READING(QIRProximityReading) /*! @@ -166,4 +168,5 @@ QIRProximityReading *QIRProximitySensor::reading() const return static_cast<QIRProximityReading*>(QSensor::reading()); } +QT_END_NAMESPACE #include "moc_qirproximitysensor.cpp" diff --git a/src/sensors/qsensorplugin.cpp b/src/sensors/qsensorplugin.cpp index e7ed785..186539b 100644 --- a/src/sensors/qsensorplugin.cpp +++ b/src/sensors/qsensorplugin.cpp @@ -39,6 +39,8 @@ #include "qsensorplugin.h" +QT_BEGIN_NAMESPACE + /*! \class QSensorPluginInterface \ingroup sensors_backend @@ -99,3 +101,5 @@ QSensorChangesInterface::~QSensorChangesInterface() \sa {Creating a sensor plugin} */ + +QT_END_NAMESPACE |