From 300f040d9ac49a937ba1b3bccd64dc4daa822ea9 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Tue, 15 May 2012 11:50:53 +1000 Subject: 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 --- .../qtsensors/qcoversensorgesturerecognizer.cpp | 2 +- .../qtsensors/qhoversensorgesturerecognizer.cpp | 4 +++- .../qtsensors/qpickupsensorgesturerecognizer.cpp | 2 ++ src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp | 13 +++++++++---- .../qtsensors/qtwistsensorgesturerecognizer.cpp | 1 + .../qtsensors/qwhipsensorgesturerecognizer.cpp | 2 ++ 6 files changed, 18 insertions(+), 6 deletions(-) (limited to 'src/plugins/sensorgestures/qtsensors') diff --git a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp index 1af52f07..baeea669 100644 --- a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp @@ -98,7 +98,7 @@ bool QCoverSensorGestureRecognizer::stop() this,SLOT(orientationReadingChanged(QOrientationReading *))); active = false; - + timer->stop(); return active; } 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(); diff --git a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp index dd3d7681..79f59f15 100644 --- a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp @@ -95,6 +95,8 @@ bool QPickupSensorGestureRecognizer::stop() disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), this,SLOT(accelChanged(QAccelerometerReading *))); active = false; + timer->stop(); + return active; } 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) diff --git a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp index 002f838e..fbbb37d0 100644 --- a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp @@ -111,6 +111,7 @@ bool QTwistSensorGestureRecognizer::stop() disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading *)), this,SLOT(accelChanged(QAccelerometerReading *))); active = false; + timer->stop(); return active; } diff --git a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp index c702010e..ee0d02a6 100644 --- a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp +++ b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp @@ -107,6 +107,8 @@ bool QWhipSensorGestureRecognizer::stop() disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading *)), this,SLOT(accelChanged(QAccelerometerReading *))); active = false; + timer->stop(); + return active; } -- cgit v1.2.3