diff options
Diffstat (limited to 'src/sensorsquick/qmlhumiditysensor.cpp')
| -rw-r--r-- | src/sensorsquick/qmlhumiditysensor.cpp | 69 |
1 files changed, 17 insertions, 52 deletions
diff --git a/src/sensorsquick/qmlhumiditysensor.cpp b/src/sensorsquick/qmlhumiditysensor.cpp index 37bf7a18..915e81b6 100644 --- a/src/sensorsquick/qmlhumiditysensor.cpp +++ b/src/sensorsquick/qmlhumiditysensor.cpp @@ -1,48 +1,12 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 Canonical Ltd +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qmlhumiditysensor_p.h" #include <QtSensors/QHumiditySensor> /*! \qmltype HumiditySensor - \instantiates QmlHumiditySensor +//! \instantiates QmlHumiditySensor \ingroup qml-sensors_type \inqmlmodule QtSensors \since QtSensors 5.9 @@ -79,7 +43,7 @@ QSensor *QmlHumiditySensor::sensor() const /*! \qmltype HumidityReading - \instantiates QmlHumidityReading +//! \instantiates QmlHumidityReading \ingroup qml-sensors_reading \inqmlmodule QtSensors \since QtSensors 5.9 @@ -95,8 +59,7 @@ QSensor *QmlHumiditySensor::sensor() const */ QmlHumidityReading::QmlHumidityReading(QHumiditySensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) , m_relativeHumidity(0) , m_absoluteHumidity(0) { @@ -118,6 +81,11 @@ qreal QmlHumidityReading::relativeHumidity() const return m_relativeHumidity; } +QBindable<qreal> QmlHumidityReading::bindableRelativeHumidity() const +{ + return &m_relativeHumidity; +} + /*! \qmlproperty qreal HumidityReading::absoluteHumidity This property holds the absolute humidity in grams per cubic meter (g/m3). @@ -130,6 +98,11 @@ qreal QmlHumidityReading::absoluteHumidity() const return m_absoluteHumidity; } +QBindable<qreal> QmlHumidityReading::bindableAbsoluteHumidity() const +{ + return &m_absoluteHumidity; +} + QSensorReading *QmlHumidityReading::reading() const { return m_sensor->reading(); @@ -137,14 +110,6 @@ QSensorReading *QmlHumidityReading::reading() const void QmlHumidityReading::readingUpdate() { - qreal humidity = m_sensor->reading()->relativeHumidity(); - if (m_relativeHumidity != humidity) { - m_relativeHumidity = humidity; - Q_EMIT relativeHumidityChanged(); - } - qreal abs = m_sensor->reading()->absoluteHumidity(); - if (m_absoluteHumidity != abs) { - m_absoluteHumidity = abs; - Q_EMIT absoluteHumidityChanged(); - } + m_relativeHumidity = m_sensor->reading()->relativeHumidity(); + m_absoluteHumidity = m_sensor->reading()->absoluteHumidity(); } |