From 880cdf61760a39457a80f86c32c9f66e76b575f9 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Sat, 27 Oct 2012 13:35:38 +1000 Subject: add qfreefallsensorgesture Change-Id: I95d6f97d34a079ef6b2f09a8bcede9a4998f6b31 Reviewed-by: Lorn Potter --- plugins/declarative/sensors/sensors.cpp | 2 - .../qtsensors/qfreefallsensorgesturerecognizer.cpp | 125 +++++++++++++++++++++ .../qtsensors/qfreefallsensorgesturerecognizer.h | 80 +++++++++++++ plugins/sensorgestures/qtsensors/qtsensors.pro | 8 +- 4 files changed, 209 insertions(+), 6 deletions(-) create mode 100644 plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.cpp create mode 100644 plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h diff --git a/plugins/declarative/sensors/sensors.cpp b/plugins/declarative/sensors/sensors.cpp index ffc4cee4d6..0e709638f8 100644 --- a/plugins/declarative/sensors/sensors.cpp +++ b/plugins/declarative/sensors/sensors.cpp @@ -41,7 +41,6 @@ #include #include -#include #include #include @@ -145,7 +144,6 @@ public: qmlRegisterType (package, major, minor, "SensorGesture"); - } }; diff --git a/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.cpp b/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.cpp new file mode 100644 index 0000000000..de3798429e --- /dev/null +++ b/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.cpp @@ -0,0 +1,125 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Lorn Potter +** 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 + +#include "qfreefallsensorgesturerecognizer.h" + +QTM_BEGIN_NAMESPACE + +QFreefallSensorGestureRecognizer::QFreefallSensorGestureRecognizer(QObject *parent) + : QSensorGestureRecognizer(parent) + , active(0) + , detecting(0) +{ +} + +QFreefallSensorGestureRecognizer::~QFreefallSensorGestureRecognizer() +{ +} + +void QFreefallSensorGestureRecognizer::create() +{ +} + +QString QFreefallSensorGestureRecognizer::id() const +{ + return QString("QtSensors.freefall"); +} + +bool QFreefallSensorGestureRecognizer::start() +{ + if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Accel)) { + active = true; + connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading *)), + this,SLOT(accelChanged(QAccelerometerReading *))); + } else { + active = false; + } + return active; +} + +bool QFreefallSensorGestureRecognizer::stop() +{ + QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); + disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), + this,SLOT(accelChanged(QAccelerometerReading *))); + active = false; + + return active; +} + +bool QFreefallSensorGestureRecognizer::isActive() +{ + return active; +} + +#define FREEFALL_THRESHOLD 1.0 +#define LANDED_THRESHOLD 20.0 +#define FREEFALL_MAX 4 + +void QFreefallSensorGestureRecognizer::accelChanged(QAccelerometerReading *reading) +{ + const qreal x = reading->x(); + const qreal y = reading->y(); + const qreal z = reading->z(); + qreal sum = qSqrt(x * x + y * y + z * z); + + if (qAbs(sum) < FREEFALL_THRESHOLD) { + detecting = true; + freefallList.append(sum); + } else { + if (detecting && qAbs(sum) > LANDED_THRESHOLD) { + Q_EMIT landed(); + Q_EMIT detected("landed"); + freefallList.clear(); + } + } + + if (freefallList.count() > FREEFALL_MAX) { + Q_EMIT freefall(); + Q_EMIT detected("freefall"); + } +} + +#include "moc_qfreefallsensorgesturerecognizer.cpp" + +QTM_END_NAMESPACE + diff --git a/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h b/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h new file mode 100644 index 0000000000..2ce49c6c6d --- /dev/null +++ b/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h @@ -0,0 +1,80 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Lorn Potter +** 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 QFREEFALLSENSORGESTURERECOGNIZER_H +#define QFREEFALLSENSORGESTURERECOGNIZER_H + +#include +#include "qtsensorgesturesensorhandler.h" + +QTM_BEGIN_NAMESPACE + +class QFreefallSensorGestureRecognizer : public QSensorGestureRecognizer +{ + Q_OBJECT +public: + explicit QFreefallSensorGestureRecognizer(QObject *parent = 0); + ~QFreefallSensorGestureRecognizer(); + + void create(); + + QString id() const; + bool start(); + bool stop(); + bool isActive(); + +Q_SIGNALS: + void freefall(); + void landed(); + +private slots: + void accelChanged(QAccelerometerReading *reading); + +private: + + bool active; + bool detecting; + QList freefallList; + +}; + +QTM_END_NAMESPACE +#endif // QFREEFALLSENSORGESTURERECOGNIZER_H diff --git a/plugins/sensorgestures/qtsensors/qtsensors.pro b/plugins/sensorgestures/qtsensors/qtsensors.pro index a34c18cc18..cabf65485b 100644 --- a/plugins/sensorgestures/qtsensors/qtsensors.pro +++ b/plugins/sensorgestures/qtsensors/qtsensors.pro @@ -13,12 +13,13 @@ MOBILITY += sensors INCLUDEPATH += $$QT_MOBILITY_SOURCE_TREE/src/sensors/gestures INCLUDEPATH += $$QT_MOBILITY_SOURCE_TREE/src/sensors # Input +# qdoubletapsensorgesturerecognizer.h \ + # qdoubletapsensorgesturerecognizer.cpp \ HEADERS +=\ qcoversensorgesturerecognizer.h \ -# qdoubletapsensorgesturerecognizer.h \ qhoversensorgesturerecognizer.h \ -# qfreefallsensorgesturerecognizer.h \ + qfreefallsensorgesturerecognizer.h \ qpickupsensorgesturerecognizer.h \ qshake2recognizer.h \ qslamgesturerecognizer.h \ @@ -30,9 +31,8 @@ HEADERS +=\ SOURCES += \ qcoversensorgesturerecognizer.cpp \ - # qdoubletapsensorgesturerecognizer.cpp \ qhoversensorgesturerecognizer.cpp \ - # qfreefallsensorgesturerecognizer.cpp \ + qfreefallsensorgesturerecognizer.cpp \ qpickupsensorgesturerecognizer.cpp \ qshake2recognizer.cpp \ qslamgesturerecognizer.cpp \ -- cgit v1.2.3