diff options
Diffstat (limited to 'src/plugins/sensors/android/src/androidcompass.cpp')
| -rw-r--r-- | src/plugins/sensors/android/src/androidcompass.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/plugins/sensors/android/src/androidcompass.cpp b/src/plugins/sensors/android/src/androidcompass.cpp index 1658fcdc..c0b3547d 100644 --- a/src/plugins/sensors/android/src/androidcompass.cpp +++ b/src/plugins/sensors/android/src/androidcompass.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtSensors module of the Qt Toolkit. ** @@ -10,9 +10,9 @@ ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -23,8 +23,8 @@ ** requirements will be met: https://www.gnu.org/licenses/lgpl.html and ** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** $QT_END_LICENSE$ @@ -45,6 +45,7 @@ public: AndroidAccelerometerListener(AndroidCompass *parent) : m_compass(parent) { + memset(reading, 0, sizeof(reading)); } void start(int dataRate) @@ -84,7 +85,7 @@ public: AndroidMagnetometerListener(AndroidCompass *parent) :m_compass(parent) { - + memset(reading, 0, sizeof(reading)); } void start(int dataRate) @@ -138,9 +139,9 @@ void AndroidCompass::start() { if (!m_accelerometerListener) m_accelerometerListener = new AndroidAccelerometerListener(this); - m_accelerometerListener->start(sensor()->dataRate()); if (!m_magnetometerListener) m_magnetometerListener = new AndroidMagnetometerListener(this); + m_accelerometerListener->start(sensor()->dataRate()); m_magnetometerListener->start(sensor()->dataRate()); m_isStarted = true; @@ -157,6 +158,8 @@ void AndroidCompass::stop() void AndroidCompass::testStuff() { + if (!m_accelerometerListener || !m_magnetometerListener) + return; qreal azimuth = AndroidSensors::getCompassAzimuth(m_accelerometerListener->reading, m_magnetometerListener->reading); azimuth = azimuth * 180.0 / M_PI; |