summaryrefslogtreecommitdiffstats
path: root/src/sensors
diff options
context:
space:
mode:
authorLincoln Ramsay <lincoln.ramsay@nokia.com>2012-03-02 14:13:39 +1000
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-03 09:22:38 +0200
commit4c61854d60fb5d2c68c6dcb1fb5bdf5c0dead3e2 (patch)
treeb41d70a37b8a1ff76c32025d8562a94581a3bd22 /src/sensors
parentfb68fb8c052ae08fabed8f49256e79b0d0915fb0 (diff)
Add TiltSensor to QtMobility.sensors 1.3
This has been adapted from the TiltSensor type in QtSensors 5.0 import but the code there has been split into multiple pieces. There's a C++ class, a generic backend and a QML interface. Change-Id: Ic09465a5f76250a02a13938abe4789958137376f Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/sensors')
-rw-r--r--src/sensors/qsensor.cpp8
-rw-r--r--src/sensors/qsensor.h1
-rw-r--r--src/sensors/qtiltsensor.cpp175
-rw-r--r--src/sensors/qtiltsensor.h95
-rw-r--r--src/sensors/qtiltsensor_p.h74
-rw-r--r--src/sensors/sensors.pro1
6 files changed, 354 insertions, 0 deletions
diff --git a/src/sensors/qsensor.cpp b/src/sensors/qsensor.cpp
index 4a5cb304..0e9fcea3 100644
--- a/src/sensors/qsensor.cpp
+++ b/src/sensors/qsensor.cpp
@@ -224,6 +224,14 @@ QSensor::QSensor(const QByteArray &type, QSensorPrivate &dd, QObject* parent)
d->init(type);
}
+/*! \internal
+ */
+QSensorBackend *QSensor::backend() const
+{
+ Q_D(const QSensor);
+ return d->backend;
+}
+
/*!
Destroy the sensor. Stops the sensor if it has not already been stopped.
*/
diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h
index 8b2a96b9..46d011d3 100644
--- a/src/sensors/qsensor.h
+++ b/src/sensors/qsensor.h
@@ -171,6 +171,7 @@ Q_SIGNALS:
protected:
explicit QSensor(const QByteArray &type, QSensorPrivate &dd, QObject* parent = 0);
+ QSensorBackend *backend() const;
private:
void registerInstance();
diff --git a/src/sensors/qtiltsensor.cpp b/src/sensors/qtiltsensor.cpp
new file mode 100644
index 00000000..b78746bc
--- /dev/null
+++ b/src/sensors/qtiltsensor.cpp
@@ -0,0 +1,175 @@
+/****************************************************************************
+**
+** 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 "qtiltsensor.h"
+#include "qtiltsensor_p.h"
+
+#include "qsensorbackend.h"
+
+#include <QtCore/QMetaObject>
+
+QT_BEGIN_NAMESPACE
+
+IMPLEMENT_READING(QTiltReading)
+
+/*!
+ \class QTiltReading
+ \ingroup sensors_reading
+ \inmodule QtSensors
+
+ \brief The QTiltReading class holds readings from the tilt sensor.
+
+ The tilt sensor reports the angle of tilt in degrees of the device along the X and Y plane.
+
+*/
+
+
+/*!
+ \property QTiltReading::yRotation
+ \brief This property holds the amount of tilt on the Y axis.
+*/
+qreal QTiltReading::yRotation() const
+{
+ return d->yRotation;
+}
+
+/*!
+ Sets yRotation to \a y.
+*/
+void QTiltReading::setYRotation(qreal y)
+{
+ d->yRotation = y;
+}
+
+/*!
+ \property QTiltReading::xRotation
+ \brief This property holds the amount of tilt on the X axis.
+
+*/
+qreal QTiltReading::xRotation() const
+{
+ return d->xRotation;
+}
+
+/*!
+ Sets xRotation to \a x.
+*/
+void QTiltReading::setXRotation(qreal x)
+{
+ d->xRotation = x;
+}
+
+// =====================================================================
+
+/*!
+ \class QTiltFilter
+ \ingroup sensors_filter
+ \inmodule QtSensors
+
+ \brief The QTiltFilter class is a convenience wrapper around QSensorFilter.
+
+ The only difference is that the filter() method features a pointer to QTiltReading
+ instead of QSensorReading.
+*/
+
+/*!
+ \fn QTiltFilter::filter(QTiltReading *reading)
+
+ Called when \a reading changes. Returns false to prevent the reading from propagating.
+
+ \sa QSensorFilter::filter()
+*/
+
+char const * const QTiltSensor::type("QTiltSensor");
+
+/*!
+ \class QTiltSensor
+ \ingroup sensors_type
+ \inmodule QtSensors
+
+ \brief The QTiltSensor class is a convenience wrapper around QSensor.
+
+ The only behavioural difference is that this class sets the type properly.QMetaObject::invokeMethod(backend(), "calibrate");
+
+ This class also features a reading() function that returns a QTiltReading instead of a QSensorReading.
+
+ For details about how the sensor works, see \l QTiltReading.
+
+ \sa QTiltReading
+*/
+
+/*!
+ \fn QTiltSensor::QTiltSensor(QObject *parent)
+
+ Construct the sensor as a child of \a parent.
+*/
+QTiltSensor::QTiltSensor(QObject *parent)
+ : QSensor(QTiltSensor::type, parent)
+{
+}
+
+/*!
+ \fn QTiltSensor::~QTiltSensor()
+
+ Destroy the sensor. Stops the sensor if it has not already been stopped.
+*/
+QTiltSensor::~QTiltSensor()
+{
+}
+/*!
+ \fn QTiltSensor::reading() const
+
+ Returns the reading class for this sensor.
+
+ \sa QSensor::reading()
+*/
+
+
+/*!
+ Calibrates the tilt sensor. Uses the current tilt angles as 0.
+ */
+void QTiltSensor::calibrate()
+{
+ QMetaObject::invokeMethod(backend(), "calibrate", Qt::DirectConnection);
+}
+
+#include "moc_qtiltsensor.cpp"
+QT_END_NAMESPACE
diff --git a/src/sensors/qtiltsensor.h b/src/sensors/qtiltsensor.h
new file mode 100644
index 00000000..8742280b
--- /dev/null
+++ b/src/sensors/qtiltsensor.h
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef QTILTSENSOR_H
+#define QTILTSENSOR_H
+
+#include "qsensor.h"
+
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(QtSensors)
+
+class QTiltReadingPrivate;
+
+class Q_SENSORS_EXPORT QTiltReading : public QSensorReading
+{
+ Q_OBJECT
+ Q_PROPERTY(qreal yRotation READ yRotation)
+ Q_PROPERTY(qreal xRotation READ xRotation)
+ DECLARE_READING(QTiltReading)
+
+public:
+ qreal yRotation() const;
+ void setYRotation(qreal y);
+
+ qreal xRotation() const;
+ void setXRotation(qreal x);
+
+};
+
+class Q_SENSORS_EXPORT QTiltFilter : public QSensorFilter
+{
+public:
+ virtual bool filter(QTiltReading *reading) = 0;
+private:
+ bool filter(QSensorReading *reading) { return filter(static_cast<QTiltReading*>(reading)); }
+};
+
+class Q_SENSORS_EXPORT QTiltSensor : public QSensor
+{
+ Q_OBJECT
+public:
+ explicit QTiltSensor(QObject *parent = 0);
+ ~QTiltSensor();
+ QTiltReading *reading() const { return static_cast<QTiltReading*>(QSensor::reading()); }
+ static char const * const type;
+
+ Q_INVOKABLE void calibrate();
+
+private:
+ Q_DISABLE_COPY(QTiltSensor)
+};
+
+QT_END_NAMESPACE
+QT_END_HEADER
+#endif
diff --git a/src/sensors/qtiltsensor_p.h b/src/sensors/qtiltsensor_p.h
new file mode 100644
index 00000000..14946243
--- /dev/null
+++ b/src/sensors/qtiltsensor_p.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef QTILTSENSOR_P_H
+#define QTILTSENSOR_P_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+
+class QTiltReadingPrivate
+{
+public:
+ QTiltReadingPrivate()
+ : yRotation(0)
+ , xRotation(0)
+ {
+ }
+
+ qreal yRotation;
+ qreal xRotation;
+};
+
+QT_END_NAMESPACE
+QT_END_HEADER
+#endif
diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro
index d72e9c3a..8f11f10e 100644
--- a/src/sensors/sensors.pro
+++ b/src/sensors/sensors.pro
@@ -60,6 +60,7 @@ SENSORS=\
qirproximitysensor\
qrotationsensor\
qtapsensor\
+ qtiltsensor\
qgyroscope\
for(s,SENSORS) {