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/qhoversensorgesturerecognizer.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/qhoversensorgesturerecognizer.cpp')
-rw-r--r-- | src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.cpp index 8a12ee7a..1ce7f1d4 100644 --- a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.cpp @@ -82,6 +82,7 @@ bool QHoverSensorGestureRecognizer::start() } else { active = false; } + detecting = false; return active; } @@ -91,6 +92,8 @@ bool QHoverSensorGestureRecognizer::stop() disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(irProximityReadingChanged(QIRProximityReading *)), this,SLOT(irProximityReadingChanged(QIRProximityReading *))); active = false; + timer->stop(); + timer2->stop(); return active; } @@ -102,7 +105,6 @@ bool QHoverSensorGestureRecognizer::isActive() void QHoverSensorGestureRecognizer::irProximityReadingChanged(QIRProximityReading *reading) { reflectance = reading->reflectance(); - if (!detecting && (reflectance > .25 && reflectance < .50)) { detecting = true; timer->start(); |