diff options
author | Lorn Potter <lorn.potter@nokia.com> | 2012-05-15 11:50:53 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-15 08:32:08 +0200 |
commit | 300f040d9ac49a937ba1b3bccd64dc4daa822ea9 (patch) | |
tree | 9c388f5b0af0c7401a305ee80d8835a93d88c32e /src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp | |
parent | 52f2a75f69b121deefdcc2ae98b68b3fb4293530 (diff) |
reset certain values to make tests work better
timers need to be stopped when gesture is stopped, else it
may interfere in the next test, where the same instance of timer is
used.
As well, reset some values.
Change-Id: Ib69bbaab88d55bef1c3c5614cae1bdec378aa89b
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Diffstat (limited to 'src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp')
-rw-r--r-- | src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp index a2d0eb48..7683b050 100644 --- a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp @@ -80,6 +80,12 @@ bool QShake2SensorGestureRecognizer::start() } else { active = false; } + prevData.x = 0; + prevData.y = 0; + prevData.z = 0; + shakeCount = 0; + shaking = false; + shakeDirection = QShake2SensorGestureRecognizer::ShakeUndefined; return active; } @@ -89,6 +95,7 @@ bool QShake2SensorGestureRecognizer::stop() disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading *)), this,SLOT(accelChanged(QAccelerometerReading *))); active = false; + timer->stop(); return active; } @@ -126,8 +133,9 @@ void QShake2SensorGestureRecognizer::accelChanged(QAccelerometerReading *reading } bool wasShake = checkForShake(prevData, currentData, THRESHOLD); + if (!shaking && wasShake && - shakeCount >= NUMBER_SHAKES) { + shakeCount == NUMBER_SHAKES) { shaking = true; shakeCount = 0; @@ -151,7 +159,6 @@ void QShake2SensorGestureRecognizer::accelChanged(QAccelerometerReading *reading default: break; }; - } else if (wasShake) { if (shakeCount == 0 && shakeDirection == QShake2SensorGestureRecognizer::ShakeUndefined) { @@ -183,7 +190,6 @@ void QShake2SensorGestureRecognizer::accelChanged(QAccelerometerReading *reading prevData.x = currentData.x; prevData.y = currentData.y; prevData.z = currentData.z; - } void QShake2SensorGestureRecognizer::timeout() @@ -191,7 +197,6 @@ void QShake2SensorGestureRecognizer::timeout() shakeCount = 0; shaking = false; shakeDirection = QShake2SensorGestureRecognizer::ShakeUndefined; - } bool QShake2SensorGestureRecognizer::checkForShake(ShakeData prevSensorData, ShakeData currentSensorData, qreal threshold) |