diff options
author | Lorn Potter <lorn.potter@nokia.com> | 2011-10-17 14:43:35 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-01 00:28:04 +0100 |
commit | 8684d1e799d379a913535b527b301f31cd566a01 (patch) | |
tree | f1b2e18a0dabab988f22b2a5961decab0f4a82d9 /src/plugins | |
parent | 76702b40d4a505d71ddb8f8ebea71706a4e8d412 (diff) | |
download | qtsensors-8684d1e799d379a913535b527b301f31cd566a01.tar.gz |
add QSensorGestures API. Long live QSensorGestures!
Change-Id: Iada4e8888aad8b7b2180cc0bfb8576a766f75b24
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/plugins.pro | 1 | ||||
-rw-r--r-- | src/plugins/sensorgestures/sensorgestures.pro | 2 | ||||
-rw-r--r-- | src/plugins/sensorgestures/shake/qshakerecognizer.cpp | 161 | ||||
-rw-r--r-- | src/plugins/sensorgestures/shake/qshakerecognizer.h | 97 | ||||
-rw-r--r-- | src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp | 80 | ||||
-rw-r--r-- | src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h | 65 | ||||
-rw-r--r-- | src/plugins/sensorgestures/shake/shake.pro | 17 |
7 files changed, 423 insertions, 0 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 234bd79..c8b9e6a 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,2 +1,3 @@ TEMPLATE = subdirs SUBDIRS += sensors +SUBDIRS += sensorgestures diff --git a/src/plugins/sensorgestures/sensorgestures.pro b/src/plugins/sensorgestures/sensorgestures.pro new file mode 100644 index 0000000..e300fa7 --- /dev/null +++ b/src/plugins/sensorgestures/sensorgestures.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS += shake diff --git a/src/plugins/sensorgestures/shake/qshakerecognizer.cpp b/src/plugins/sensorgestures/shake/qshakerecognizer.cpp new file mode 100644 index 0000000..e544b5a --- /dev/null +++ b/src/plugins/sensorgestures/shake/qshakerecognizer.cpp @@ -0,0 +1,161 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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, Nokia gives you certain additional +** rights. These rights are described in the Nokia 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QDebug> +#include <QTimer> + +#include "qshakerecognizer.h" + +QShakeSensorGestureRecognizer::QShakeSensorGestureRecognizer(QObject *parent) + : QSensorGestureRecognizer(parent) + , active(0) +{ + pXaxis = 0;nXaxis = 0; + pYaxis = 0;nYaxis = 0; + pZaxis = 0;nZaxis = 0; + timerTimeout = 1500; +} + +QShakeSensorGestureRecognizer::~QShakeSensorGestureRecognizer() +{ +} + +void QShakeSensorGestureRecognizer::create() +{ + accel = new QAccelerometer(this); + accel->connectToBackend(); + timer = new QTimer(this); + + connect(timer,SIGNAL(timeout()),this,SLOT(timeout())); + timer->setSingleShot(true); + timer->setInterval(timerTimeout); + + connect(accel,SIGNAL(readingChanged()),this,SLOT(accelChanged())); + +} + +bool QShakeSensorGestureRecognizer::start() +{ + active = accel->start(); + + return active; +} + +bool QShakeSensorGestureRecognizer::stop() +{ + accel->stop(); + active = accel->isActive(); + return !active; +} + + +bool QShakeSensorGestureRecognizer::isActive() +{ + return active; +} + +QString QShakeSensorGestureRecognizer::id() const +{ + return QString("QtSensors.shake"); +} + + +#define NUMBER_SHAKES 3 +void QShakeSensorGestureRecognizer::accelChanged() +{ + qreal x = accel->reading()->x(); + qreal z = accel->reading()->z(); + qreal xdiff = pXaxis - x; + + if (abs(xdiff) > 10) { + nXaxis++; + if (timer->isActive()) { + timer->stop(); + } + timer->start(); + } + if (nXaxis >= NUMBER_SHAKES) { + + Q_EMIT shake(); + Q_EMIT detected("shake"); + + if (timer->isActive()) { + timer->stop(); + } + timeout(); + } + + // if (abs(zdiff) > 10) { + // nZaxis++; + // if (timer->isActive()) { + // timer->stop(); + // } + // timer->start(); + // } + + // if (nZaxis >= NUMBER_SHAKES) { + // Q_EMIT detected("ShakeZ"); + // Q_EMITshake(); + // if (timer->isActive()) { + // timer->stop(); + // } + // timeout(); + // } + pXaxis = x; + pZaxis = z; +} + +void QShakeSensorGestureRecognizer::timeout() +{ + nXaxis = 0; + nYaxis = 0; + nZaxis = 0; +} + +int QShakeSensorGestureRecognizer::thresholdTime() const +{ + return timerTimeout; +} + +void QShakeSensorGestureRecognizer::setThresholdTime(int msec) +{ + timer->setInterval(msec); +} diff --git a/src/plugins/sensorgestures/shake/qshakerecognizer.h b/src/plugins/sensorgestures/shake/qshakerecognizer.h new file mode 100644 index 0000000..07c12c1 --- /dev/null +++ b/src/plugins/sensorgestures/shake/qshakerecognizer.h @@ -0,0 +1,97 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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, Nokia gives you certain additional +** rights. These rights are described in the Nokia 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QSHAKERECOGNIZER_H +#define QSHAKERECOGNIZER_H + + +#include <QtSensors/QSensor> +#include <QtSensors/QAccelerometer> +#include <QtSensors/QAccelerometerFilter> +#include <QDebug> +#include <QTimer> + +#include <qsensorgesturerecognizer.h> + +class QShakeSensorGestureRecognizer : public QSensorGestureRecognizer +{ + Q_OBJECT + +public: + + QShakeSensorGestureRecognizer(QObject *parent = 0); + ~QShakeSensorGestureRecognizer(); + + void create(); + + QString id() const; + bool start(); + bool stop(); + bool isActive(); + + int thresholdTime() const; + void setThresholdTime(int msec); + +Q_SIGNALS: + void shake(); + +private slots: + void accelChanged(); + void timeout(); +private: + QAccelerometer *accel; + + qreal pXaxis; + qreal nXaxis; + + qreal pYaxis; + qreal nYaxis; + + qreal pZaxis; + qreal nZaxis; + + bool detectingState; + QTimer *timer; + int timerTimeout; + bool active; +}; + +#endif // QSHAKERECOGNIZER_H diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp new file mode 100644 index 0000000..6e0f270 --- /dev/null +++ b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp @@ -0,0 +1,80 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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, Nokia gives you certain additional +** rights. These rights are described in the Nokia 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtPlugin> +#include <QStringList> +#include <QObject> + +#include "qshakesensorgestureplugin.h" + +#include <qsensorgestureplugininterface.h> +#include <qsensorgesturemanager.h> + +#include "qshakerecognizer.h" + + +QShakeSensorGesturePlugin::QShakeSensorGesturePlugin() +{ +} + +QShakeSensorGesturePlugin::~QShakeSensorGesturePlugin() +{ +} + +QStringList QShakeSensorGesturePlugin::supportedIds() const +{ + QStringList list; + list << "QtSensors.shake"; + return list; +} + +QList <QSensorGestureRecognizer *> QShakeSensorGesturePlugin::createRecognizers() +{ + QList <QSensorGestureRecognizer *> recognizers; + + QSensorGestureRecognizer *sRec = new QShakeSensorGestureRecognizer(this); + recognizers.append(sRec); + + return recognizers; +} + +Q_EXPORT_PLUGIN2(QShakeSensorGestureRecognizer, QShakeSensorGesturePlugin) + diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h new file mode 100644 index 0000000..d11b9ee --- /dev/null +++ b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h @@ -0,0 +1,65 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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, Nokia gives you certain additional +** rights. These rights are described in the Nokia 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QSHAKESENSORGESTUREPLUGIN_H +#define QSHAKESENSORGESTUREPLUGIN_H + +#include <QObject> +#include <QStringList> + +#include <qsensorgestureplugininterface.h> + +class QShakeSensorGesturePlugin : public QObject, QSensorGesturePluginInterface +{ + Q_OBJECT + Q_INTERFACES(QSensorGesturePluginInterface) +public: + explicit QShakeSensorGesturePlugin(); + ~QShakeSensorGesturePlugin(); + + QList <QSensorGestureRecognizer *> createRecognizers(); + + QStringList gestureSignals() const; + QStringList supportedIds() const; + QString name() const { return "ShakeGestures"; } +}; + +#endif // QSHAKESENSORGESTUREPLUGIN_H diff --git a/src/plugins/sensorgestures/shake/shake.pro b/src/plugins/sensorgestures/shake/shake.pro new file mode 100644 index 0000000..80197c7 --- /dev/null +++ b/src/plugins/sensorgestures/shake/shake.pro @@ -0,0 +1,17 @@ +TEMPLATE = lib +CONFIG += plugin + +TARGET = qtsensorgestures_shakeplugin + +QT += sensors +DESTDIR = $$QT.sensors.plugins/sensorgestures + +# Input +HEADERS += qshakesensorgestureplugin.h \ + qshakerecognizer.h +SOURCES += qshakesensorgestureplugin.cpp \ + qshakerecognizer.cpp + +target.path += $$[QT_INSTALL_PLUGINS]/sensorgestures +INSTALLS += target + |