diff options
Diffstat (limited to 'plugins/sensorgestures')
4 files changed, 20 insertions, 8 deletions
diff --git a/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp b/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp index a092f35979..21927cb3ce 100644 --- a/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp +++ b/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp @@ -81,6 +81,7 @@ bool QCoverSensorGestureRecognizer::start() QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Proximity); active = false; } + } else { active = false; } @@ -114,6 +115,7 @@ void QCoverSensorGestureRecognizer::proximityChanged(QProximityReading *reading) proximityReading = reading->close(); + // look at case of face up->face down->face up. if (orientationReading->orientation() == QOrientationReading::FaceUp && proximityReading) { diff --git a/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp b/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp index 6eb5e14230..3b17c6c53f 100644 --- a/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp +++ b/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ -#include <QDebug> #include <QTimer> #include "qshake2recognizer.h" diff --git a/plugins/sensorgestures/qtsensors/qshake2recognizer.h b/plugins/sensorgestures/qtsensors/qshake2recognizer.h index 121e5861a5..47932a80cb 100644 --- a/plugins/sensorgestures/qtsensors/qshake2recognizer.h +++ b/plugins/sensorgestures/qtsensors/qshake2recognizer.h @@ -42,7 +42,6 @@ #ifndef QSHAKERECOGNIZER_H #define QSHAKERECOGNIZER_H -#include <QDebug> #include <QTimer> #include <qsensorgesturerecognizer.h> diff --git a/plugins/sensorgestures/qtsensors/qtsensorgesturesensorhandler.cpp b/plugins/sensorgestures/qtsensors/qtsensorgesturesensorhandler.cpp index e12636da50..a2f8b151a2 100644 --- a/plugins/sensorgestures/qtsensors/qtsensorgesturesensorhandler.cpp +++ b/plugins/sensorgestures/qtsensors/qtsensorgesturesensorhandler.cpp @@ -39,7 +39,8 @@ ** ****************************************************************************/ -#include <QDebug> +#include <QStringList> +#include <QTimer> #include "qtsensorgesturesensorhandler.h" @@ -94,7 +95,16 @@ bool QtSensorGestureSensorHandler::startSensor(SensorGestureSensors sensor) if (accel == 0x0) { accel = new QAccelerometer(this); ok = accel->connectToBackend(); - accel->setDataRate(50); +// qrangelist rangeList = accel->availableDataRates(); + +// QStringList ranges; +// foreach (const qrange &range, rangeList) { +// if (range.first == range.second) +// ranges << QString("%1 Hz").arg(range.first); +// else +// ranges << QString("%1-%2 Hz").arg(range.first).arg(range.second); +// } + accel->setDataRate(100); qoutputrangelist outputranges = accel->outputRanges(); if (outputranges.count() > 0) @@ -111,11 +121,13 @@ bool QtSensorGestureSensorHandler::startSensor(SensorGestureSensors sensor) if (orientation == 0x0) { orientation = new QOrientationSensor(this); ok = orientation->connectToBackend(); - orientation->setDataRate(50); + orientation->setDataRate(100); connect(orientation,SIGNAL(readingChanged()),this,SLOT(orientationChanged())); } - if (ok && !orientation->isActive()) + if (ok && !orientation->isActive()) { orientation->start(); + QTimer::singleShot(100,this,SLOT(orientationChanged())); + } break; case Proximity: //proximity @@ -124,8 +136,9 @@ bool QtSensorGestureSensorHandler::startSensor(SensorGestureSensors sensor) ok = proximity->connectToBackend(); connect(proximity,SIGNAL(readingChanged()),this,SLOT(proximityChanged())); } - if (ok && !proximity->isActive()) + if (ok && !proximity->isActive()) { proximity->start(); + } break; case IrProximity: // //irproximity @@ -156,7 +169,6 @@ bool QtSensorGestureSensorHandler::startSensor(SensorGestureSensors sensor) void QtSensorGestureSensorHandler::stopSensor(SensorGestureSensors sensor) { - // qDebug() << __FUNCTION__ << sensor; if (usedSensorsMap.value(sensor) == 0) return; int val = usedSensorsMap.value(sensor); |