From f9d52ca1c093d8997d44cd8356b43b2665fdbf20 Mon Sep 17 00:00:00 2001 From: Lincoln Ramsay Date: Tue, 19 Jun 2012 11:45:09 +1000 Subject: 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 --- src/imports/sensors/qmlaccelerometer.cpp | 169 +++++++++++++++++++++++++++++++ 1 file changed, 169 insertions(+) create mode 100644 src/imports/sensors/qmlaccelerometer.cpp (limited to 'src/imports/sensors/qmlaccelerometer.cpp') diff --git a/src/imports/sensors/qmlaccelerometer.cpp b/src/imports/sensors/qmlaccelerometer.cpp new file mode 100644 index 00000000..8b6caacb --- /dev/null +++ b/src/imports/sensors/qmlaccelerometer.cpp @@ -0,0 +1,169 @@ +/**************************************************************************** +** +** 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 "qmlaccelerometer.h" +#include + +/*! + \qmltype Accelerometer + \instantiates QmlAccelerometer + \ingroup qml-sensors_type + \inqmlmodule QtMobility.sensors 1.3 + \since QtMobility.sensors 1.1 + \inherits QtMobility.sensors1::Sensor + \brief The Accelerometer element reports on linear acceleration + along the X, Y and Z axes. + + The Accelerometer element reports on linear acceleration + along the X, Y and Z axes. + + This element wraps the QAccelerometer class. Please see the documentation for + QAccelerometer for details. + + \sa AccelerometerReading +*/ + +QmlAccelerometer::QmlAccelerometer(QObject *parent) + : QmlSensor(parent) + , m_sensor(new QAccelerometer(this)) +{ +} + +QmlAccelerometer::~QmlAccelerometer() +{ +} + +QmlSensorReading *QmlAccelerometer::createReading() const +{ + return new QmlAccelerometerReading(m_sensor); +} + +QSensor *QmlAccelerometer::sensor() const +{ + return m_sensor; +} + +/*! + \qmltype AccelerometerReading + \instantiates QmlAccelerometerReading + \ingroup qml-sensors_reading + \inqmlmodule QtMobility.sensors 1.3 + \since QtMobility.sensors 1.1 + \inherits QtMobility.sensors1::SensorReading + \brief The AccelerometerReading element holds the most recent Accelerometer reading. + + The AccelerometerReading element holds the most recent Accelerometer reading. + + This element wraps the QAccelerometerReading class. Please see the documentation for + QAccelerometerReading for details. + + This element cannot be directly created. +*/ + +QmlAccelerometerReading::QmlAccelerometerReading(QAccelerometer *sensor) + : QmlSensorReading(sensor) + , m_sensor(sensor) +{ +} + +QmlAccelerometerReading::~QmlAccelerometerReading() +{ +} + +/*! + \qmlproperty qreal QtMobility.sensors1::AccelerometerReading::x + This property holds the acceleration on the X axis. + + Please see QAccelerometerReading::x for information about this property. +*/ + +qreal QmlAccelerometerReading::x() const +{ + return m_x; +} + +/*! + \qmlproperty qreal QtMobility.sensors1::AccelerometerReading::y + This property holds the acceleration on the Y axis. + + Please see QAccelerometerReading::y for information about this property. +*/ + +qreal QmlAccelerometerReading::y() const +{ + return m_y; +} + +/*! + \qmlproperty qreal QtMobility.sensors1::AccelerometerReading::z + This property holds the acceleration on the Z axis. + + Please see QAccelerometerReading::z for information about this property. +*/ + +qreal QmlAccelerometerReading::z() const +{ + return m_z; +} + +QSensorReading *QmlAccelerometerReading::reading() const +{ + return m_sensor->reading(); +} + +void QmlAccelerometerReading::readingUpdate() +{ + qreal aX = m_sensor->reading()->x(); + if (m_x != aX) { + m_x = aX; + Q_EMIT xChanged(); + } + qreal aY = m_sensor->reading()->y(); + if (m_y != aY) { + m_y = aY; + Q_EMIT yChanged(); + } + qreal aZ = m_sensor->reading()->z(); + if (m_z != aZ) { + m_z = aZ; + Q_EMIT zChanged(); + } +} -- cgit v1.2.3