diff options
Diffstat (limited to 'tests/manual/sensorclerk')
| -rw-r--r-- | tests/manual/sensorclerk/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | tests/manual/sensorclerk/collector.cpp | 31 | ||||
| -rw-r--r-- | tests/manual/sensorclerk/collector.h | 31 | ||||
| -rw-r--r-- | tests/manual/sensorclerk/main.cpp | 31 | ||||
| -rw-r--r-- | tests/manual/sensorclerk/qml/Button.qml | 117 | ||||
| -rw-r--r-- | tests/manual/sensorclerk/qml/main.qml | 39 | ||||
| -rw-r--r-- | tests/manual/sensorclerk/sensorclerk.pro | 11 |
7 files changed, 44 insertions, 244 deletions
diff --git a/tests/manual/sensorclerk/CMakeLists.txt b/tests/manual/sensorclerk/CMakeLists.txt new file mode 100644 index 00000000..18a487b3 --- /dev/null +++ b/tests/manual/sensorclerk/CMakeLists.txt @@ -0,0 +1,28 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +##################################################################### +## sensorclerk Binary: +##################################################################### + +qt_internal_add_manual_test(tst_manual_sensor_clerk + GUI + SOURCES + collector.cpp collector.h + main.cpp + LIBRARIES + Qt::Gui + Qt::Quick + Qt::Sensors +) + +set(qml_files + "qml/main.qml" +) + +qt_internal_add_resource(tst_manual_sensor_clerk "qml_files" + PREFIX + "/" + FILES + ${qml_files} +) diff --git a/tests/manual/sensorclerk/collector.cpp b/tests/manual/sensorclerk/collector.cpp index 98e1ccad..4ebc7203 100644 --- a/tests/manual/sensorclerk/collector.cpp +++ b/tests/manual/sensorclerk/collector.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Lorn Potter. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtSensors module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 Lorn Potter. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQml/qqml.h> #include <QtCore/QFile> @@ -135,7 +110,7 @@ void Collector::startCollecting() { if (dataFile.exists()) { fileCounter++; - for (int i = 0; i < fileCounter; i++) { + for (size_t i = 0; i < fileCounter; i++) { if (!QFileInfo(QString(QDir::tempPath()+"/sensordump_%1.dat").arg(fileCounter)).exists()) dataFile.setFileName(QString(QDir::tempPath()+"/sensordump_%1.dat").arg(fileCounter)); break; diff --git a/tests/manual/sensorclerk/collector.h b/tests/manual/sensorclerk/collector.h index 855c5843..0f1098c9 100644 --- a/tests/manual/sensorclerk/collector.h +++ b/tests/manual/sensorclerk/collector.h @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Lorn Potter. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtSensors module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 Lorn Potter. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef COLLECTOR_H #define COLLECTOR_H @@ -68,7 +43,7 @@ private: QFile dataFile; bool isActive; - int fileCounter; + size_t fileCounter; Q_DISABLE_COPY(Collector) }; diff --git a/tests/manual/sensorclerk/main.cpp b/tests/manual/sensorclerk/main.cpp index 9265dcc8..468f1d88 100644 --- a/tests/manual/sensorclerk/main.cpp +++ b/tests/manual/sensorclerk/main.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Lorn Potter. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtSensors module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 Lorn Potter. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QGuiApplication> #include <QtQuick/QQuickView> @@ -40,7 +15,7 @@ int main( int argc, char** argv ) qmlRegisterType<Collector>("Collector", 1, 0, "Collector"); QQuickView view; view.setResizeMode(QQuickView::SizeRootObjectToView); - view.setSource( QUrl( "qml/main.qml" ) ); + view.setSource(QUrl("qrc:qml/main.qml")); view.show(); return app.exec(); } diff --git a/tests/manual/sensorclerk/qml/Button.qml b/tests/manual/sensorclerk/qml/Button.qml deleted file mode 100644 index 0889e07b..00000000 --- a/tests/manual/sensorclerk/qml/Button.qml +++ /dev/null @@ -1,117 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//Import the declarative plugins -import QtQuick 2.0 - -//Implementation of the Button control. -Item { - id: button - width: 250 - height: 150 - property alias text: innerText.text; - property color color: "white" - property color hoverColor: "#aaaaaa" - property color pressColor: "slategray" - property int fontSize: 10 - property int borderWidth: 1 - property int borderRadius: 2 - scale: state === "Pressed" ? 0.96 : 1.0 - onEnabledChanged: state = "" - signal clicked - - //define a scale animation - Behavior on scale { - NumberAnimation { - duration: 100 - easing.type: Easing.InOutQuad - } - } - - //Rectangle to draw the button - Rectangle { - id: rectangleButton - anchors.fill: parent - radius: borderRadius - color: button.enabled ? button.color : "grey" - border.width: borderWidth - border.color: "black" - - Text { - id: innerText - font.pointSize: fontSize - anchors.centerIn: parent - } - } - - //change the color of the button in differen button states - states: [ - State { - name: "Hovering" - PropertyChanges { - target: rectangleButton - color: hoverColor - } - }, - State { - name: "Pressed" - PropertyChanges { - target: rectangleButton - color: pressColor - } - } - ] - - //define transmission for the states - transitions: [ - Transition { - from: ""; to: "Hovering" - ColorAnimation { duration: 200 } - }, - Transition { - from: "*"; to: "Pressed" - ColorAnimation { duration: 10 } - } - ] - - //Mouse area to react on click events - MouseArea { - hoverEnabled: true - anchors.fill: button - onEntered: { button.state='Hovering'} - onExited: { button.state=''} - onClicked: { button.clicked();} - onPressed: { button.state="Pressed" } - onReleased: { - if (containsMouse) - button.state="Hovering"; - else - button.state=""; - } - } -} diff --git a/tests/manual/sensorclerk/qml/main.qml b/tests/manual/sensorclerk/qml/main.qml index e8b74ff2..0853599c 100644 --- a/tests/manual/sensorclerk/qml/main.qml +++ b/tests/manual/sensorclerk/qml/main.qml @@ -1,34 +1,9 @@ -/**************************************************************************** -** -** Copyright (C) 2017 Lorn Potter. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtSensors module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** 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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import Collector 1.0 -import QtSensors 5.0 +// Copyright (C) 2017 Lorn Potter. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +import QtQuick +import QtQuick.Controls +import Collector +import QtSensors Rectangle { Collector { @@ -47,7 +22,7 @@ Rectangle { property bool depressed: false anchors.top: label.bottom enabled: true; - anchors.horizontalCenter: parent + anchors.horizontalCenter: parent.horizontalCenter onClicked: { if (!depressed) { writer.startCollecting() diff --git a/tests/manual/sensorclerk/sensorclerk.pro b/tests/manual/sensorclerk/sensorclerk.pro deleted file mode 100644 index 61eeef15..00000000 --- a/tests/manual/sensorclerk/sensorclerk.pro +++ /dev/null @@ -1,11 +0,0 @@ -TEMPLATE = app - -QT += quick sensors - -SOURCES += main.cpp \ - collector.cpp - -HEADERS += collector.h - -OTHER_FILES += qml/main.qml \ - qml/Button.qml |