From 2750ad7f862cedc7600637c442eea0caf29b1fd8 Mon Sep 17 00:00:00 2001 From: Thomas McGuire Date: Fri, 24 Aug 2012 14:10:57 +0200 Subject: Pass through invalid data rates to the backend instead of ignoring them This gives the backend the chance to do something sensible with it, at the expense of the data rate not being reported correctly in those cases. Change-Id: Iadf72b4448145f2454bc9422dde094ad799cb17a Reviewed-by: Lorn Potter --- src/sensors/qsensor.cpp | 15 ++------------- src/sensors/qsensor.h | 3 ++- 2 files changed, 4 insertions(+), 14 deletions(-) (limited to 'src/sensors') diff --git a/src/sensors/qsensor.cpp b/src/sensors/qsensor.cpp index 9d41dbf7..56c11bc4 100644 --- a/src/sensors/qsensor.cpp +++ b/src/sensors/qsensor.cpp @@ -480,20 +480,9 @@ int QSensor::dataRate() const void QSensor::setDataRate(int rate) { Q_D(QSensor); - if (rate == 0 || !isConnectedToBackend()) { + if (d->dataRate != rate) { d->dataRate = rate; - return; - } - bool warn = true; - Q_FOREACH (const qrange &range, d->availableDataRates) { - if (rate >= range.first && rate <= range.second) { - warn = false; - d->dataRate = rate; - break; - } - } - if (warn) { - qWarning() << "setDataRate:" << rate << "is not supported by the sensor."; + emit dataRateChanged(); } } diff --git a/src/sensors/qsensor.h b/src/sensors/qsensor.h index 43fe221c..bcdc09e2 100644 --- a/src/sensors/qsensor.h +++ b/src/sensors/qsensor.h @@ -84,7 +84,7 @@ class Q_SENSORS_EXPORT QSensor : public QObject Q_PROPERTY(QByteArray type READ type) Q_PROPERTY(bool connectedToBackend READ isConnectedToBackend) Q_PROPERTY(qrangelist availableDataRates READ availableDataRates) - Q_PROPERTY(int dataRate READ dataRate WRITE setDataRate) + Q_PROPERTY(int dataRate READ dataRate WRITE setDataRate NOTIFY dataRateChanged) Q_PROPERTY(QSensorReading* reading READ reading NOTIFY readingChanged) Q_PROPERTY(bool busy READ isBusy) Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChanged) @@ -167,6 +167,7 @@ Q_SIGNALS: void sensorError(int error); void availableSensorsChanged(); void alwaysOnChanged(); + void dataRateChanged(); protected: explicit QSensor(const QByteArray &type, QSensorPrivate &dd, QObject* parent = 0); -- cgit v1.2.3