diff options
Diffstat (limited to 'src/sensors')
-rw-r--r-- | src/sensors/doc/src/compatmap.qdoc | 20 | ||||
-rw-r--r-- | src/sensors/qhumiditysensor.cpp | 181 | ||||
-rw-r--r-- | src/sensors/qhumiditysensor.h | 91 | ||||
-rw-r--r-- | src/sensors/qhumiditysensor_p.h | 82 | ||||
-rw-r--r-- | src/sensors/qlidsensor.cpp | 182 | ||||
-rw-r--r-- | src/sensors/qlidsensor.h | 90 | ||||
-rw-r--r-- | src/sensors/qlidsensor_p.h | 69 | ||||
-rw-r--r-- | src/sensors/sensors.pro | 4 |
8 files changed, 718 insertions, 1 deletions
diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc index 399bcec..633e4e5 100644 --- a/src/sensors/doc/src/compatmap.qdoc +++ b/src/sensors/doc/src/compatmap.qdoc @@ -142,6 +142,16 @@ <td bgcolor="gray"></td> </tr> <tr> + <td nowrap="nowrap">Humidity Sensor</td> + <td bgcolor="gray"></td> + <td bgcolor="gray"></td> + <td bgcolor="gray"></td> + <td bgcolor="gray"></td> + <td bgcolor="gray"></td> + <td bgcolor="gray"></td> + <td bgcolor="gray"></td> + </tr> + <tr> <td nowrap="nowrap">IR Proximity Sensor</td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> @@ -152,6 +162,16 @@ <td bgcolor="green"></td> </tr> <tr> + <td nowrap="nowrap">Lid Sensor</td> + <td bgcolor="gray"></td> + <td bgcolor="gray"></td> + <td bgcolor="gray"></td> + <td bgcolor="gray"></td> + <td bgcolor="gray"></td> + <td bgcolor="gray"></td> + <td bgcolor="green"></td> + </tr> + <tr> <td nowrap="nowrap">Light Sensor</td> <td bgcolor="green"></td> <td bgcolor="green"></td> diff --git a/src/sensors/qhumiditysensor.cpp b/src/sensors/qhumiditysensor.cpp new file mode 100644 index 0000000..aaf60b6 --- /dev/null +++ b/src/sensors/qhumiditysensor.cpp @@ -0,0 +1,181 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Canonical Ltd +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <qhumiditysensor.h> +#include "qhumiditysensor_p.h" + +QT_BEGIN_NAMESPACE + +IMPLEMENT_READING(QHumidityReading) + +/*! + \class QHumidityReading + \ingroup sensors_reading + \inmodule QtSensors + \since 5.9 + + \brief The QHumidityReading class holds readings from the humidity sensor. + + \section2 QHumidityReading Units + + The humidity sensor returns the relative humidity as a percentage, and absolute humidity in + grams per cubic meter (g/m3). + Note that some sensors may not support absolute humidity, 0 will be returned in this case. +*/ + +/*! + \property QHumidityReading::relativeHumidity + \brief Relative humidity + Returned as a percentage. + + \sa {QHumidityReading Units} +*/ + +qreal QHumidityReading::relativeHumidity() const +{ + return d->relativeHumidity; +} + +/*! + Sets relativeHumidity to \a humidity. +*/ +void QHumidityReading::setRelativeHumidity(qreal humidity) +{ + d->relativeHumidity = humidity; +} + +/*! + \property QHumidityReading::absoluteHumidity + \brief Absolute humidity + Measured in grams per cubic meter. + Note that some sensors may not support absolute humidity. + + \sa {QHumidityReading Units} +*/ + +qreal QHumidityReading::absoluteHumidity() const +{ + return d->absoluteHumidity; +} + +/*! + Sets absoluteHumidity to \a value. +*/ +void QHumidityReading::setAbsoluteHumidity(qreal value) +{ + d->absoluteHumidity = value; +} + +// ===================================================================== + +/*! + \class QHumidityFilter + \ingroup sensors_filter + \inmodule QtSensors + \since 5.9 + + \brief The QHumidityFilter class is a convenience wrapper around QSensorFilter. + + The only difference is that the filter() method features a pointer to QHumidityReading + instead of QSensorReading. +*/ + +/*! + \fn QHumidityFilter::filter(QHumidityReading *reading) + + Called when \a reading changes. Returns false to prevent the reading from propagating. + + \sa QSensorFilter::filter() +*/ + +bool QHumidityFilter::filter(QSensorReading *reading) +{ + return filter(static_cast<QHumidityReading*>(reading)); +} + +char const * const QHumiditySensor::type("QHumiditySensor"); + + +/*! + \class QHumiditySensor + \ingroup sensors_type + \inmodule QtSensors + \since 5.9 + + \brief The QHumiditySensor class is a convenience wrapper around QSensor. + + The only behavioural difference is that this class sets the type properly. + + This class also features a reading() function that returns a QHumidityReading instead of a QSensorReading. + + For details about how the sensor works, see \l QHumidityReading. + + \sa QHumidityReading +*/ + +/*! + Construct the sensor as a child of \a parent. +*/ +QHumiditySensor::QHumiditySensor(QObject *parent) + : QSensor(QHumiditySensor::type, parent) +{ +} + +/*! + Destroy the sensor. Stops the sensor if it has not already been stopped. +*/ +QHumiditySensor::~QHumiditySensor() +{ +} + +/*! + \fn QHumiditySensor::reading() const + + Returns the reading class for this sensor. + + \sa QSensor::reading() +*/ + +QHumidityReading *QHumiditySensor::reading() const +{ + return static_cast<QHumidityReading*>(QSensor::reading()); +} + +#include "moc_qhumiditysensor.cpp" +QT_END_NAMESPACE diff --git a/src/sensors/qhumiditysensor.h b/src/sensors/qhumiditysensor.h new file mode 100644 index 0000000..d916fb7 --- /dev/null +++ b/src/sensors/qhumiditysensor.h @@ -0,0 +1,91 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Canonical Ltd +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QHUMIDITYSENSOR_H +#define QHUMIDITYSENSOR_H + +#include <QtSensors/qsensor.h> + +QT_BEGIN_NAMESPACE + +class QHumidityReadingPrivate; + +class Q_SENSORS_EXPORT QHumidityReading : public QSensorReading +{ + Q_OBJECT + Q_PROPERTY(qreal relativeHumidity READ relativeHumidity) + Q_PROPERTY(qreal absoluteHumidity READ absoluteHumidity) + + DECLARE_READING(QHumidityReading) +public: + qreal relativeHumidity() const; + void setRelativeHumidity(qreal percent); + + qreal absoluteHumidity() const; + void setAbsoluteHumidity(qreal value); +}; + +class Q_SENSORS_EXPORT QHumidityFilter : public QSensorFilter +{ +public: + virtual bool filter(QHumidityReading *reading) = 0; +private: + bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; +}; + +class QHumiditySensorPrivate; + +class Q_SENSORS_EXPORT QHumiditySensor : public QSensor +{ + Q_OBJECT +public: + explicit QHumiditySensor(QObject *parent = Q_NULLPTR); + ~QHumiditySensor(); + + QHumidityReading *reading() const; + static char const * const type; + +private: + Q_DECLARE_PRIVATE(QHumiditySensor) + Q_DISABLE_COPY(QHumiditySensor) +}; + +QT_END_NAMESPACE + +#endif diff --git a/src/sensors/qhumiditysensor_p.h b/src/sensors/qhumiditysensor_p.h new file mode 100644 index 0000000..95b070e --- /dev/null +++ b/src/sensors/qhumiditysensor_p.h @@ -0,0 +1,82 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Canonical Ltd +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QHUMIDITYSENSOR_P_H +#define QHUMIDITYSENSOR_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qsensor_p.h" + +QT_BEGIN_NAMESPACE + +class QHumidityReadingPrivate +{ +public: + QHumidityReadingPrivate() + : relativeHumidity(0), + absoluteHumidity(0) + { + } + + qreal relativeHumidity; + qreal absoluteHumidity; +}; + +class QHumiditySensorPrivate : public QSensorPrivate +{ +public: + QHumiditySensorPrivate() + { + } + +}; + +QT_END_NAMESPACE + +#endif diff --git a/src/sensors/qlidsensor.cpp b/src/sensors/qlidsensor.cpp new file mode 100644 index 0000000..a759afd --- /dev/null +++ b/src/sensors/qlidsensor.cpp @@ -0,0 +1,182 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Canonical, Ltd +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include <qlidsensor.h> +#include "qlidsensor_p.h" + +QT_BEGIN_NAMESPACE + +IMPLEMENT_READING(QLidReading) + +/*! + \class QLidReading + \ingroup sensors_reading + \inmodule QtSensors + \since 5.9 + + \brief The QLidReading class holds readings from the Lid sensor. + + A normal laptop has what we call a front lid. + + If the laptop can be converted to a tablet by rotating or closing the lid + where the display is out, this is known as a back lid. + + \section2 QLidReading Units + The Lid sensor can detect if a device's lid is closed or not. A lid can be a laptop, + a laptop that converts to a tablet, or even a cover for a tablet or phone. +*/ + +/*! + \property QLidReading::backLidClosed + \brief A value indicating whether the back lid is closed. + A back lid can be when a convertable laptop is closed + into to tablet mode without keyboard. + + \sa {QLidReading Units} +*/ + +bool QLidReading::backLidClosed() const +{ + return d->backLidClosed; +} + +/*! + Sets the backLidClosed value to \a closed. +*/ +void QLidReading::setBackLidClosed(bool closed) +{ + d->backLidClosed = closed; +} + +/*! + \property QLidReading::frontLidClosed + \brief A value indicating whether the front lid is closed. + A front lid would be a normal laptop lid. + \sa {QLidReading Units} +*/ + +bool QLidReading::frontLidClosed() const +{ + return d->frontLidClosed; +} + +/*! + Sets the frontLidClosed value to \a closed. +*/ +void QLidReading::setFrontLidClosed(bool closed) +{ + d->frontLidClosed = closed; +} + +// ===================================================================== + +/*! + \class QLidFilter + \ingroup sensors_filter + \inmodule QtSensors + \since 5.9 + + \brief The QLidFilter class is a convenience wrapper around QSensorFilter. + + The only difference is that the filter() method features a pointer to QLidReading + instead of QSensorReading. +*/ + +/*! + \fn QLidFilter::filter(QLidReading *reading) + + Called when \a reading changes. Returns false to prevent the reading from propagating. + + \sa QSensorFilter::filter() +*/ + +bool QLidFilter::filter(QSensorReading *reading) +{ + return filter(static_cast<QLidReading*>(reading)); +} + +char const * const QLidSensor::type("QLidSensor"); + +/*! + \class QLidSensor + \ingroup sensors_type + \inmodule QtSensors + \since 5.9 + + \brief The QLidSensor class is a convenience wrapper around QSensor. + + The only behavioural difference is that this class sets the type properly. + + This class also features a reading() function that returns a QLidReading instead + of a QSensorReading. + + For details about how the sensor works, see \l QLidReading. + + \sa QLidReading +*/ + +/*! + Construct the sensor as a child of \a parent. +*/ +QLidSensor::QLidSensor(QObject *parent) + : QSensor(QLidSensor::type, parent) +{ +} + +/*! + Destroy the sensor. Stops the sensor if it has not already been stopped. +*/ +QLidSensor::~QLidSensor() +{ +} + +/*! + \fn QLidSensor::reading() const + + Returns the reading class for this sensor. + + \sa QSensor::reading() +*/ + +QLidReading *QLidSensor::reading() const +{ + return static_cast<QLidReading*>(QSensor::reading()); +} + +#include "moc_qlidsensor.cpp" +QT_END_NAMESPACE diff --git a/src/sensors/qlidsensor.h b/src/sensors/qlidsensor.h new file mode 100644 index 0000000..c0f88a7 --- /dev/null +++ b/src/sensors/qlidsensor.h @@ -0,0 +1,90 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Canonical, Ltd +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef QLIDSENSOR_H +#define QLIDSENSOR_H + +#include <QtSensors/qsensor.h> + +QT_BEGIN_NAMESPACE + +class QLidReadingPrivate; + +class Q_SENSORS_EXPORT QLidReading : public QSensorReading +{ + Q_OBJECT + Q_PROPERTY(bool backLidClosed READ backLidClosed) + Q_PROPERTY(bool frontLidClosed READ frontLidClosed) + DECLARE_READING(QLidReading) +public: + + bool backLidClosed() const; + void setBackLidClosed(bool closed); + + bool frontLidClosed() const; + void setFrontLidClosed(bool closed); + +Q_SIGNALS: + void backLidChanged(bool closed); + void frontLidChanged(bool closed); +}; + +class Q_SENSORS_EXPORT QLidFilter : public QSensorFilter +{ +public: + virtual bool filter(QLidReading *reading) = 0; +private: + bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; +}; + +class Q_SENSORS_EXPORT QLidSensor : public QSensor +{ + Q_OBJECT +public: + explicit QLidSensor(QObject *parent = Q_NULLPTR); + ~QLidSensor(); + QLidReading *reading() const; + static char const * const type; + +private: + Q_DISABLE_COPY(QLidSensor) +}; + +QT_END_NAMESPACE + +#endif diff --git a/src/sensors/qlidsensor_p.h b/src/sensors/qlidsensor_p.h new file mode 100644 index 0000000..93d3b99 --- /dev/null +++ b/src/sensors/qlidsensor_p.h @@ -0,0 +1,69 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Canonical, Ltd +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtSensors module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef QLIDSENSOR_P_H +#define QLIDSENSOR_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +QT_BEGIN_NAMESPACE + +class QLidReadingPrivate +{ +public: + QLidReadingPrivate() + : backLidClosed(false),frontLidClosed(false) + { + } + + bool backLidClosed; + bool frontLidClosed; +}; + +QT_END_NAMESPACE + +#endif diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro index 9eeceb8..e66d427 100644 --- a/src/sensors/sensors.pro +++ b/src/sensors/sensors.pro @@ -71,7 +71,9 @@ SENSORS=\ qtapsensor\ qtiltsensor\ qgyroscope\ - qpressuresensor + qpressuresensor \ + qhumiditysensor \ + qlidsensor for(s,SENSORS) { # Client API |