diff options
author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-06-19 11:45:09 +1000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-26 00:29:37 +0200 |
commit | f9d52ca1c093d8997d44cd8356b43b2665fdbf20 (patch) | |
tree | 45fd29bd91c67794bf3e1aefbf232bbd1d2f7b8f /src/imports/sensors/qmlgyroscope.cpp | |
parent | 1d253860f9863fd015115d728c3f1bd04c5119c6 (diff) | |
download | qtsensors-f9d52ca1c093d8997d44cd8356b43b2665fdbf20.tar.gz |
QtMobility.sensors has a new implementation
This implementation fixes the limitations the original code had
and separates the QtSensors C++ API from the QML API so that
changes to one don't need to affect the other.
Change-Id: I519463f3c7cfbad3bce5c291ce166b8793d5ed4a
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/imports/sensors/qmlgyroscope.cpp')
-rw-r--r-- | src/imports/sensors/qmlgyroscope.cpp | 166 |
1 files changed, 166 insertions, 0 deletions
diff --git a/src/imports/sensors/qmlgyroscope.cpp b/src/imports/sensors/qmlgyroscope.cpp new file mode 100644 index 0000000..b52badb --- /dev/null +++ b/src/imports/sensors/qmlgyroscope.cpp @@ -0,0 +1,166 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** 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. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: 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 +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qmlgyroscope.h" +#include <QGyroscope> + +/*! + \qmltype Gyroscope + \instantiates QmlGyroscope + \ingroup qml-sensors_type + \inqmlmodule QtMobility.sensors 1.3 + \since QtMobility.sensors 1.2 + \inherits QtMobility.sensors1::Sensor + \brief The Gyroscope element reports on rotational acceleration + around the X, Y and Z axes. + + This element wraps the QGyroscope class. Please see the documentation for + QGyroscope for details. + + \sa GyroscopeReading +*/ + +QmlGyroscope::QmlGyroscope(QObject *parent) + : QmlSensor(parent) + , m_sensor(new QGyroscope(this)) +{ +} + +QmlGyroscope::~QmlGyroscope() +{ +} + +QmlSensorReading *QmlGyroscope::createReading() const +{ + return new QmlGyroscopeReading(m_sensor); +} + +QSensor *QmlGyroscope::sensor() const +{ + return m_sensor; +} + +/*! + \qmltype GyroscopeReading + \instantiates QmlGyroscopeReading + \ingroup qml-sensors_reading + \inqmlmodule QtMobility.sensors 1.3 + \since QtMobility.sensors 1.2 + \inherits QtMobility.sensors1::SensorReading + \brief The GyroscopeReading element holds the most recent Gyroscope reading. + + The GyroscopeReading element holds the most recent Gyroscope reading. + + This element wraps the QGyroscopeReading class. Please see the documentation for + QGyroscopeReading for details. + + This element cannot be directly created. +*/ + +QmlGyroscopeReading::QmlGyroscopeReading(QGyroscope *sensor) + : QmlSensorReading(sensor) + , m_sensor(sensor) +{ +} + +QmlGyroscopeReading::~QmlGyroscopeReading() +{ +} + +/*! + \qmlproperty qreal QtMobility.sensors1::GyroscopeReading::x + This property holds the angular velocity around the x axis. + + Please see QGyroscopeReading::x for information about this property. +*/ + +qreal QmlGyroscopeReading::x() const +{ + return m_x; +} + +/*! + \qmlproperty qreal QtMobility.sensors1::GyroscopeReading::y + This property holds the angular velocity around the y axis. + + Please see QGyroscopeReading::y for information about this property. +*/ + +qreal QmlGyroscopeReading::y() const +{ + return m_y; +} + +/*! + \qmlproperty qreal QtMobility.sensors1::GyroscopeReading::z + This property holds the angular velocity around the z axis. + + Please see QGyroscopeReading::z for information about this property. +*/ + +qreal QmlGyroscopeReading::z() const +{ + return m_z; +} + +QSensorReading *QmlGyroscopeReading::reading() const +{ + return m_sensor->reading(); +} + +void QmlGyroscopeReading::readingUpdate() +{ + qreal gx = m_sensor->reading()->x(); + if (m_x != gx) { + m_x = gx; + Q_EMIT xChanged(); + } + qreal gy = m_sensor->reading()->y(); + if (m_y != gy) { + m_y = gy; + Q_EMIT yChanged(); + } + qreal gz = m_sensor->reading()->z(); + if (m_z != gz) { + m_z = gz; + Q_EMIT zChanged(); + } +} |