diff options
author | Lorn Potter <lorn.potter@nokia.com> | 2012-02-14 17:13:47 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-15 02:18:22 +0100 |
commit | 79ca9ff2e8fb94e58a0891964bec18a1230fd6c3 (patch) | |
tree | 7b5f7b6f7c5db9d432f7e386c6567c2a43ad446f /src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp | |
parent | 8d2a6e427067027769e1f3c6322ae06620146396 (diff) |
finalize slam gesture, and fix up some others.
Change-Id: I307492e32ea04d29d8f29cc91f40298d00ae7201
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp')
-rw-r--r-- | src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp index 4869f7e4..3ed4b900 100644 --- a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp @@ -60,7 +60,8 @@ inline qreal calcYaw(double Ax, double Ay, double Az) } QWhipSensorGestureRecognizer::QWhipSensorGestureRecognizer(QObject *parent) : - QSensorGestureRecognizer(parent), whipIt(0), lastX(0) + QSensorGestureRecognizer(parent), whipIt(0), lastX(0), + detectedX(0) { } @@ -137,8 +138,7 @@ void QWhipSensorGestureRecognizer::accelChanged() if (whipIt) { if (((!wasNegative && difference > accelRange * WHIP_THRESHOLD_FACTOR) || (wasNegative && difference < -accelRange * WHIP_THRESHOLD_FACTOR)) - && abs(degreesZ) < WHIP_DEGREES - && abs(detectedX) < abs(x)) { + && abs(degreesZ) < WHIP_DEGREES) { Q_EMIT whip(); Q_EMIT detected("whip"); whipIt = false; @@ -148,7 +148,6 @@ void QWhipSensorGestureRecognizer::accelChanged() || (difference < 0 && difference > -accelRange * WHIP_DETECTION_FACTOR)) && abs(degreesZ) < WHIP_DEGREES && orientation->reading()->orientation() != QOrientationReading::FaceUp) { - detectedX = x; // start of gesture timer->start(); |