diff options
author | Lorn Potter <lorn.potter@nokia.com> | 2012-09-19 19:19:46 +1000 |
---|---|---|
committer | Lorn Potter <lorn.potter@gmail.com> | 2012-11-13 20:13:24 +0100 |
commit | 05b99e39f4c9e3249d22410d1c70eafb7b8c0170 (patch) | |
tree | 0ead578ee1113121494a710b59c4f46376d2803a /src | |
parent | d8de6ec84d0d4d0a0a48a44590dde2797fe7cc09 (diff) |
add qml sensorgesture element backported from qtt5
also add sensorgesture auto tests. need to add a tool that creates
the moc data from real device.
Change-Id: I6d68f9e889c4c69a916d048505da7dc348c64e11
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/sensors/gestures/qsensorgesture.cpp | 14 | ||||
-rw-r--r-- | src/sensors/gestures/qsensorgesturemanager.cpp | 4 | ||||
-rw-r--r-- | src/sensors/gestures/qsensorgesturemanagerprivate.cpp | 2 |
3 files changed, 16 insertions, 4 deletions
diff --git a/src/sensors/gestures/qsensorgesture.cpp b/src/sensors/gestures/qsensorgesture.cpp index 467b3a5daf..b150dffd2d 100644 --- a/src/sensors/gestures/qsensorgesture.cpp +++ b/src/sensors/gestures/qsensorgesture.cpp @@ -76,10 +76,13 @@ QTM_BEGIN_NAMESPACE QSensorGesture::QSensorGesture(const QStringList &ids, QObject *parent) : QObject(parent) { + qDebug() << Q_FUNC_INFO; + d_ptr = new QSensorGesturePrivate(); Q_FOREACH (const QString &id, ids) { QSensorGestureRecognizer * rec = QSensorGestureManager::sensorGestureRecognizer(id); if (rec != 0) { + qDebug() << "append" << rec->id(); d_ptr->m_sensorRecognizers.append(rec); d_ptr->availableIds.append(id); } else { @@ -94,14 +97,14 @@ QSensorGesture::QSensorGesture(const QStringList &ids, QObject *parent) : // builder.setSuperClass(&QObject::staticMetaObject); // builder.setClassName("QSensorGesture"); -// Q_FOREACH (QSensorGestureRecognizer *recognizer, d_ptr->m_sensorRecognizers) { + Q_FOREACH (QSensorGestureRecognizer *recognizer, d_ptr->m_sensorRecognizers) { // Q_FOREACH (const QString &gesture, recognizer->gestureSignals()) { // QMetaMethodBuilder b = builder.addSignal(gesture.toLatin1()); // if (!d_ptr->localGestureSignals.contains(QLatin1String(b.signature()))) // d_ptr->localGestureSignals.append(QLatin1String(b.signature())); // } -// recognizer->createBackend(); -// } + recognizer->createBackend(); + } // d_ptr->meta = builder.toMetaObject(); if (d_ptr->m_sensorRecognizers.count() > 0) { @@ -141,8 +144,11 @@ QStringList QSensorGesture::invalidIds() const */ void QSensorGesture::startDetection() { - if (d_ptr->m_sensorRecognizers.count() < 1) + qDebug() << Q_FUNC_INFO; + if (d_ptr->m_sensorRecognizers.count() < 1) { + qDebug() << Q_FUNC_INFO << "count is" << d_ptr->m_sensorRecognizers.count(); return; + } if (d_ptr->isActive) return; diff --git a/src/sensors/gestures/qsensorgesturemanager.cpp b/src/sensors/gestures/qsensorgesturemanager.cpp index 77c6e15882..cc92c2c594 100644 --- a/src/sensors/gestures/qsensorgesturemanager.cpp +++ b/src/sensors/gestures/qsensorgesturemanager.cpp @@ -38,6 +38,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ +#include <QDebug> #include "qsensorgesturemanager.h" #include "qsensorgesturemanagerprivate_p.h" @@ -68,6 +69,7 @@ QTM_BEGIN_NAMESPACE QSensorGestureManager::QSensorGestureManager(QObject *parent) : QObject(parent) { + qDebug() << Q_FUNC_INFO; QSensorGestureManagerPrivate *d = QSensorGestureManagerPrivate::instance(); if (!d) return; // hardly likely but just in case... connect(d,SIGNAL(newSensorGestureAvailable()), @@ -91,6 +93,8 @@ QSensorGestureManager::~QSensorGestureManager() bool QSensorGestureManager::registerSensorGestureRecognizer(QSensorGestureRecognizer *recognizer) { + qDebug() << Q_FUNC_INFO << recognizer->id(); + QSensorGestureManagerPrivate *d = QSensorGestureManagerPrivate::instance(); if (!d) { // hardly likely but just in case... delete recognizer; diff --git a/src/sensors/gestures/qsensorgesturemanagerprivate.cpp b/src/sensors/gestures/qsensorgesturemanagerprivate.cpp index 6e4782850c..7cf94bd966 100644 --- a/src/sensors/gestures/qsensorgesturemanagerprivate.cpp +++ b/src/sensors/gestures/qsensorgesturemanagerprivate.cpp @@ -41,6 +41,7 @@ #include <QDir> #include <QLibraryInfo> +#include <QDebug> #include "qsensorgesturemanagerprivate_p.h" #include "qsensorgesturerecognizer.h" @@ -134,6 +135,7 @@ void QSensorGestureManagerPrivate::loadPlugins() bool QSensorGestureManagerPrivate::loadRecognizer(const QString &recognizerId) { //if no plugin is used return true if this is a registered recognizer +// qDebug() << Q_FUNC_INFO << recognizerId; if (registeredSensorGestures.contains(recognizerId)) return true; |