optimize and simplify twist gesture code.

twist will better work with varying twist speeds.

Change-Id: Iacb87ff8ad337d0b393497f49cf75d73eacdc4e6
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>

1 files changed, 10 insertions, 15 deletions

diff --git a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h
index 9cd46f64..27fa40e6 100644
--- a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h
+++ b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h
@@ -50,6 +50,12 @@
 
 QT_BEGIN_NAMESPACE
 
+struct twistAccelData {
+    qreal x;
+    qreal y;
+    qreal z;
+};
+
 class QTwistSensorGestureRecognizer : public QSensorGestureRecognizer
 {
     Q_OBJECT
@@ -71,28 +77,17 @@ Q_SIGNALS:
 private slots:
     void accelChanged(QAccelerometerReading *reading);
     void orientationReadingChanged(QOrientationReading *reading);
-    void timeout();
     void checkTwist();
 
 private:
 
     QOrientationReading *orientationReading;
-    QTimer *timer;
-    int accelRange;
-    qreal lastRoll;
     bool active;
-    QList<int> rollList;
-
-    qreal pitch;
-
     bool detecting;
-    qreal lastDegree;
-    QOrientationReading::Orientation lastOrientation;
-    QList <bool> negativeList;
-    bool isShake();
-    qreal lastX;
-    qreal lastY;
-    qreal lastZ;
+    QList <twistAccelData> dataList;
+    bool checking;
+    void reset();
+    bool checkOrientation();
 };
 QT_END_NAMESPACE
 #endif // QWFLICKSENSORGESTURERECOGNIZER_H