FCL/sf/mw/qtextensions: comparison qtmobility/src/sensors/qsensor.cpp

equal deleted inserted replaced

-:06b8e2af4411
+:6fbed849b4f4
 bool QSensor::connectToBackend()
 {
 if (d->backend)
 return true;
-int rate = d->dataRate;
 d->backend = QSensorManager::createBackend(this);
-if (rate != 0)
-setDataRate(rate);
 return (d->backend != 0);
 }
 /*!
 \property QSensor::busy
 \property QSensor::dataRate
 \brief the data rate that the sensor should be run at.
 Measured in Hertz.
-The default value is determined by the backend.
+The data rate is the maximum frequency at which the sensor can detect changes.
+Setting this property is not portable and can cause conflicts with other
+applications. Check with the sensor backend and platform documentation for
+any policy regarding multiple applications requesting a data rate.
+The default value (0) means that the app does not care what the data rate is.
+Applications should consider using a timer-based poll of the current value or
+ensure that the code that processes values can run very quickly as the platform
+may provide updates hundreds of times each second.
 This should be set before calling start() because the sensor may not
 notice changes to this value while it is running.
+Note that there is no mechanism to determine the current data rate in use by the
+platform.
 \sa QSensor::availableDataRates
 */
 int QSensor::dataRate() const
 {
 return d->dataRate;
 }
 void QSensor::setDataRate(int rate)
 {
+if (rate == 0) {
+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;
 {
 if (d->active)
 return true;
 if (!connectToBackend())
 return false;
-if (d->availableDataRates.count() == 0)
-return false;
 // Set these flags to their defaults
 d->active = true;
 d->busy = false;
 // Backend will update the flags appropriately
 d->backend->start();
 /*!
 \property QSensor::outputRange
 \brief the output range in use by the sensor.
-A sensor may have more than one output range. Typically this is done
+This value represents the index in the QSensor::outputRanges list to use.
-to give a greater measurement range at the cost of lowering accuracy.
+Setting this property is not portable and can cause conflicts with other
+applications. Check with the sensor backend and platform documentation for
+any policy regarding multiple applications requesting an output range.
+The default value (-1) means that the app does not care what the output range is.
+Note that there is no mechanism to determine the current output range in use by the
+platform.
 \sa QSensor::outputRanges
 */
 int QSensor::outputRange() const
 return d->outputRange;
 }
 void QSensor::setOutputRange(int index)
 {
-if (index < 0 || index >= d->outputRanges.count()) {
+if (index < -1 || index >= d->outputRanges.count()) {
 qWarning() << "ERROR: Output range" << index << "is not valid";
 return;
 }
 d->outputRange = index;
 }
 /*!
 \internal
 */
 QSensorReading::QSensorReading(QObject *parent, QSensorReadingPrivate *_d)
 : QObject(parent)
-, d(_d)
+, d(_d?_d:new QSensorReadingPrivate)
 {
 }
-/*!
-\fn QSensorReading::d_ptr()
-\internal
-*/
 /*!
 \internal
 */
 QSensorReading::~QSensorReading()
 Copy values from other into this reading. Implemented by sub-classes
 using the DECLARE_READING() and IMPLEMENT_READING() macros.
 Note that this method should only be called by QSensorBackend.
 */
+void QSensorReading::copyValuesFrom(QSensorReading *other)
+{
+QSensorReadingPrivate *my_ptr = d.data();
+QSensorReadingPrivate *other_ptr = other->d.data();
+/* Do a direct copy of the private class */
+*(my_ptr) = *(other_ptr);
+}
 /*!
 \macro DECLARE_READING(classname)
 \relates QSensorReading
 \brief The DECLARE_READING macro adds some required methods to a reading class.

changeset 14	6fbed849b4f4
parent 11	06b8e2af4411