diff options
Diffstat (limited to 'src/sensorsquick/qmltiltsensor.cpp')
| -rw-r--r-- | src/sensorsquick/qmltiltsensor.cpp | 69 |
1 files changed, 17 insertions, 52 deletions
diff --git a/src/sensorsquick/qmltiltsensor.cpp b/src/sensorsquick/qmltiltsensor.cpp index 81b4e696..9f8e0335 100644 --- a/src/sensorsquick/qmltiltsensor.cpp +++ b/src/sensorsquick/qmltiltsensor.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company 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 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qmltiltsensor_p.h" #include <QtSensors/qtiltsensor.h> @@ -45,7 +9,7 @@ QT_END_NAMESPACE /*! \qmltype TiltSensor - \instantiates QmlTiltSensor +//! \instantiates QmlTiltSensor \ingroup qml-sensors_type \inqmlmodule QtSensors \since QtSensors 5.0 @@ -94,7 +58,7 @@ void QmlTiltSensor::calibrate() /*! \qmltype TiltReading - \instantiates QmlTiltSensorReading +//! \instantiates QmlTiltSensorReading \ingroup qml-sensors_reading \inqmlmodule QtSensors \since QtSensors 5.0 @@ -110,8 +74,7 @@ void QmlTiltSensor::calibrate() */ QmlTiltSensorReading::QmlTiltSensorReading(QTiltSensor *sensor) - : QmlSensorReading(sensor) - , m_sensor(sensor) + : m_sensor(sensor) { } @@ -131,6 +94,11 @@ qreal QmlTiltSensorReading::yRotation() const return m_yRotation; } +QBindable<qreal> QmlTiltSensorReading::bindableYRotation() const +{ + return &m_yRotation; +} + /*! \qmlproperty qreal TiltReading::xRotation This property holds the amount of tilt on the X axis. @@ -143,6 +111,11 @@ qreal QmlTiltSensorReading::xRotation() const return m_xRotation; } +QBindable<qreal> QmlTiltSensorReading::bindableXRotation() const +{ + return &m_xRotation; +} + QSensorReading *QmlTiltSensorReading::reading() const { return m_sensor->reading(); @@ -150,14 +123,6 @@ QSensorReading *QmlTiltSensorReading::reading() const void QmlTiltSensorReading::readingUpdate() { - qreal tiltY = m_sensor->reading()->yRotation(); - if (m_yRotation != tiltY) { - m_yRotation = tiltY; - Q_EMIT yRotationChanged(); - } - qreal tiltX = m_sensor->reading()->xRotation(); - if (m_xRotation != tiltX) { - m_xRotation = tiltX; - Q_EMIT xRotationChanged(); - } + m_yRotation = m_sensor->reading()->yRotation(); + m_xRotation = m_sensor->reading()->xRotation(); } |