From ef0fd213a74b9bc44f44ee9c65ae144eb3ea7bde Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Thu, 26 Apr 2012 16:18:41 +1000 Subject: make simulator work better with gestures. code from the plugin has been moved into the manager so that every other plugin can be triggered by the emluator. Change-Id: I37232ab6d45a027541ab1b5c504b2844049ba522 Reviewed-by: Lincoln Ramsay --- src/plugins/sensorgestures/sensorgestures.pro | 1 - src/plugins/sensorgestures/simulator/plugin.json | 1 - .../simulator/qsimulatorrecognizer.cpp | 107 --------------------- .../simulator/qsimulatorrecognizer.h | 75 --------------- .../simulator/qsimulatorsensorgestureplugin.cpp | 77 --------------- .../simulator/qsimulatorsensorgestureplugin.h | 67 ------------- src/plugins/sensorgestures/simulator/simulator.pro | 27 ------ .../simulator/simulatorgesturescommon.cpp | 101 ------------------- .../simulator/simulatorgesturescommon.h | 79 --------------- 9 files changed, 535 deletions(-) delete mode 100644 src/plugins/sensorgestures/simulator/plugin.json delete mode 100644 src/plugins/sensorgestures/simulator/qsimulatorrecognizer.cpp delete mode 100644 src/plugins/sensorgestures/simulator/qsimulatorrecognizer.h delete mode 100644 src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.cpp delete mode 100644 src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.h delete mode 100644 src/plugins/sensorgestures/simulator/simulator.pro delete mode 100644 src/plugins/sensorgestures/simulator/simulatorgesturescommon.cpp delete mode 100644 src/plugins/sensorgestures/simulator/simulatorgesturescommon.h (limited to 'src/plugins/sensorgestures') diff --git a/src/plugins/sensorgestures/sensorgestures.pro b/src/plugins/sensorgestures/sensorgestures.pro index 3882709b..162fb8eb 100644 --- a/src/plugins/sensorgestures/sensorgestures.pro +++ b/src/plugins/sensorgestures/sensorgestures.pro @@ -1,3 +1,2 @@ TEMPLATE = subdirs SUBDIRS += shake qtsensors -simulator:SUBDIRS += simulator diff --git a/src/plugins/sensorgestures/simulator/plugin.json b/src/plugins/sensorgestures/simulator/plugin.json deleted file mode 100644 index 8a55b3ae..00000000 --- a/src/plugins/sensorgestures/simulator/plugin.json +++ /dev/null @@ -1 +0,0 @@ -{ "Keys": [ "notused" ] } diff --git a/src/plugins/sensorgestures/simulator/qsimulatorrecognizer.cpp b/src/plugins/sensorgestures/simulator/qsimulatorrecognizer.cpp deleted file mode 100644 index 3b627ff3..00000000 --- a/src/plugins/sensorgestures/simulator/qsimulatorrecognizer.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** 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 -#include -#include - -#include "qsimulatorrecognizer.h" -#include "simulatorgesturescommon.h" - -QSimulatorSensorGestureRecognizer::QSimulatorSensorGestureRecognizer(QObject *parent) - : QSensorGestureRecognizer(parent) -{ - timer = new QTimer(this); - connect(timer,SIGNAL(timeout()),this,SLOT(timeout())); - - timer->setInterval(1000); -} - -QSimulatorSensorGestureRecognizer::~QSimulatorSensorGestureRecognizer() -{ - if (timer->isActive()) - timer->stop(); -} - -void QSimulatorSensorGestureRecognizer::create() -{ - SensorGesturesConnection *connection = new SensorGesturesConnection(this); - connect(connection,SIGNAL(sensorGestureDetected()),this,SLOT(sensorGestureDetected())); -} - -void QSimulatorSensorGestureRecognizer::sensorGestureDetected() -{ - detectingState = true; -} - - -bool QSimulatorSensorGestureRecognizer::start() -{ - timer->start(); - timeout(); - return timer->isActive(); -} - -bool QSimulatorSensorGestureRecognizer::stop() -{ - timer->stop(); - return timer->isActive(); -} - - -bool QSimulatorSensorGestureRecognizer::isActive() -{ - return timer->isActive(); -} - -QString QSimulatorSensorGestureRecognizer::id() const -{ - return QString("QtSensors.emulator"); -} - -void QSimulatorSensorGestureRecognizer::timeout() -{ - if (detectingState) { - QString str = get_qtSensorGestureData(); - emit detected(str); - detectingState = false; - } -} diff --git a/src/plugins/sensorgestures/simulator/qsimulatorrecognizer.h b/src/plugins/sensorgestures/simulator/qsimulatorrecognizer.h deleted file mode 100644 index a301a5f8..00000000 --- a/src/plugins/sensorgestures/simulator/qsimulatorrecognizer.h +++ /dev/null @@ -1,75 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** 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 QSIMULATORRECOGNIZER_H -#define QSIMULATORRECOGNIZER_H - -#include -#include - -#include - -class QSimulatorSensorGestureRecognizer : public QSensorGestureRecognizer -{ - Q_OBJECT - -public: - - QSimulatorSensorGestureRecognizer(QObject *parent = 0); - ~QSimulatorSensorGestureRecognizer(); - - void create(); - - QString id() const; - bool start(); - bool stop(); - bool isActive(); - -private slots: - void timeout(); - void sensorGestureDetected(); -private: - bool detectingState; - QTimer *timer; - -}; - -#endif // QSHAKERECOGNIZER_H diff --git a/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.cpp b/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.cpp deleted file mode 100644 index 66dcd854..00000000 --- a/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** 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 -#include -#include - -#include "qsimulatorsensorgestureplugin.h" - -#include -#include - -#include "qsimulatorrecognizer.h" - - -QSimulatorSensorGesturePlugin::QSimulatorSensorGesturePlugin() -{ -} - -QSimulatorSensorGesturePlugin::~QSimulatorSensorGesturePlugin() -{ -} - -QStringList QSimulatorSensorGesturePlugin::supportedIds() const -{ - QStringList list; - list << "QtSensors.emulator"; - return list; -} - -QList QSimulatorSensorGesturePlugin::createRecognizers() -{ - QList recognizers; - - QSensorGestureRecognizer *sRec = new QSimulatorSensorGestureRecognizer(this); - recognizers.append(sRec); - - return recognizers; -} diff --git a/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.h b/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.h deleted file mode 100644 index 4f598007..00000000 --- a/src/plugins/sensorgestures/simulator/qsimulatorsensorgestureplugin.h +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** 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 QSIMULATORSENSORGESTUREPLUGIN_H -#define QSIMULATORSENSORGESTUREPLUGIN_H - -#include -#include - -#include - -class QSimulatorSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "com.Nokia.QSensorGesturePluginInterface" FILE "plugin.json") - Q_INTERFACES(QSensorGesturePluginInterface) - -public: - explicit QSimulatorSensorGesturePlugin(); - ~QSimulatorSensorGesturePlugin(); - - QList createRecognizers(); - - QStringList gestureSignals() const; - QStringList supportedIds() const; - QString name() const { return "EmulatorGestures"; } -}; - -#endif // QSIMULATORSENSORGESTUREPLUGIN_H diff --git a/src/plugins/sensorgestures/simulator/simulator.pro b/src/plugins/sensorgestures/simulator/simulator.pro deleted file mode 100644 index 5f1712d1..00000000 --- a/src/plugins/sensorgestures/simulator/simulator.pro +++ /dev/null @@ -1,27 +0,0 @@ -load(qt_module) - -TARGET = qtsensorgestures_simulator -load(qt_plugin) - -DESTDIR = $$QT.sensors.plugins/sensorgestures - -QT=core gui network sensors simulator - -target.path += $$[QT_INSTALL_PLUGINS]/sensorgestures -INSTALLS += target - -HEADERS += \ - simulatorgesturescommon.h\ - qsimulatorrecognizer.h\ - qsimulatorsensorgestureplugin.h - - -SOURCES += \ - simulatorgesturescommon.cpp\ - qsimulatorrecognizer.cpp\ - qsimulatorsensorgestureplugin.cpp - -OTHER_FILES += \ - plugin.json - - diff --git a/src/plugins/sensorgestures/simulator/simulatorgesturescommon.cpp b/src/plugins/sensorgestures/simulator/simulatorgesturescommon.cpp deleted file mode 100644 index c9db8f9f..00000000 --- a/src/plugins/sensorgestures/simulator/simulatorgesturescommon.cpp +++ /dev/null @@ -1,101 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** 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 "simulatorgesturescommon.h" - -#include -#include -#include - -using namespace Simulator; - - -Q_GLOBAL_STATIC(QString, qtSensorGestureData) - -SensorGesturesConnection::SensorGesturesConnection(QObject *parent) - : QObject(parent) -{ - mConnection = new Connection(Connection::Client, "QtSimulator_Mobility_ServerName1.3.0.0", - 0xbeef+1, Version(1,0,0,0), this); - mWorker = mConnection->connectToServer(Connection::simulatorHostName(true), 0xbeef+1); - - if (!mWorker) { - qWarning() << "Could not connect to server"; - return; - } - newSensorGestures(); - - mWorker->addReceiver(this); - mWorker->call("setRequestsSensorGestures"); -} - -SensorGesturesConnection::~SensorGesturesConnection() -{ - delete mWorker; -} - -void SensorGesturesConnection::setSensorGestureData(const QString &data) -{ - QString gesture = data; - if (data.contains("detected")) { - gesture.remove("detected("); - gesture.remove(")"); - } - *qtSensorGestureData() = gesture; -} - -void SensorGesturesConnection::newSensorGestureDetected() -{ - emit sensorGestureDetected(); -} - -void SensorGesturesConnection::newSensorGestures() -{ - QStringList allGestures; - allGestures << "shake"; - mWorker->call("setSensorGestures", allGestures); -} - -QString get_qtSensorGestureData() -{ - return *qtSensorGestureData(); -} - diff --git a/src/plugins/sensorgestures/simulator/simulatorgesturescommon.h b/src/plugins/sensorgestures/simulator/simulatorgesturescommon.h deleted file mode 100644 index aa07b8b1..00000000 --- a/src/plugins/sensorgestures/simulator/simulatorgesturescommon.h +++ /dev/null @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** 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 SIMULATORGESTURESCOMMON_H -#define SIMULATORGESTURESCOMMON_H - -#include -#include - -class QTimer; - -namespace Simulator -{ - class Connection; - class ConnectionWorker; -} - -class SensorGesturesConnection : public QObject -{ - Q_OBJECT -public: - explicit SensorGesturesConnection(QObject *parent = 0); - virtual ~SensorGesturesConnection(); - -Q_SIGNALS: - void sensorGestureDetected(); - -public slots: - void setSensorGestureData(const QString &); - void newSensorGestureDetected(); - void newSensorGestures(); - -private: - Simulator::Connection *mConnection; - Simulator::ConnectionWorker *mWorker; -}; - -QString get_qtSensorGestureData(); - -#endif //SIMULATORGESTURESCOMMON_H - -- cgit v1.2.3