try harder to make sure gesture dont fire too easily

some gestures will fire when trying other gestures. Make
sure they don't collide and provide false positives as much.

Change-Id: I4abd7d9ee876b77a211ae1b46bcc56f4fdc64ec0
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>

2 files changed, 52 insertions, 74 deletions

diff --git a/src/plugins/sensorgestures/shake/qshakerecognizer.cpp b/src/plugins/sensorgestures/shake/qshakerecognizer.cpp
index c291ce18..de784e82 100644
--- a/src/plugins/sensorgestures/shake/qshakerecognizer.cpp
+++ b/src/plugins/sensorgestures/shake/qshakerecognizer.cpp
@@ -48,11 +48,6 @@ QShakeSensorGestureRecognizer::QShakeSensorGestureRecognizer(QObject *parent)
     : QSensorGestureRecognizer(parent)
     , active(0)
 {
-    pXaxis = 0;nXaxis = 0;
-    pYaxis = 0;nYaxis = 0;
-    pZaxis = 0;nZaxis = 0;
-    timerTimeout = 1500;
-
 }
 
 QShakeSensorGestureRecognizer::~QShakeSensorGestureRecognizer()
@@ -63,7 +58,6 @@ void QShakeSensorGestureRecognizer::create()
 {
     accel = new QAccelerometer(this);
     accel->connectToBackend();
-    timer = new QTimer(this);
 
     qoutputrangelist outputranges = accel->outputRanges();
 
@@ -72,10 +66,6 @@ void QShakeSensorGestureRecognizer::create()
     else
         accelRange = 4; //this should never happen
 
-    connect(timer,SIGNAL(timeout()),this,SLOT(timeout()));
-    timer->setSingleShot(true);
-    timer->setInterval(timerTimeout);
-
     connect(accel,SIGNAL(readingChanged()),this,SLOT(accelChanged()));
 
 }
@@ -105,63 +95,53 @@ QString QShakeSensorGestureRecognizer::id() const
 }
 
 #define NUMBER_SHAKES 3
+#define THRESHOLD 25
+
 void QShakeSensorGestureRecognizer::accelChanged()
 {
     qreal x = accel->reading()->x();
-    qreal xdiff =  pXaxis - x;
     qreal y = accel->reading()->y();
-    qreal ydiff = pYaxis - y;
     qreal z = accel->reading()->z();
-    qreal zdiff =  pZaxis - z;
-
-    if (abs(xdiff) > (5 * accelRange)) {
-        nXaxis++;
-        if (timer->isActive()) {
-            timer->stop();
-        }
-        timer->start();
-    }
-    if (abs(ydiff) > (5 * accelRange)) {
-        nYaxis++;
-        if (timer->isActive()) {
-            timer->stop();
-        }
-        timer->start();
+
+    currentData.x = x;
+    currentData.y = y;
+    currentData.z = z;
+
+    if ((abs(currentData.x - prevData.x)
+          || abs(currentData.y - prevData.y)
+          || abs(currentData.z - prevData.z)) < 1)
+        return;
+
+
+    if (!shaking && checkForShake(prevData, currentData, THRESHOLD) &&
+        shakeCount >= NUMBER_SHAKES) {
+        shaking = true;
+        shakeCount = 0;
+
+        Q_EMIT shake();
+        Q_EMIT detected("shake");
+
+    } else if (checkForShake(prevData, currentData, THRESHOLD)) {
+        shakeCount++;
+    } else if (!checkForShake(prevData, currentData, 200)) {
+        shakeCount = 0;
+        shaking = false;
     }
-    if (abs(zdiff) > (5 * accelRange)) {
-            nZaxis++;
-            if (timer->isActive()) {
-                timer->stop();
-            }
-            timer->start();
-        }
-
-        if (nYaxis + nZaxis + nXaxis >= NUMBER_SHAKES) {
-            Q_EMIT shake();
-            Q_EMIT detected("shake");
-            if (timer->isActive()) {
-                timer->stop();
-            }
-            timeout();
-        }
-    pXaxis = x;
-    pYaxis = y;
-    pZaxis = z;
-}
 
-void QShakeSensorGestureRecognizer::timeout()
-{
-    nXaxis = 0;
-    nYaxis = 0;
-    nZaxis = 0;
+    prevData.x = currentData.x;
+    prevData.y = currentData.y;
+    prevData.z = currentData.z;
 }
 
-int QShakeSensorGestureRecognizer::thresholdTime() const
-{
-    return timerTimeout;
-}
 
-void QShakeSensorGestureRecognizer::setThresholdTime(int msec)
+bool QShakeSensorGestureRecognizer::checkForShake(AccelData prevSensorData, AccelData currentSensorData, qreal threshold)
 {
-    timer->setInterval(msec);
+    double deltaX = qAbs(prevSensorData.x - currentSensorData.x);
+    double deltaY = qAbs(prevSensorData.y - currentSensorData.y);
+    double deltaZ = qAbs(prevSensorData.z - currentSensorData.z);
+
+    return (deltaX > threshold && deltaY > threshold) ||
+         (deltaX > threshold && deltaZ > threshold) ||
+         (deltaY > threshold && deltaZ > threshold);
 }
+
diff --git a/src/plugins/sensorgestures/shake/qshakerecognizer.h b/src/plugins/sensorgestures/shake/qshakerecognizer.h
index 4292c664..dfba26b3 100644
--- a/src/plugins/sensorgestures/shake/qshakerecognizer.h
+++ b/src/plugins/sensorgestures/shake/qshakerecognizer.h
@@ -51,6 +51,12 @@
 
 #include <qsensorgesturerecognizer.h>
 
+ struct AccelData {
+    qreal x;
+    qreal y;
+    qreal z;
+};
+
 class QShakeSensorGestureRecognizer : public QSensorGestureRecognizer
 {
     Q_OBJECT
@@ -67,32 +73,24 @@ public:
     bool stop();
     bool isActive();
 
-    int thresholdTime() const;
-    void setThresholdTime(int msec);
-
 Q_SIGNALS:
     void shake();
 
 private slots:
     void accelChanged();
-    void timeout();
 private:
     QAccelerometer *accel;
+    bool active;
+    int accelRange;
 
-    qreal pXaxis;
-    qreal nXaxis;
-
-    qreal pYaxis;
-    qreal nYaxis;
+    AccelData prevData;
+    AccelData currentData;
 
-    qreal pZaxis;
-    qreal nZaxis;
+    bool checkForShake(AccelData prevSensorData, AccelData currentSensorData, qreal threshold);
+    bool shaking;
+    int shakeCount;
+    int threshold;
 
-    bool detectingState;
-    QTimer *timer;
-    int timerTimeout;
-    bool active;
-    int accelRange;
 };
 
 #endif // QSHAKERECOGNIZER_H