diff options
376 files changed, 1360 insertions, 20316 deletions
diff --git a/.cmake.conf b/.cmake.conf index 02aefcb2..dc1d7a92 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1,2 +1,5 @@ -set(QT_REPO_MODULE_VERSION "6.5.0") +set(QT_REPO_MODULE_VERSION "6.8.0") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") +set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") +list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") +list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_CONTEXTLESS_CONNECT=1") diff --git a/CMakeLists.txt b/CMakeLists.txt index 63ba2153..c447bd34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16) @@ -17,5 +17,6 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Co find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS Xml Gui Widgets Quick Qml Svg DBus QuickTest ) +qt_internal_project_setup() qt_build_repo() diff --git a/cmake/FindSensorfw.cmake b/cmake/FindSensorfw.cmake index 3507adc2..c6238a92 100644 --- a/cmake/FindSensorfw.cmake +++ b/cmake/FindSensorfw.cmake @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause find_package(PkgConfig) if (PKG_CONFIG_FOUND) diff --git a/coin/axivion/ci_config_linux.json b/coin/axivion/ci_config_linux.json new file mode 100644 index 00000000..f806cff6 --- /dev/null +++ b/coin/axivion/ci_config_linux.json @@ -0,0 +1,44 @@ +{ + "Project": { + "BuildSystemIntegration": { + "child_order": [ + "GCCSetup", + "CMake", + "LinkLibraries" + ] + }, + "CMake": { + "_active": true, + "_copy_from": "CMakeIntegration", + "build_environment": {}, + "build_options": "-j4", + "generate_options": "--fresh", + "generator": "Ninja" + }, + "GCCSetup": { + "_active": true, + "_copy_from": "Command", + "build_command": "gccsetup --cc gcc --cxx g++ --config ../../../axivion/" + }, + "LinkLibraries": { + "_active": true, + "_copy_from": "AxivionLinker", + "input_files": [ + "build/lib/lib*.so*.ir", + "build/qml/*/lib*.so*.ir" + ], + "ir": "build/$(env:TESTED_MODULE_COIN).ir", + "plugin_files": [ + "build/plugins/*/lib*.so*.ir" + ] + } + }, + "_Format": "1.0", + "_Version": "7.6.2", + "_VersionNum": [ + 7, + 6, + 2, + 12725 + ] +} diff --git a/conanfile.py b/conanfile.py deleted file mode 100644 index 863f926a..00000000 --- a/conanfile.py +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (C) 2021 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -from conans import ConanFile -import re -from pathlib import Path - - -def _parse_qt_version_by_key(key: str) -> str: - with open(Path(__file__).parent.resolve() / ".cmake.conf") as f: - m = re.search(fr'{key} .*"(.*)"', f.read()) - return m.group(1) if m else "" - - -def _get_qt_minor_version() -> str: - return ".".join(_parse_qt_version_by_key("QT_REPO_MODULE_VERSION").split(".")[:2]) - - -class QtSensors(ConanFile): - name = "qtsensors" - license = "LGPL-3.0, GPL-2.0+, Commercial Qt License Agreement" - author = "The Qt Company <https://www.qt.io/contact-us>" - url = "https://code.qt.io/cgit/qt/qtsensors.git" - description = ( - "The Qt Sensors API provides access to sensor hardware via QML and C++ interfaces. " - ) - topics = "qt", "qt6", "sensor" - settings = "os", "compiler", "arch", "build_type" - # for referencing the version number and prerelease tag and dependencies info - exports = ".cmake.conf", "dependencies.yaml" - exports_sources = "*", "!conan*.*" - python_requires = f"qt-conan-common/{_get_qt_minor_version()}@qt/everywhere" - python_requires_extend = "qt-conan-common.QtLeafModule" diff --git a/config.tests/winrt/CMakeLists.txt b/config.tests/winrt/CMakeLists.txt index ecc6a882..25b871ce 100644 --- a/config.tests/winrt/CMakeLists.txt +++ b/config.tests/winrt/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(config_test_winrt LANGUAGES C CXX) diff --git a/config.tests/winrt/main.cpp b/config.tests/winrt/main.cpp index bef9c9d5..556efa61 100644 --- a/config.tests/winrt/main.cpp +++ b/config.tests/winrt/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: BSD-3-Clause #include <functional> #include <windows.system.h> diff --git a/configure.cmake b/configure.cmake index 5c9c2763..68f54ce7 100644 --- a/configure.cmake +++ b/configure.cmake @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause diff --git a/dependencies.yaml b/dependencies.yaml index ec72a0d2..9a7ed7f9 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 1b96b645ec848ce911ecedbbb31d21b1b2c9d58b + ref: 488545ca72b7f2a59401a42c2c264f38916e15d1 required: true ../qtdeclarative: - ref: 384ba7dfa83b1680d435d4924e9098adcbfdf654 + ref: 22f72aa17118346059179fc3e86a6ece7b7bfb7f required: false diff --git a/examples/sensors/CMakeLists.txt b/examples/sensors/CMakeLists.txt index 32c68190..bf1120c8 100644 --- a/examples/sensors/CMakeLists.txt +++ b/examples/sensors/CMakeLists.txt @@ -1,18 +1,6 @@ # Copyright (C) 2022 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -if(TARGET Qt::Quick) - qt_internal_add_example(grue) - qt_internal_add_example(maze) -# qt_internal_add_example(qmlsensorgestures) - qt_internal_add_example(qmlqtsensors) - qt_internal_add_example(sensor_explorer) -# qt_internal_add_example(shakeit) - if(TARGET Qt::Svg) - qt_internal_add_example(accelbubble) - qt_internal_add_example(sensorsshowcase) - endif() +if(TARGET Qt::Quick AND TARGET Qt::Svg) + qt_internal_add_example(sensorsshowcase) endif() -# if(TARGET Qt::Widgets) -# qt_internal_add_example(sensorgestures) -# endif() diff --git a/examples/sensors/accelbubble/CMakeLists.txt b/examples/sensors/accelbubble/CMakeLists.txt deleted file mode 100644 index da746bdd..00000000 --- a/examples/sensors/accelbubble/CMakeLists.txt +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(accelbubble LANGUAGES CXX) - -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/sensors/accelbubble") - -find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Sensors Svg Xml) - -qt_add_executable(accelbubble - main.cpp -) - -set_target_properties(accelbubble PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -if(ANDROID) - set_property(TARGET accelbubble PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR - ${CMAKE_CURRENT_SOURCE_DIR}/android) - endif() -if(APPLE) - if(IOS) - set_property(TARGET accelbubble PROPERTY - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist" - ) - endif() -endif() - -target_link_libraries(accelbubble PUBLIC - Qt::Core - Qt::Gui - Qt::Quick - Qt::Sensors - Qt::Svg - Qt::Xml -) - -# Resources: -set(accelbubble_resource_files - "accelbubble.qml" - "content/Bluebubble.svg" -) - -qt6_add_resources(accelbubble "accelbubble" - PREFIX - "/" - FILES - ${accelbubble_resource_files} -) - -install(TARGETS accelbubble - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/sensors/accelbubble/Info.plist b/examples/sensors/accelbubble/Info.plist deleted file mode 100644 index 90725455..00000000 --- a/examples/sensors/accelbubble/Info.plist +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleDisplayName</key> - <string>accelbubble</string> - <key>CFBundleExecutable</key> - <string>accelbubble</string> - <key>CFBundleGetInfoString</key> - <string>Created by Qt/QMake</string> - <key>CFBundleIdentifier</key> - <string>com.digia.accelbubble</string> - <key>CFBundleName</key> - <string>accelbubble</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleShortVersionString</key> - <string>1.0</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>CFBundleVersion</key> - <string>1.0</string> - <key>LSRequiresIPhoneOS</key> - <true/> - <key>NOTE</key> - <string>This file was generated by Qt/QMake.</string> - <key>UILaunchStoryboardName</key> - <string>LaunchScreen</string> - <key>UISupportedInterfaceOrientations</key> - <array> - <string>UIInterfaceOrientationPortrait</string> - </array> -</dict> -</plist> diff --git a/examples/sensors/accelbubble/accelbubble.pro b/examples/sensors/accelbubble/accelbubble.pro deleted file mode 100644 index d3b20a9d..00000000 --- a/examples/sensors/accelbubble/accelbubble.pro +++ /dev/null @@ -1,28 +0,0 @@ -TEMPLATE = app -TARGET = accelbubble -QT += quick sensors svg xml -SOURCES = main.cpp - -RESOURCES += \ - accelbubble.qrc - -OTHER_FILES = \ - $$files(*.qml) \ - content \ - images \ - android/AndroidManifest.xml - -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/accelbubble -INSTALLS += target - -ios { -QMAKE_INFO_PLIST = Info.plist - -# manual plugin loading needed with older Qt -# QTPLUGIN += qsvg qtsensors_ios qtsensors_generic -} - -ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android - -EXAMPLE_FILES += \ - Info.plist diff --git a/examples/sensors/accelbubble/accelbubble.qml b/examples/sensors/accelbubble/accelbubble.qml deleted file mode 100644 index 65901169..00000000 --- a/examples/sensors/accelbubble/accelbubble.qml +++ /dev/null @@ -1,86 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - - -import QtQuick -import QtQuick.Controls - -//! [0] -import QtSensors -//! [0] - - -ApplicationWindow { - title: "Accelerate Bubble" - id: mainWindow - width: 320 - height: 480 - visible: true - readonly property double radians_to_degrees: 180 / Math.PI - -//! [1] - Accelerometer { - id: accel - dataRate: 100 -//! [1] -//! [2] - active:true -//! [2] - -//! [3] - onReadingChanged: { - var newX = (bubble.x + calcRoll(accel.reading.x, accel.reading.y, accel.reading.z) * .1) - var newY = (bubble.y - calcPitch(accel.reading.x, accel.reading.y, accel.reading.z) * .1) - - if (isNaN(newX) || isNaN(newY)) - return; - - if (newX < 0) - newX = 0 - - if (newX > mainWindow.width - bubble.width) - newX = mainWindow.width - bubble.width - - if (newY < 18) - newY = 18 - - if (newY > mainWindow.height - bubble.height) - newY = mainWindow.height - bubble.height - - bubble.x = newX - bubble.y = newY - } -//! [3] - } - - function calcPitch(x,y,z) { - return -Math.atan2(y, Math.hypot(x, z)) * mainWindow.radians_to_degrees; - } - function calcRoll(x,y,z) { - return -Math.atan2(x, Math.hypot(y, z)) * mainWindow.radians_to_degrees; - } - - Image { - id: bubble - source: "content/Bluebubble.svg" - smooth: true - property real centerX: mainWindow.width / 2 - property real centerY: mainWindow.height / 2 - property real bubbleCenter: bubble.width / 2 - x: centerX - bubbleCenter - y: centerY - bubbleCenter - - Behavior on y { - SmoothedAnimation { - easing.type: Easing.Linear - duration: 100 - } - } - Behavior on x { - SmoothedAnimation { - easing.type: Easing.Linear - duration: 100 - } - } - } -} diff --git a/examples/sensors/accelbubble/accelbubble.qrc b/examples/sensors/accelbubble/accelbubble.qrc deleted file mode 100644 index 5cb6945a..00000000 --- a/examples/sensors/accelbubble/accelbubble.qrc +++ /dev/null @@ -1,6 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>accelbubble.qml</file> - <file>content/Bluebubble.svg</file> - </qresource> -</RCC> diff --git a/examples/sensors/accelbubble/android/AndroidManifest.xml b/examples/sensors/accelbubble/android/AndroidManifest.xml deleted file mode 100644 index 537c705e..00000000 --- a/examples/sensors/accelbubble/android/AndroidManifest.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.qtproject.example.accelbubble" - android:installLocation="auto" - android:versionCode="1" - android:versionName="1.0"> - <!-- The comment below will be replaced with dependencies permissions upon deployment. - Remove the comment if you do not require these default permissions. --> - <!-- %%INSERT_PERMISSIONS --> - - <!-- The comment below will be replaced with dependencies permissions upon deployment. - Remove the comment if you do not require these default features. --> - <!-- %%INSERT_FEATURES --> - - <supports-screens - android:anyDensity="true" - android:largeScreens="true" - android:normalScreens="true" - android:smallScreens="true" /> - <application - android:name="org.qtproject.qt.android.bindings.QtApplication" - android:extractNativeLibs="true" - android:hardwareAccelerated="true" - android:label="-- %%INSERT_APP_NAME%% --" - android:requestLegacyExternalStorage="true"> - <activity - android:name="org.qtproject.qt.android.bindings.QtActivity" - android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" - android:label="-- %%INSERT_APP_NAME%% --" - android:launchMode="singleTop" - android:screenOrientation="portrait"> - <intent-filter> - <action android:name="android.intent.action.MAIN"/> - <category android:name="android.intent.category.LAUNCHER"/> - </intent-filter> - <meta-data - android:name="android.app.lib_name" - android:value="-- %%INSERT_APP_LIB_NAME%% --" /> - <meta-data - android:name="android.app.background_running" - android:value="false" /> - <meta-data - android:name="android.app.extract_android_style" - android:value="minimal" /> - </activity> - </application> -</manifest> diff --git a/examples/sensors/accelbubble/content/Bluebubble.svg b/examples/sensors/accelbubble/content/Bluebubble.svg deleted file mode 100644 index d9c406c4..00000000 --- a/examples/sensors/accelbubble/content/Bluebubble.svg +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny"> - <defs> - <radialGradient id="grad1" cx="0.5" cy="0.7" r="0.7" fx="0.5" fy="0.4"> - <stop offset="0" style="stop-color:rgb(255,255,255)" /> - <stop offset="1.5" style="stop-color:rgb(0,102,153)" /> - </radialGradient> - </defs> - <circle cx="100" cy="80" r="42" fill="url(#grad1)"/> -</svg> diff --git a/examples/sensors/accelbubble/doc/images/accelbubble.png b/examples/sensors/accelbubble/doc/images/accelbubble.png Binary files differdeleted file mode 100644 index ad4cfc07..00000000 --- a/examples/sensors/accelbubble/doc/images/accelbubble.png +++ /dev/null diff --git a/examples/sensors/accelbubble/doc/src/accelbubble.qdoc b/examples/sensors/accelbubble/doc/src/accelbubble.qdoc deleted file mode 100644 index 527d82fb..00000000 --- a/examples/sensors/accelbubble/doc/src/accelbubble.qdoc +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example accelbubble - \title Qt Sensors - Accel Bubble - \brief The AccelBubble example demonstrates the Accelerometer QML type. - \ingroup qtsensors-examples - - \image accelbubble.png - -\section1 Overview - Writing a QML application that uses the Accelerometer QML sensors type requires the following steps: - - Import the Sensors Declarative module. - -\snippet accelbubble/accelbubble.qml 0 - - Add an Accelerometer QML type. - -\snippet accelbubble/accelbubble.qml 1 - - Use the 'active' property to start the sensor - -\snippet accelbubble/accelbubble.qml 2 - - Move the bubble according to a factor of the accelerator sensor - -\snippet accelbubble/accelbubble.qml 3 - -*/ - diff --git a/examples/sensors/accelbubble/main.cpp b/examples/sensors/accelbubble/main.cpp deleted file mode 100644 index ad71fc00..00000000 --- a/examples/sensors/accelbubble/main.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - - -#include <QtGui/QGuiApplication> -#include <QtQml/QQmlApplicationEngine> - -int main(int argc, char *argv[]) -{ - QGuiApplication app(argc,argv); - QQmlApplicationEngine engine(QUrl("qrc:///accelbubble.qml")); - - return app.exec(); -} diff --git a/examples/sensors/grue/CMakeLists.txt b/examples/sensors/grue/CMakeLists.txt deleted file mode 100644 index 55e234ce..00000000 --- a/examples/sensors/grue/CMakeLists.txt +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(grue_app LANGUAGES CXX) - -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/sensors/grue") - -find_package(Qt6 REQUIRED COMPONENTS Quick Sensors) - -qt_add_executable(grue_app - main.cpp qmlgruesensor.h qmlgruesensor.cpp -) - -set_target_properties(grue_app PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(grue_app PUBLIC - Qt::Quick - Qt::Sensors -) - -qt6_add_qml_module(grue_app - VERSION 1.0 - URI "QMLGrueSensor" - QML_FILES - grue.qml - RESOURCES - grue.png -) - -add_subdirectory(plugin) - -# Need to link to the plugin manually in a static Qt build. -if(NOT QT6_IS_SHARED_LIBS_BUILD) - target_link_libraries(grue_app PRIVATE qtsensors_grue) - target_sources(grue_app PRIVATE grue_plugin_import_custom.cpp) -endif() - -set(build_console_app TRUE) - -# The console app is not a macos bundle, so the shared library plugin wouldn't be found -if(APPLE AND QT6_IS_SHARED_LIBS_BUILD) - set(build_console_app FALSE) -endif() - -# Gui-less apps don't make sense for these platforms -if(IOS OR EMSCRIPTEN OR ANDROID) - set(build_console_app FALSE) -endif() - -if(build_console_app) - add_subdirectory(console_app) -endif() - -install(TARGETS grue_app - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/sensors/grue/console_app/CMakeLists.txt b/examples/sensors/grue/console_app/CMakeLists.txt deleted file mode 100644 index c7134be2..00000000 --- a/examples/sensors/grue/console_app/CMakeLists.txt +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(detect_grue LANGUAGES CXX) - -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/sensors/grue") - -find_package(Qt6 REQUIRED COMPONENTS Core Sensors) - -qt_add_executable(detect_grue - main.cpp -) - -set_target_properties(detect_grue PROPERTIES - WIN32_EXECUTABLE FALSE - MACOSX_BUNDLE FALSE -) - -if(WIN32 OR (UNIX AND NOT APPLE)) - set_target_properties(detect_grue PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/.. - ) -endif() - -target_link_libraries(detect_grue PUBLIC - Qt::Core - Qt::Sensors -) - -# Need to link to the plugin manually in a static Qt build. -if(NOT QT6_IS_SHARED_LIBS_BUILD) - target_link_libraries(detect_grue PRIVATE qtsensors_grue) - target_sources(detect_grue PRIVATE ../grue_plugin_import_custom.cpp) -endif() - -install(TARGETS detect_grue - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/sensors/grue/console_app/console_app.pro b/examples/sensors/grue/console_app/console_app.pro deleted file mode 100644 index 97021f1d..00000000 --- a/examples/sensors/grue/console_app/console_app.pro +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE = app -TARGET = detect_grue -CONFIG += console -CONFIG -= app_bundle -QT = core sensors - -DESTDIR = $$OUT_PWD/.. - -SOURCES = main.cpp - -grue_plugin_base_dir = .. -include(../use_grue_static_plugin.pri) - -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/grue -INSTALLS += target - -CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/sensors/grue/console_app/main.cpp b/examples/sensors/grue/console_app/main.cpp deleted file mode 100644 index 7de66334..00000000 --- a/examples/sensors/grue/console_app/main.cpp +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include <QtCore> -#include <qsensor.h> - -class Filter : public QSensorFilter -{ - int lastPercent; -public: - Filter() - : QSensorFilter() - , lastPercent(0) - { - } - - bool filter(QSensorReading *reading) override - { - int percent = reading->property("chanceOfBeingEaten").value<int>(); - if (percent == 0) { - qDebug() << "It is light. You are safe from Grues."; - } else if (lastPercent == 0) { - qDebug() << "It is dark. You are likely to be eaten by a Grue."; - } - if (percent == 100) { - qDebug() << "You have been eaten by a Grue!"; - QCoreApplication::instance()->quit(); - } else if (percent) - qDebug() << "Your chance of being eaten by a Grue:" << percent << "percent."; - lastPercent = percent; - return false; - } -}; - -int main(int argc, char **argv) -{ - QCoreApplication app(argc, argv); - - QSensor sensor("GrueSensor"); - - Filter filter; - sensor.addFilter(&filter); - sensor.start(); - - if (!sensor.isActive()) { - qWarning("The Grue sensor didn't start. You're on your own!"); - return 1; - } - - return app.exec(); -} - diff --git a/examples/sensors/grue/doc/images/qtsensors-examples-grue.png b/examples/sensors/grue/doc/images/qtsensors-examples-grue.png Binary files differdeleted file mode 100644 index f4348271..00000000 --- a/examples/sensors/grue/doc/images/qtsensors-examples-grue.png +++ /dev/null diff --git a/examples/sensors/grue/doc/src/grue.qdoc b/examples/sensors/grue/doc/src/grue.qdoc deleted file mode 100644 index f187865a..00000000 --- a/examples/sensors/grue/doc/src/grue.qdoc +++ /dev/null @@ -1,113 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example grue - \title Qt Sensors - Grue Sensor Example - \brief The Qt Sensors - Grue sensor example demonstrates all the steps from - creating a new sensor to using it. - \ingroup qtsensors-examples - - \image qtsensors-examples-grue.png - - The sensor definition and implementation are in a new sensor plugin that client - apps can use for detecting Grues (imaginary monsters that live in the dark). - - \list - \li \l{Grue Sensor Plugin} - \endlist - - The sensor plugin can be used by C++ applications as shown in the console - application example. - - \list - \li \l{Grue Sensor Console Application} - \endlist - - QML applications can use the new sensor by importing the QMLGrueSensor class. - - \list - \li \l{Grue Sensor QML Application} - \endlist - - \section1 Grue Sensor Plugin - - The Grue sensor is defined in a new sensor plugin that applications can use. - - The plugin provides the sensor reading property that describes your chance of - being eaten. This chance is increasing in the dark until it is 100% when - you are eaten by the Grue and at that point the plugin stops further processing. - In case of the plugin receiving light again before that happens the chance of - being eaten resets to 0%. - - This example was created using the make_sensor.pl script which can be found in - src/sensors. As such, it contains some generated code that defines the convenience - classes GrueFilter and GrueSensor. - - \section1 Grue Sensor Implementation - - The Grue sensor implementation lives in the plugin that is loaded by the Qt - Sensors library. The source code is available in the \c{grue/plugin} subdirectory. - - The Grue sensor needs a backend before it can be used. The backend provided - is rather basic and it relies on some kind of light sensor to work but it - gets the job done. If new hardware that can detect the actual presence of Grues - becomes available a backend could be created that supports this hardware and - applications using the Grue sensor would be able to use it without any changes. - - There are a few mandatory parts to a backend. They are the start and stop methods - and the setReading call. The start and stop methods are used to start and stop - any underlying hardware. In the case of this backend they start and stop a - light sensor. In the start method, the backend should call the \c{sensorStopped()} - or \c{sensorBusy()} methods if it cannot start. - - \snippet grue/plugin/gruesensorimpl.cpp start - - The setReading method is needed so that the sensors library knows where the - readings are coming from. This backend has a local copy of the reading so - it passes a pointer to the function. - - \snippet grue/plugin/gruesensorimpl.cpp setReading - - However it is also possible to pass null to the setReading method in which - case the sensors library will create an instance and return a pointer. - - \code - // Create a reading instance for us to use - m_reading = setReading<GrueSensorReading>(0); - \endcode - - The Grue sensor backend also supplies some metadata. - - The backend checks 2 things, how dark it is and how long you have been in the dark. - It uses the \c{readingChanged()} signal to know when to check the light sensor's - value. Once it is dark, it uses a timer to increase your chance of being eaten. - - The Grue sensor backend is delivered as a plugin. The plugin has a factory object - that registers the types available and does the actual instantiation of the backend. - - \section1 Grue Sensor Console Application - - The Grue sensor console application demonstrates use of the Grue sensor. - The source code is available in the \c{grue/console_app} subdirectory. - - This is a simple commandline application. It demonstrates how to use the generic - access feature of Qt Sensors to avoid a link-time dependency on a library. - - \section1 Grue Sensor C++ Class Registration for QML - - The QMLGrueSensor class is registered for QML, so the class name can be used - as an import and the class properties can be accessed from QML. - - \section1 Grue Sensor QML Application - - The Grue sensor QML application demonstrates the use of QMLGrueSensor QML type. - - The application consists of a single QML file and an image. It is built as an - executable with C++ code that runs the QML, but it can also be launched directly - using the \c qmlscene tool. - - \code - qmlscene -I . grue.qml - \endcode -*/ diff --git a/examples/sensors/grue/grue.png b/examples/sensors/grue/grue.png Binary files differdeleted file mode 100644 index 2727d393..00000000 --- a/examples/sensors/grue/grue.png +++ /dev/null diff --git a/examples/sensors/grue/grue.pro b/examples/sensors/grue/grue.pro deleted file mode 100644 index cd23d1f4..00000000 --- a/examples/sensors/grue/grue.pro +++ /dev/null @@ -1,13 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += plugin - -# Gui-less apps don't make sense for these platforms -!uikit:!android:!wasm: SUBDIRS += console_app - -# There console app is not a macos bundle, so the shared library plugin wouldn't be found -macos:qtConfig(shared): SUBDIRS -= console_app - -qtHaveModule(quick): SUBDIRS += qml.pro - - diff --git a/examples/sensors/grue/grue.qml b/examples/sensors/grue/grue.qml deleted file mode 100644 index d3a90aa8..00000000 --- a/examples/sensors/grue/grue.qml +++ /dev/null @@ -1,79 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -import QtQuick -import QtSensors -import QtQuick.Layouts -import QMLGrueSensor - -Rectangle { - id: root - anchors.fill: parent - color: "black" - - property int percent: -1 - property string text: "" - property real grueOpacity: 0.0 - - function updateStatus(newPercent, newOpacity, newText) { - if (root.percent === newPercent) - return; - - // Delay updating the visual status to prevent flicker - timer.interval = (newPercent < root.percent) ? 500 : 0; - - root.percent = newPercent; - root.text = newText; - root.grueOpacity = newOpacity; - - timer.start() - } - - Timer { - id: timer - running: false - repeat: false - onTriggered: { - text.text = root.text - grueimg.opacity = root.grueOpacity - } - } - - QMLGrueSensor { - id: sensor - active: true - onReadingChanged: { - var percent = reading.chanceOfBeingEaten; - if (percent === 0) { - updateStatus(percent, 0.0, "It is light.<br>You are safe from Grues."); - } - else if (percent === 100) { - updateStatus(percent, 1.0, "You have been eaten by a Grue!"); - sensor.active = false; - } - else if (percent > 0) { - updateStatus(percent, 0.05 + (percent * 0.001), - "It is dark.<br>You are " + percent +" % " + - "likely to be eaten by a Grue."); - } - } - } - - Text { - id: text - anchors.fill: parent - wrapMode: Text.WordWrap - text: "I can't tell if you're going to be eaten by a Grue or not. You're on your own!" - font.pixelSize: 30 - color: "lightgray" - } - - Image { - id: grueimg - anchors.bottom: parent.bottom - anchors.horizontalCenter: parent.horizontalCenter - source: "grue.png" - opacity: 0.0 - Behavior on opacity { PropertyAnimation { duration: 250 } } - } -} diff --git a/examples/sensors/grue/grue.xcf b/examples/sensors/grue/grue.xcf Binary files differdeleted file mode 100644 index 2837ed7e..00000000 --- a/examples/sensors/grue/grue.xcf +++ /dev/null diff --git a/examples/sensors/grue/grue_plugin_import_custom.cpp b/examples/sensors/grue/grue_plugin_import_custom.cpp deleted file mode 100644 index 0dcf6a1a..00000000 --- a/examples/sensors/grue/grue_plugin_import_custom.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include <QtPlugin> -Q_IMPORT_PLUGIN(GrueSensorPlugin) diff --git a/examples/sensors/grue/icon.xcf b/examples/sensors/grue/icon.xcf Binary files differdeleted file mode 100644 index 8416c49f..00000000 --- a/examples/sensors/grue/icon.xcf +++ /dev/null diff --git a/examples/sensors/grue/main.cpp b/examples/sensors/grue/main.cpp deleted file mode 100644 index af119c5a..00000000 --- a/examples/sensors/grue/main.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include <QGuiApplication> -#include <QQuickView> - -int main(int argc, char **argv) -{ - QGuiApplication app(argc,argv); - QQuickView view; - view.setSource(QUrl("qrc:/QMLGrueSensor/grue.qml")); - view.show(); - return app.exec(); -} diff --git a/examples/sensors/grue/plugin/CMakeLists.txt b/examples/sensors/grue/plugin/CMakeLists.txt deleted file mode 100644 index 26b5d624..00000000 --- a/examples/sensors/grue/plugin/CMakeLists.txt +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(qtsensors_grue LANGUAGES CXX) - -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/sensors/grue/sensors") - -find_package(Qt6 REQUIRED COMPONENTS Core Sensors) - -qt_add_plugin(qtsensors_grue - PLUGIN_TYPE sensors -) - -target_sources(qtsensors_grue PRIVATE - gruesensorimpl.cpp gruesensorimpl.h - gruesensor.cpp gruesensor.h gruesensor_p.h - main.cpp -) - -set_target_properties(qtsensors_grue PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -if(WIN32 OR (UNIX AND NOT APPLE)) - set_target_properties(qtsensors_grue PROPERTIES - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../sensors - ) -endif() - -if(APPLE AND QT6_IS_SHARED_LIBS_BUILD) - set_target_properties(qtsensors_grue PROPERTIES - LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../grue_app.app/Contents/Plugins/sensors - ) -endif() - -target_link_libraries(qtsensors_grue PUBLIC - Qt::Core - Qt::Sensors -) - -if(ANDROID) - add_custom_target(gruesensorplugin_android_copy ALL - COMMAND "${CMAKE_COMMAND}" - -E copy_if_different - "$<TARGET_FILE:qtsensors_grue>" - "${CMAKE_CURRENT_BINARY_DIR}/../android-build/libs/${CMAKE_ANDROID_ARCH_ABI}/$<TARGET_FILE_NAME:qtsensors_grue>" - COMMENT "Copying sensor plugin lib to grue_app android libs folder.") - - add_dependencies(gruesensorplugin_android_copy qtsensors_grue) -endif() - -install(TARGETS qtsensors_grue - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/sensors/grue/plugin/gruesensor.cpp b/examples/sensors/grue/plugin/gruesensor.cpp deleted file mode 100644 index 9bc3784b..00000000 --- a/examples/sensors/grue/plugin/gruesensor.cpp +++ /dev/null @@ -1,112 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "gruesensor.h" -#include "gruesensor_p.h" - -IMPLEMENT_READING(GrueSensorReading) - -/* - \omit - \class GrueSensorReading - - \brief The GrueSensorReading class holds readings from the Grue sensor. - - The Grue Sensor informs you of your chance of being eaten by a Grue. - - Grues love the dark so as long as your surroundings are relatively light - you are safe. However the more time you spend in the dark, the higher - your chances are of being eaten by a Grue. -*/ - -/* - \property GrueSensorReading::chanceOfBeingEaten - \brief holds your chance of being eaten. - - The value is the probability (from 0 to 100) that a Grue will eat you. - A probability of 100 means you are currently being eaten. The darker - it is, the more likely you are to be eaten by a Grue. The longer you - stay in a dark area, the more likely you are to be eaten by a Grue. - If you are in a lit room, the probability will be 0 as Grues fear light. - \endomit -*/ - -int GrueSensorReading::chanceOfBeingEaten() const -{ - return d->chanceOfBeingEaten; -} - -void GrueSensorReading::setChanceOfBeingEaten(int chanceOfBeingEaten) -{ - d->chanceOfBeingEaten = chanceOfBeingEaten; -} - -// ===================================================================== - -// begin generated code - -/* - \omit - \class GrueFilter - - \brief The GrueFilter class is a convenience wrapper around QSensorFilter. - - The only difference is that the filter() method features a pointer to GrueSensorReading - instead of QSensorReading. - \endomit -*/ - -/* - \omit - \fn GrueFilter::filter(GrueSensorReading *reading) - - Called when \a reading changes. Returns false to prevent the reading from propagating. - - \sa QSensorFilter::filter() - \endomit -*/ - -char const * const GrueSensor::sensorType("GrueSensor"); - -/* - \omit - \class GrueSensor - - \brief The GrueSensor 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 GrueSensorReading instead of a QSensorReading. - - For details about how the sensor works, see \l GrueSensorReading. - - \sa GrueSensorReading - \endomit -*/ - -/* - \omit - \fn GrueSensor::GrueSensor(QObject *parent) - - Construct the sensor as a child of \a parent. - \endomit -*/ - -/* - \fn GrueSensor::~GrueSensor() - - Destroy the sensor. Stops the sensor if it has not already been stopped. -*/ - -/* - \omit - \fn GrueSensor::reading() const - - Returns the reading class for this sensor. - - \sa QSensor::reading() - \endomit -*/ -// end generated code - -#include "moc_gruesensor.cpp" diff --git a/examples/sensors/grue/plugin/gruesensor.h b/examples/sensors/grue/plugin/gruesensor.h deleted file mode 100644 index 9677e621..00000000 --- a/examples/sensors/grue/plugin/gruesensor.h +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef GRUESENSOR_H -#define GRUESENSOR_H - -#include <qsensor.h> - -class GrueSensorReadingPrivate; - -class GrueSensorReading : public QSensorReading -{ - Q_OBJECT - Q_PROPERTY(int chanceOfBeingEaten READ chanceOfBeingEaten WRITE setChanceOfBeingEaten) - DECLARE_READING(GrueSensorReading) -public: - int chanceOfBeingEaten() const; - void setChanceOfBeingEaten(int chanceOfBeingEaten); -}; - -// begin generated code - -class GrueFilter : public QSensorFilter -{ -public: - virtual bool filter(GrueSensorReading *reading) = 0; -private: - bool filter(QSensorReading *reading) override { return filter(static_cast<GrueSensorReading*>(reading)); } -}; - -class GrueSensor : public QSensor -{ - Q_OBJECT - Q_PROPERTY(GrueSensorReading* reading READ reading) -public: - explicit GrueSensor(QObject *parent = 0) : QSensor(GrueSensor::sensorType, parent) {} - virtual ~GrueSensor() {} - GrueSensorReading *reading() const { return static_cast<GrueSensorReading*>(QSensor::reading()); } - static char const * const sensorType; -}; -// end generated code - -#endif diff --git a/examples/sensors/grue/plugin/gruesensor_p.h b/examples/sensors/grue/plugin/gruesensor_p.h deleted file mode 100644 index 4804f8cf..00000000 --- a/examples/sensors/grue/plugin/gruesensor_p.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef GRUESENSOR_P_H -#define GRUESENSOR_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. -// - -class GrueSensorReadingPrivate -{ -public: - GrueSensorReadingPrivate() - : chanceOfBeingEaten(-1) - { - } - - int chanceOfBeingEaten; -}; - -#endif diff --git a/examples/sensors/grue/plugin/gruesensorimpl.cpp b/examples/sensors/grue/plugin/gruesensorimpl.cpp deleted file mode 100644 index 7bfdb092..00000000 --- a/examples/sensors/grue/plugin/gruesensorimpl.cpp +++ /dev/null @@ -1,103 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "gruesensorimpl.h" -#include <QDebug> -#include <QTimer> - -char const * const gruesensorimpl::id("grue.gruesensor"); - -gruesensorimpl::gruesensorimpl(QSensor *sensor) - : QSensorBackend(sensor) - , lightLevel(QAmbientLightReading::Undefined) -{ - // We need a light sensor - lightSensor = new QAmbientLightSensor(this); - connect(lightSensor, SIGNAL(readingChanged()), this, SLOT(lightChanged())); - lightSensor->connectToBackend(); - - // We need a timer - darkTimer = new QTimer(this); - darkTimer->setInterval(1000); - connect(darkTimer, SIGNAL(timeout()), this, SLOT(increaseChance())); - - // We use this as our timestamp source - timer.start(); - -//! [setReading] - // Register our reading instance - setReading<GrueSensorReading>(&m_reading); -//! [setReading] - -//! [metadata] - // Supply metadata - // We can run as fast as the light sensor does - setDataRates(lightSensor); - // Only one output range, 0 to 1 in .1 increments - addOutputRange(0, 1, 0.1); - setDescription(QLatin1String("Grue Sensor")); -//! [metadata] -} - -void gruesensorimpl::start() -{ -//! [start] - lightSensor->setDataRate(sensor()->dataRate()); - lightSensor->start(); - // If the light sensor doesn't work we don't work either - if (!lightSensor->isActive()) - sensorStopped(); - if (lightSensor->isBusy()) - sensorBusy(); -//! [start] -} - -void gruesensorimpl::stop() -{ - lightSensor->stop(); -} - -void gruesensorimpl::lightChanged() -{ - if (lightLevel == lightSensor->reading()->lightLevel()) - return; - - lightLevel = lightSensor->reading()->lightLevel(); - - int chance = 0; - darkTimer->stop(); - - switch (lightSensor->reading()->lightLevel()) { - case QAmbientLightReading::Dark: - // It is dark. You are likely to be eaten by a grue. - chance = 10; - darkTimer->start(); - break; - default: - break; - } - - // Only send an update if the value has changed. - if (chance != m_reading.chanceOfBeingEaten() || m_reading.timestamp() == 0) { - m_reading.setTimestamp(timer.elapsed()); - m_reading.setChanceOfBeingEaten(chance); - newReadingAvailable(); - } -} - -void gruesensorimpl::increaseChance() -{ - // The longer you stay in the dark, the higher your chance of being eaten - int chance = m_reading.chanceOfBeingEaten() + 10; - - m_reading.setTimestamp(timer.elapsed()); - m_reading.setChanceOfBeingEaten(chance); - - newReadingAvailable(); - - // No point in using the timer anymore if we've hit 100... you can't get more - // likely to be eaten than 100% - if (chance >= 100) - darkTimer->stop(); -} - diff --git a/examples/sensors/grue/plugin/gruesensorimpl.h b/examples/sensors/grue/plugin/gruesensorimpl.h deleted file mode 100644 index 001af4dd..00000000 --- a/examples/sensors/grue/plugin/gruesensorimpl.h +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef GRUESENSORIMPL_H -#define GRUESENSORIMPL_H - -#include <qsensorbackend.h> -#include "gruesensor.h" -#include <qambientlightsensor.h> -#include <QElapsedTimer> - -QT_BEGIN_NAMESPACE -class QTimer; -QT_END_NAMESPACE - -class gruesensorimpl : public QSensorBackend -{ - Q_OBJECT -public: - static char const * const id; - - gruesensorimpl(QSensor *sensor); - - void start() override; - void stop() override; - -private Q_SLOTS: - void lightChanged(); - void increaseChance(); - -private: - GrueSensorReading m_reading; - QAmbientLightSensor *lightSensor; - QTimer *darkTimer; - QElapsedTimer timer; - QAmbientLightReading::LightLevel lightLevel; -}; - -#endif - diff --git a/examples/sensors/grue/plugin/main.cpp b/examples/sensors/grue/plugin/main.cpp deleted file mode 100644 index 39b9a585..00000000 --- a/examples/sensors/grue/plugin/main.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "gruesensorimpl.h" -#include <qsensorplugin.h> -#include <qsensorbackend.h> -#include <qsensormanager.h> -#include <QFile> -#include <QDebug> - -class GrueSensorPlugin : public QObject, public QSensorPluginInterface, public QSensorChangesInterface, public QSensorBackendFactory -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") - Q_INTERFACES(QSensorPluginInterface QSensorChangesInterface) -public: - void registerSensors() override - { - } - - void sensorsChanged() override - { - if (!QSensor::defaultSensorForType(QAmbientLightSensor::sensorType).isEmpty()) { - // There is a light sensor available. Register the backend - if (!QSensorManager::isBackendRegistered(GrueSensor::sensorType, gruesensorimpl::id)) - QSensorManager::registerBackend(GrueSensor::sensorType, gruesensorimpl::id, this); - } else { - if (QSensorManager::isBackendRegistered(GrueSensor::sensorType, gruesensorimpl::id)) - QSensorManager::unregisterBackend(GrueSensor::sensorType, gruesensorimpl::id); - } - } - - QSensorBackend *createBackend(QSensor *sensor) override - { - if (sensor->identifier() == gruesensorimpl::id) - return new gruesensorimpl(sensor); - - return 0; - } -}; - -#include "main.moc" diff --git a/examples/sensors/grue/plugin/plugin.json b/examples/sensors/grue/plugin/plugin.json deleted file mode 100644 index ab372059..00000000 --- a/examples/sensors/grue/plugin/plugin.json +++ /dev/null @@ -1 +0,0 @@ -{ "Keys": [ "grue" ] } diff --git a/examples/sensors/grue/plugin/plugin.pro b/examples/sensors/grue/plugin/plugin.pro deleted file mode 100644 index aa03d6c9..00000000 --- a/examples/sensors/grue/plugin/plugin.pro +++ /dev/null @@ -1,27 +0,0 @@ -TEMPLATE = lib -CONFIG += plugin -TARGET = $$qtLibraryTarget(plugins_sensors_qtsensors_grue) -PLUGIN_TYPE = sensors - -QT = core sensors - -macos:!qtConfig(static): DESTDIR = ../grue_app.app/Contents/MacOS/$$PLUGIN_TYPE -else: DESTDIR = ../$$PLUGIN_TYPE - -HEADERS += gruesensorimpl.h \ - gruesensor.h \ - gruesensor_p.h - -SOURCES += gruesensorimpl.cpp \ - main.cpp \ - gruesensor.cpp - - -# Install the plugin under Grue example directory -target.path=$$[QT_INSTALL_EXAMPLES]/sensors/grue/$$PLUGIN_TYPE -INSTALLS += target - -CONFIG += install_ok # Do not cargo-cult this! - -OTHER_FILES += \ - plugin.json diff --git a/examples/sensors/grue/qml.pro b/examples/sensors/grue/qml.pro deleted file mode 100644 index 6bce739c..00000000 --- a/examples/sensors/grue/qml.pro +++ /dev/null @@ -1,40 +0,0 @@ -TEMPLATE = app -TARGET = grue_app -QT += qml quick sensors - -# Avoid going to release/debug subdirectory -win32: DESTDIR = ./ - -SOURCES = main.cpp \ - qmlgruesensor.cpp - -HEADERS += \ - qmlgruesensor.h - -grue_plugin_base_dir = . -include(use_grue_static_plugin.pri) - -CONFIG += qmltypes -QML_IMPORT_NAME = QMLGrueSensor -QML_IMPORT_MAJOR_VERSION = 1 - -RESOURCES += \ - qml.qrc - -OTHER_FILES = \ - $$files(*.qml) \ - grue.png - -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/grue -INSTALLS += target - -EXAMPLE_FILES += \ - grue.xcf \ - icon.xcf - -android{ - CONFIG += file_copies - COPIES += androidPluginCopy - androidPluginCopy.files = $$OUT_PWD/sensors/libplugins_sensors_qtsensors_grue_armeabi-v7a.so - androidPluginCopy.path = android-build/libs/armeabi-v7a -} diff --git a/examples/sensors/grue/qml.qrc b/examples/sensors/grue/qml.qrc deleted file mode 100644 index 01f4e2bf..00000000 --- a/examples/sensors/grue/qml.qrc +++ /dev/null @@ -1,6 +0,0 @@ -<RCC> - <qresource prefix="/QMLGrueSensor"> - <file>grue.qml</file> - <file>grue.png</file> - </qresource> -</RCC> diff --git a/examples/sensors/grue/qmlgruesensor.cpp b/examples/sensors/grue/qmlgruesensor.cpp deleted file mode 100644 index 312b4968..00000000 --- a/examples/sensors/grue/qmlgruesensor.cpp +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "qmlgruesensor.h" - - -QMLGrueSensor::QMLGrueSensor():QSensor("GrueSensor") // QLightSensor -{ - connectToBackend(); - start(); -} diff --git a/examples/sensors/grue/qmlgruesensor.h b/examples/sensors/grue/qmlgruesensor.h deleted file mode 100644 index 9ee14568..00000000 --- a/examples/sensors/grue/qmlgruesensor.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef QMLGRUESENSOR_H -#define QMLGRUESENSOR_H - -#include <QtQml/qqml.h> -#include <QtSensors/qsensor.h> - -class QMLGrueSensor : public QSensor -{ - Q_OBJECT - QML_ELEMENT - -public: - QMLGrueSensor(); -}; - -#endif // QMLGRUESENSOR_H diff --git a/examples/sensors/grue/use_grue_static_plugin.pri b/examples/sensors/grue/use_grue_static_plugin.pri deleted file mode 100644 index 6ccee1cd..00000000 --- a/examples/sensors/grue/use_grue_static_plugin.pri +++ /dev/null @@ -1,17 +0,0 @@ -# Need to manually link to the plugin when using a static Qt build. -qtConfig(static) { - SOURCES += $$grue_plugin_base_dir/grue_plugin_import_custom.cpp - LIBS += -L$$grue_plugin_base_dir/sensors - # For iOS, xcode takes care of the debug suffix - macx-xcode { - LIBS += -lplugins_sensors_qtsensors_grue$($${QMAKE_XCODE_LIBRARY_SUFFIX_SETTING}) - # For desktop platforms we need to do it per-platform. - } else { - lib_to_link = plugins_sensors_qtsensors_grue - if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { - macos:lib_to_link = $${lib_to_link}_debug - win32:lib_to_link = $${lib_to_link}d - } - LIBS += -l$$lib_to_link - } -} diff --git a/examples/sensors/maze/CMakeLists.txt b/examples/sensors/maze/CMakeLists.txt deleted file mode 100644 index f8330413..00000000 --- a/examples/sensors/maze/CMakeLists.txt +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(maze LANGUAGES CXX) - -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/sensors/maze") - -find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Sensors) - -qt_add_executable(maze - main.cpp -) - -set_target_properties(maze PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -if(ANDROID) - set_property(TARGET maze PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR - ${CMAKE_CURRENT_SOURCE_DIR}/android) - endif() -if(APPLE) - if(IOS) - set_property(TARGET maze PROPERTY - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist" - ) - endif() -endif() - -target_link_libraries(maze PUBLIC - Qt::Core - Qt::Gui - Qt::Quick - Qt::Sensors -) - -# Resources: -set(maze_resource_files - "Congratulation.qml" - "LabyrinthSquare.qml" - "Mouse.qml" - "components/ApplicationWindow.qml" - "components/Button.qml" - "components/images/button_background_disabled.png" - "components/images/button_background_normal.png" - "components/images/button_background_pressed.png" - "content/00.png" - "content/01.png" - "content/cheese.png" - "content/cheeseeating.gif" - "content/congratulations.gif" - "content/mouse_down.gif" - "content/start.png" - "lib.js" - "maze.qml" -) - -qt6_add_resources(maze "maze" - PREFIX - "/" - FILES - ${maze_resource_files} -) - -install(TARGETS maze - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/sensors/maze/Congratulation.qml b/examples/sensors/maze/Congratulation.qml deleted file mode 100644 index a1e54ada..00000000 --- a/examples/sensors/maze/Congratulation.qml +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -//Import the declarative plugins -import QtQuick - -//Import the javascript functions for this game -import "lib.js" as Lib - -//Implementation of the Congratulation control -Item { - x: Lib.cellDimension - y: Lib.cellDimension - width: Lib.cellDimension * (Lib.dimension - 2) - height: Lib.cellDimension * (Lib.dimension - 2) - - //Containing a animated gif image - AnimatedImage { - id: img - anchors.fill: parent - visible: true - source: "content/congratulations.gif" - } -} diff --git a/examples/sensors/maze/Info.plist b/examples/sensors/maze/Info.plist deleted file mode 100644 index 2458247c..00000000 --- a/examples/sensors/maze/Info.plist +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleDisplayName</key> - <string>maze</string> - <key>CFBundleExecutable</key> - <string>maze</string> - <key>CFBundleGetInfoString</key> - <string>Created by Qt/QMake</string> - <key>CFBundleIdentifier</key> - <string>com.qt.sensorsmaze</string> - <key>CFBundleName</key> - <string>maze</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleShortVersionString</key> - <string>1.0</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>CFBundleVersion</key> - <string>1.0</string> - <key>LSRequiresIPhoneOS</key> - <true/> - <key>UILaunchStoryboardName</key> - <string>LaunchScreen</string> - <key>UISupportedInterfaceOrientations</key> - <array> - <string>UIInterfaceOrientationPortrait</string> - </array> -</dict> -</plist> diff --git a/examples/sensors/maze/LabyrinthSquare.qml b/examples/sensors/maze/LabyrinthSquare.qml deleted file mode 100644 index d9e72db7..00000000 --- a/examples/sensors/maze/LabyrinthSquare.qml +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -//Import the declarative plugins -import QtQuick - -//Import the javascript functions for this game -import "lib.js" as Lib - -//Implementation of the Labyrinth square control. -Rectangle { - id: sq - x: 0 - y: 0 - width: Lib.cellDimension - height: Lib.cellDimension - color: "white" - property int val: 0 - property AnimatedImage picture: img - - //Dependent of its position and the labyrinth value a square can be the start, cheese, empty or a wall - AnimatedImage { - id: img - anchors.fill: parent - source: "" - } - - function updateImage() - { - if (sq.val == -1) - sq.picture.source = "content/start.png"; - else if (sq.val == 3) - sq.picture.source = "content/cheese.png"; - else if (sq.val == 4){ - sq.picture.source = "content/cheeseeating.gif"; - sq.picture.playing = true; - } - else if (sq.val == 1) - sq.picture.source = "content/01.png"; - else - sq.picture.source = "content/00.png"; - } -} diff --git a/examples/sensors/maze/Mouse.qml b/examples/sensors/maze/Mouse.qml deleted file mode 100644 index 155f0bd6..00000000 --- a/examples/sensors/maze/Mouse.qml +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -//Import the declarative plugins -import QtQuick - -//Import the javascript functions for this game -import "lib.js" as Lib - -//Implementation of the Mouse control. -Item { - id: mouse - x: 0 - y: 0 - width: Lib.cellDimension - height: Lib.cellDimension - property int angle - readonly property double radians_to_degrees: 180 / Math.PI - - AnimatedImage { - id: img - source: "content/mouse_down.gif" - anchors.fill: parent - visible: true - } - - //Function for moving the mouse - function move(newx, newy) - { - if (mouse.x === newx && mouse.y === newy) - return - // somehow this actually works -//! [0] - var a = newy - mouse.y - var b = newx - mouse.x - angle = Math.atan2(-b, a) * mouse.radians_to_degrees - if (angle < 0) - angle = 360 + angle - - img.rotation = angle - mouse.x = newx; - mouse.y = newy; -//! [0] - } -} diff --git a/examples/sensors/maze/android/AndroidManifest.xml b/examples/sensors/maze/android/AndroidManifest.xml deleted file mode 100644 index 8efe1ed3..00000000 --- a/examples/sensors/maze/android/AndroidManifest.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.qtproject.example.maze" - android:installLocation="auto" - android:versionCode="1" - android:versionName="1.0"> - <!-- The comment below will be replaced with dependencies permissions upon deployment. - Remove the comment if you do not require these default permissions. --> - <!-- %%INSERT_PERMISSIONS --> - - <!-- The comment below will be replaced with dependencies permissions upon deployment. - Remove the comment if you do not require these default features. --> - <!-- %%INSERT_FEATURES --> - - <supports-screens - android:anyDensity="true" - android:largeScreens="true" - android:normalScreens="true" - android:smallScreens="true" /> - <application - android:name="org.qtproject.qt.android.bindings.QtApplication" - android:extractNativeLibs="true" - android:hardwareAccelerated="true" - android:label="-- %%INSERT_APP_NAME%% --" - android:requestLegacyExternalStorage="true"> - <activity - android:name="org.qtproject.qt.android.bindings.QtActivity" - android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" - android:label="-- %%INSERT_APP_NAME%% --" - android:launchMode="singleTop" - android:screenOrientation="portrait"> - <intent-filter> - <action android:name="android.intent.action.MAIN"/> - <category android:name="android.intent.category.LAUNCHER"/> - </intent-filter> - <meta-data - android:name="android.app.lib_name" - android:value="-- %%INSERT_APP_LIB_NAME%% --" /> - <meta-data - android:name="android.app.background_running" - android:value="false" /> - <meta-data - android:name="android.app.extract_android_style" - android:value="minimal" /> - </activity> - </application> -</manifest> diff --git a/examples/sensors/maze/components/ApplicationWindow.qml b/examples/sensors/maze/components/ApplicationWindow.qml deleted file mode 100644 index 3f87d724..00000000 --- a/examples/sensors/maze/components/ApplicationWindow.qml +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -//Import the declarative plugins -import QtQuick - -Rectangle { - id: appWnd - x: 0 - y: 0 - width: 320 - height: 480 - color: "#ececec" -} diff --git a/examples/sensors/maze/components/Button.qml b/examples/sensors/maze/components/Button.qml deleted file mode 100644 index 953424a4..00000000 --- a/examples/sensors/maze/components/Button.qml +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -//Import the declarative plugins -import QtQuick - -//Implementation of the Button control. -Item { - id: button - width: 30 - height: 100 - property alias text: innerText.text - signal clicked - - Image { - id: backgroundImage - anchors.fill: parent - source: (button.enabled ? "images/button_background_normal.png" : "images/button_background_disabled.png") - } - - Text { - id: innerText - anchors.centerIn: parent - color: "white" - font.bold: true - } - - //Mouse area to react on click events - MouseArea { - anchors.fill: button - onClicked: { button.clicked();} - onPressed: { - backgroundImage.source = "images/button_background_pressed.png" } - onReleased: { - backgroundImage.source = (button.enabled ? "images/button_background_normal.png" : "images/button_background_disabled.png") - } - } -} diff --git a/examples/sensors/maze/components/images/button_background_disabled.png b/examples/sensors/maze/components/images/button_background_disabled.png Binary files differdeleted file mode 100644 index 62a00b9a..00000000 --- a/examples/sensors/maze/components/images/button_background_disabled.png +++ /dev/null diff --git a/examples/sensors/maze/components/images/button_background_normal.png b/examples/sensors/maze/components/images/button_background_normal.png Binary files differdeleted file mode 100644 index 1fecad5b..00000000 --- a/examples/sensors/maze/components/images/button_background_normal.png +++ /dev/null diff --git a/examples/sensors/maze/components/images/button_background_pressed.png b/examples/sensors/maze/components/images/button_background_pressed.png Binary files differdeleted file mode 100644 index e0ba0e7a..00000000 --- a/examples/sensors/maze/components/images/button_background_pressed.png +++ /dev/null diff --git a/examples/sensors/maze/content/00.png b/examples/sensors/maze/content/00.png Binary files differdeleted file mode 100644 index 2522be5e..00000000 --- a/examples/sensors/maze/content/00.png +++ /dev/null diff --git a/examples/sensors/maze/content/01.png b/examples/sensors/maze/content/01.png Binary files differdeleted file mode 100644 index 6146b204..00000000 --- a/examples/sensors/maze/content/01.png +++ /dev/null diff --git a/examples/sensors/maze/content/cheese.png b/examples/sensors/maze/content/cheese.png Binary files differdeleted file mode 100644 index c737b9d6..00000000 --- a/examples/sensors/maze/content/cheese.png +++ /dev/null diff --git a/examples/sensors/maze/content/cheeseeating.gif b/examples/sensors/maze/content/cheeseeating.gif Binary files differdeleted file mode 100644 index 6b2cb47f..00000000 --- a/examples/sensors/maze/content/cheeseeating.gif +++ /dev/null diff --git a/examples/sensors/maze/content/congratulations.gif b/examples/sensors/maze/content/congratulations.gif Binary files differdeleted file mode 100644 index 70204176..00000000 --- a/examples/sensors/maze/content/congratulations.gif +++ /dev/null diff --git a/examples/sensors/maze/content/mouse_down.gif b/examples/sensors/maze/content/mouse_down.gif Binary files differdeleted file mode 100644 index 5491c18f..00000000 --- a/examples/sensors/maze/content/mouse_down.gif +++ /dev/null diff --git a/examples/sensors/maze/content/start.png b/examples/sensors/maze/content/start.png Binary files differdeleted file mode 100644 index 581b8c9b..00000000 --- a/examples/sensors/maze/content/start.png +++ /dev/null diff --git a/examples/sensors/maze/doc/src/maze.qdoc b/examples/sensors/maze/doc/src/maze.qdoc deleted file mode 100644 index a6f132f9..00000000 --- a/examples/sensors/maze/doc/src/maze.qdoc +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example maze - \title Qt Sensors - Maze QML Example - \ingroup qtsensors-examples - \image maze.png - - \section2 Maze in QML - \brief The Maze example demonstrates the TiltSensor QML type. - - - To write a QML application that will use the TiltSensor QML sensors type - you need to do the following steps: - - To import the Qt Sensors QML types into your application, use the following - import statement in your .qml file: - - \snippet maze/maze.qml 0 - - Then, add the Sensor QML types into your qml file. - - In this example we use the TiltSensor: - - \snippet maze/maze.qml 1 - - The mouse should move by a factor of the tilt value: - - \snippet maze/maze.qml 2 - - The walk direction of the mouse takes into account some collision detection: - - \snippet maze/maze.qml 3 - - The rotation of the mouse image is determined according to the angle that the mouse is moving. - - \snippet maze/Mouse.qml 0 - -*/ - diff --git a/examples/sensors/maze/lib.js b/examples/sensors/maze/lib.js deleted file mode 100644 index 3bae6a86..00000000 --- a/examples/sensors/maze/lib.js +++ /dev/null @@ -1,264 +0,0 @@ -//global variables -var labyrinth = null; -var dimension = 24; -var cellDimension = 13; -var won; -var objectArray = null; -var sec = 0.0 - -//Allocate labyrinth arrays and create labyrinth and way reflected in the labyrinth array -function createLabyrinth() -{ - won = false; - //create the labyrinth matrix - labyrinth = null; - labyrinth = new Array(dimension); - for (var x = 0; x < dimension; x++ ){ - labyrinth[x] = new Array(dimension); - for (var y = 0; y < dimension; y++ ){ - labyrinth[x][y] = 0; - } - } - createWay(); - createLab(); -} - -//Create a way where the mouse can reach the cheese -function createWay() -{ - //Create rnd way to have at least one solution - //A way square is marked as a 2 in the labyrinth array - var x = 0; - var y = 0; - var ox = x; - var oy = y; - labyrinth[0][0] = 2; - while (x < dimension && y < dimension){ - var rnd = Math.floor(Math.random()*5); - if (Math.floor(Math.random()*2) == 1){ - if (rnd == 0) x--; - if (rnd >= 1) x++; - if (x < 0) x++; - if (x >= dimension){ - x = ox; - break; - } - } - else { - if (rnd == 0) y--; - if (rnd >= 1) y++; - if (y < 0) y++; - if (y >= dimension){ - y = oy; - break; - } - } - - /*avoid to have [2]2| - |2|2|*/ - if (x < (dimension - 1) && y < (dimension - 1)){ - if (labyrinth[x + 1][y] == 2 - && labyrinth[x][y + 1] == 2 - && labyrinth[x + 1][y + 1] == 2){ - y = oy; - x = ox; - continue; - } - } - /*avoid to have |2[2] - |2|2|*/ - if (x > 0 && y < (dimension - 1)){ - if (labyrinth[x - 1][y] == 2 - && labyrinth[x][y + 1] == 2 - && labyrinth[x - 1][y + 1] == 2){ - y = oy; - x = ox; - continue; - } - } - /*avoid to have |2|2| - [2]2|*/ - if (x < (dimension - 1) && y > 0){ - if (labyrinth[x + 1][y] == 2 - && labyrinth[x][y - 1] == 2 - && labyrinth[x + 1][y - 1] == 2){ - y = oy; - x = ox; - continue; - } - } - /*avoid to have |2|2| - |2[2]*/ - if (x > 0 && y > 0){ - if (labyrinth[x - 1][y] == 2 - && labyrinth[x][y - 1] == 2 - && labyrinth[x - 1][y - 1] == 2){ - y = oy; - x = ox; - continue; - } - } - - labyrinth[x][y] = 2; - ox = x; - oy = y; - } - //finish way - while (x < (dimension - 1)){ - labyrinth[x][y] = 2; - x++; - } - while (y < (dimension - 1)){ - labyrinth[x][y] = 2; - y++; - } -} - -//Create the labyrinth with rnd values -function createLab() -{ - //A wall square is marked as a 1 in the labyrinth array - //Not a wall square is marked as a 0 in the labyrinth array - //The Cheese square is marked as a 3 in the labyrinth array - //The start is marked as a -1 in the labyrinth array - for (var x = 0; x < dimension; x++ ){ - var rnd = 0; - for (var y = 0; y < dimension; y++){ - //But don't overwrite the way - if (labyrinth[x][y] != 2){ - var rnd = Math.floor(Math.random()*2); - var xy = 0; - var xxy = 0; - var xyy = 0; - var xxyy = 0; - - if (x > 0 && y > 0){ - xy = labyrinth[x - 1][y - 1]; - if (xy == 2) - xy = 0; - - xyy = labyrinth[x - 1][y]; - if (xyy == 2) - xyy = 0; - - xxy = labyrinth[x][y - 1]; - if (xxy == 2) - xxy = 0; - - xxyy = rnd; - if (xxyy == 2) - xxyy = 0; - - //avoid to have to many |0|1| or |1|0| [xy ][xxy ] - // |1[0] |0[1] [xyy ][xxyy] - if (xyy == xxy && xy == xxyy && xy != xxy){ - if (rnd == 1) - rnd = 0; - else rnd = 1; - } - - //avoid to have to many |1|1| or |0|0| - // |1[1] |0[0] - if (xy == xxy && xxy == xxyy && xxyy == xyy){ - if (rnd == 1) - rnd = 0; - else rnd = 1; - } - } - else if (x == 0 && y > 0){ - xy = labyrinth[x][y - 1]; - if (xy == 2) - xy = 0; - - xyy = rnd; - if (xyy == 2) - xyy = 0; - - xxy = labyrinth[x + 1][y - 1]; - if (xxy == 2) - xxy = 0; - - xxyy = labyrinth[x + 1][y]; - if (xxyy == 2) - xxyy = 0; - - //avoid to have to many |1|1| or |0|0| - // |1[1] |0[0] - if (xy == xxy && xxy == xxyy && xxyy == xyy){ - if (rnd == 1) - rnd = 0; - else rnd = 1; - } - - //avoid to have to many |0|1| or |1|0| [xy ][xxy ] - // |1[0] |0[1] [xyy ][xxyy] - if (xyy == xxy && xy == xxyy && xy != xxy){ - if (rnd == 1) - rnd = 0; - else rnd = 1; - } - } - labyrinth[x][y] = rnd; - } - - } - } - //set start and end - labyrinth[0][0] = -1; - labyrinth[0][1] = 0; - labyrinth[1][0] = 0; - labyrinth[1][1] = 0; - - labyrinth[dimension - 2][dimension - 2] = 0; - labyrinth[dimension - 2][dimension - 1] = 0; - labyrinth[dimension - 1][dimension - 2] = 0; - labyrinth[dimension - 1][dimension - 1] = 3; -} - -//Function that checks if the mouse can be moved in x and y -function canMove(x, y) -{ - //Check if movement is allowed - var xcenter = x + (cellDimension / 2); - var ycenter = y + (cellDimension / 2); - //try to get the index - var idx = Math.floor(xcenter / cellDimension); - var idy = Math.floor(ycenter / cellDimension); - var dx = xcenter - (idx * cellDimension + ( cellDimension / 2 )); - var dy = ycenter - (idy * cellDimension + ( cellDimension / 2 )); - - if (dx > 0){ - if (labyrinth[idx][idy] == 1) - return false; - } - if (dx < 0){ - if (labyrinth[idx][idy] == 1) - return false; - } - if (dy > 0){ - if (labyrinth[idx][idy] == 1) - return false; - } - if (dy < 0){ - if (labyrinth[idx][idy] == 1) - return false; - } - //check if won - if (idx == (dimension - 1) && idy == (dimension - 1)) - won = true; - return true; -} - -//Function that prints out the labyrith array values in the console -function printLab() -{ - //for debug purposes print out lab n console - var iy = 0; - for (var y = 0; y < dimension; y++ ){ - var line = ""; - for (var x = 0; x < dimension; x++ ){ - line += labyrinth[x][y]; - } - console.log(line); - } -} diff --git a/examples/sensors/maze/main.cpp b/examples/sensors/maze/main.cpp deleted file mode 100644 index 2dbf1aa1..00000000 --- a/examples/sensors/maze/main.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "../stub.h" -SENSORS_EXAMPLE_MAIN(maze) diff --git a/examples/sensors/maze/maze.pro b/examples/sensors/maze/maze.pro deleted file mode 100644 index f15fa570..00000000 --- a/examples/sensors/maze/maze.pro +++ /dev/null @@ -1,19 +0,0 @@ -TEMPLATE = app -TARGET = maze -QT += quick sensors -SOURCES = main.cpp - -OTHER_FILES = \ - components \ - $$files(*.qml) \ - $$files(*.js) \ - content \ - android/AndroidManifest.xml - -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/maze -INSTALLS += target - -RESOURCES += \ - maze.qrc - -ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android diff --git a/examples/sensors/maze/maze.qml b/examples/sensors/maze/maze.qml deleted file mode 100644 index c28e970b..00000000 --- a/examples/sensors/maze/maze.qml +++ /dev/null @@ -1,251 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -/* Layout - mainWnd - / -------------------------------/ gameRect -| / -|-----------------------------/ -||---------------------------| -||||M| || -||| \ || -||| mouseCtrl || -||| || -||| || -||| Labyrinth || -||| || -||| || -||| cheeseSquare || -||| \ || -||| |C||| -||---------------------------| -|----------------------------- -| -|----------------------------- -|| || | -|----------------------------- -| \ \ -| \ timePlayingLabel -| newGameButton ------------------------------- - -*/ -//Import the declarative plugins -import QtQuick -import "components" - -//! [0] -import QtSensors -//! [0] - -//Import the javascript functions for this game -import "lib.js" as Lib - -ApplicationWindow { - id: mainWnd - property bool gameRunning: false - - Component.onCompleted: { - initializeMaze() - newGame() - } - - function initializeMaze() { - Lib.objectArray = new Array(Lib.dimension * Lib.dimension); - Lib.createLabyrinth(); - var idx = 0; - var component = Qt.createComponent("LabyrinthSquare.qml"); - for (var y = 0; y < Lib.dimension; y++ ) { - for (var x = 0; x < Lib.dimension; x++ ) { - var square = component.createObject(gameRect); - if (!square) { - console.log("error loading labyrinth square: " + component.errorString()) - return - } - square.x = x * square.width; - square.y = y * square.height; - square.val = Lib.labyrinth[x][y]; - Lib.objectArray[idx] = square; - idx++; - } - } - } - - function newGame() { - congratulation.visible = false; - - // Reset game time - timePlayingLabel.text = "--"; - Lib.sec = 0.0; - - // Create new labyrinth - Lib.createLabyrinth(); - // Update maze tiles to match the new labyrinth - var idx = 0; - for (var y = 0; y < Lib.dimension; y++ ) { - for (var x = 0; x < Lib.dimension; x++ ) { - Lib.objectArray[idx].val = Lib.labyrinth[x][y]; - Lib.objectArray[idx].updateImage(); - idx++; - } - } - // Reset mouse position and start the game - mouseCtrl.x = 0; - mouseCtrl.y = 0; - mainWnd.gameRunning = true; - } - - function gameWon() { - // Update the cheese square at the bottom right (win animation) - Lib.objectArray[Lib.dimension * Lib.dimension - 1].val = 4 - Lib.objectArray[Lib.dimension * Lib.dimension - 1].updateImage() - congratulation.visible = true; - mainWnd.gameRunning = false; - } - - Rectangle { - id: gameRect - x: (mainWnd.width - width) / 2 - y: 5 - width: Lib.dimension * Lib.cellDimension - height: Lib.dimension * Lib.cellDimension - color: "transparent" - border.width: 2 - } - - Mouse { - id: mouseCtrl - } - - Congratulation { - id: congratulation - visible: false - } - -//! [1] - TiltSensor { - id: tiltSensor - active: true - } -//! [1] - - //Timer to read out the x and y rotation of the TiltSensor - Timer { - id: tiltTimer - interval: 50 - repeat: true - running: tiltSensor.active && mainWnd.gameRunning - - onTriggered: { - // Update the maze unless game is already won - if (Lib.won === true) { - gameWon() - return - } - Lib.sec += 0.05; - timePlayingLabel.text = Math.floor(Lib.sec) + " seconds"; - - //check if we can move the mouse - var xval = -1; - var yval = -1; - -//! [2] - var xstep = 0; - xstep = tiltSensor.reading.yRotation * 0.1 //acceleration - - var ystep = 0; - ystep = tiltSensor.reading.xRotation * 0.1 //acceleration -//! [2] -//! [3] - if (xstep < 1 && xstep > 0) - xstep = 0 - else if (xstep > -1 && xstep < 0) - xstep = 0 - - if (ystep < 1 && ystep > 0) - ystep = 0; - else if (ystep > -1 && ystep < 0) - ystep = 0; - - if ((xstep < 0 && mouseCtrl.x > 0 - && Lib.canMove(mouseCtrl.x + xstep,mouseCtrl.y))) { - xval = mouseCtrl.x + xstep; - - } else if (xstep > 0 && mouseCtrl.x < (Lib.cellDimension * (Lib.dimension - 1)) - && Lib.canMove(mouseCtrl.x + xstep,mouseCtrl.y)) { - xval = mouseCtrl.x + xstep; - } else - xval = mouseCtrl.x; - - if (ystep < 0 && mouseCtrl.y > 0 - && Lib.canMove(mouseCtrl.x, mouseCtrl.y + ystep)) { - yval = mouseCtrl.y + ystep; - } else if (ystep > 0 && (mouseCtrl.y < (Lib.cellDimension * (Lib.dimension - 1))) - && Lib.canMove(mouseCtrl.x, mouseCtrl.y + ystep)) { - yval = mouseCtrl.y + ystep; - } else - yval = mouseCtrl.y - mouseCtrl.move(xval, yval); -//! [3] - } - } - - //Button to start a new Game - Button{ - id: newGameButton - anchors.left: gameRect.left - anchors.top: gameRect.bottom - anchors.topMargin: 5 - height: 30 - width: 100 - text: qsTr("New game") - onClicked: newGame() - } - Button{ - id: calibrateButton - anchors.left: gameRect.left - anchors.top: newGameButton.bottom - anchors.topMargin: 5 - height: 30 - width: 100 - text: qsTr("Calibrate") - onClicked: tiltSensor.calibrate(); - } - - Text { - id: tiltSensorInfo - visible: tiltSensor.active - anchors.left: gameRect.left - anchors.top: calibrateButton.bottom - anchors.topMargin: 5 - text: qsTr("Tilt sensor ID: ") + tiltSensor.identifier - } - - //Label to print out the game time - Text{ - id: timePlayingLabel - anchors.right: gameRect.right - anchors.top: gameRect.bottom - anchors.topMargin: 5 - } - - Rectangle { - id: tiltSensorMissing - visible: !tiltSensor.active - anchors.fill: parent - color: "#AACCCCCC" // slightly transparent - Text { - anchors.centerIn: parent - text: qsTr("Tilt sensor\nnot found") - font.pixelSize: 24 - font.bold: true - color: "black" - } - MouseArea { - // prevent interaction with the game - anchors.fill: parent - } - } -} - diff --git a/examples/sensors/maze/maze.qrc b/examples/sensors/maze/maze.qrc deleted file mode 100644 index 10916193..00000000 --- a/examples/sensors/maze/maze.qrc +++ /dev/null @@ -1,21 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>Congratulation.qml</file> - <file>LabyrinthSquare.qml</file> - <file>lib.js</file> - <file>maze.qml</file> - <file>Mouse.qml</file> - <file>components/ApplicationWindow.qml</file> - <file>components/Button.qml</file> - <file>components/images/button_background_disabled.png</file> - <file>components/images/button_background_pressed.png</file> - <file>components/images/button_background_normal.png</file> - <file>content/00.png</file> - <file>content/start.png</file> - <file>content/mouse_down.gif</file> - <file>content/congratulations.gif</file> - <file>content/cheeseeating.gif</file> - <file>content/cheese.png</file> - <file>content/01.png</file> - </qresource> -</RCC> diff --git a/examples/sensors/qmlqtsensors/CMakeLists.txt b/examples/sensors/qmlqtsensors/CMakeLists.txt deleted file mode 100644 index 6f95ebd3..00000000 --- a/examples/sensors/qmlqtsensors/CMakeLists.txt +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(qmlqtsensors LANGUAGES CXX) - -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/sensors/qmlqtsensors") - -find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick) - -qt_add_executable(qmlqtsensors - main.cpp -) - -set_target_properties(qmlqtsensors PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(qmlqtsensors PUBLIC - Qt::Core - Qt::Gui - Qt::Quick -) - -# Resources: -set(qmlqtsensors_resource_files - "components/ApplicationWindow.qml" - "components/Button.qml" - "components/Divider.qml" - "components/images/button_background_disabled.png" - "components/images/button_background_normal.png" - "components/images/button_background_pressed.png" - "qmlqtsensors.qml" -) - -qt6_add_resources(qmlqtsensors "qmlqtsensors" - PREFIX - "/" - FILES - ${qmlqtsensors_resource_files} -) - -install(TARGETS qmlqtsensors - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/sensors/qmlqtsensors/components/ApplicationWindow.qml b/examples/sensors/qmlqtsensors/components/ApplicationWindow.qml deleted file mode 100644 index a2e90655..00000000 --- a/examples/sensors/qmlqtsensors/components/ApplicationWindow.qml +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -//Import the declarative plugins -import QtQuick - -Rectangle { - id: appWnd - width: 320 - height: 480 - color: "#868482" -} diff --git a/examples/sensors/qmlqtsensors/components/Button.qml b/examples/sensors/qmlqtsensors/components/Button.qml deleted file mode 100644 index 953424a4..00000000 --- a/examples/sensors/qmlqtsensors/components/Button.qml +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -//Import the declarative plugins -import QtQuick - -//Implementation of the Button control. -Item { - id: button - width: 30 - height: 100 - property alias text: innerText.text - signal clicked - - Image { - id: backgroundImage - anchors.fill: parent - source: (button.enabled ? "images/button_background_normal.png" : "images/button_background_disabled.png") - } - - Text { - id: innerText - anchors.centerIn: parent - color: "white" - font.bold: true - } - - //Mouse area to react on click events - MouseArea { - anchors.fill: button - onClicked: { button.clicked();} - onPressed: { - backgroundImage.source = "images/button_background_pressed.png" } - onReleased: { - backgroundImage.source = (button.enabled ? "images/button_background_normal.png" : "images/button_background_disabled.png") - } - } -} diff --git a/examples/sensors/qmlqtsensors/components/Divider.qml b/examples/sensors/qmlqtsensors/components/Divider.qml deleted file mode 100644 index 4856d665..00000000 --- a/examples/sensors/qmlqtsensors/components/Divider.qml +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -import QtQuick - -Column { - spacing: 5 - width: parent.width - property alias label: textLabel.text - - Rectangle { - border.width: 1 - height: 2 - width: parent.width - anchors.margins: 20 - border.color: "#2d2b19" - } - Text { - id: textLabel - width: parent.width - horizontalAlignment: Text.AlignHCenter - font.bold: true - } -} diff --git a/examples/sensors/qmlqtsensors/components/images/button_background_disabled.png b/examples/sensors/qmlqtsensors/components/images/button_background_disabled.png Binary files differdeleted file mode 100644 index 62a00b9a..00000000 --- a/examples/sensors/qmlqtsensors/components/images/button_background_disabled.png +++ /dev/null diff --git a/examples/sensors/qmlqtsensors/components/images/button_background_normal.png b/examples/sensors/qmlqtsensors/components/images/button_background_normal.png Binary files differdeleted file mode 100644 index 1fecad5b..00000000 --- a/examples/sensors/qmlqtsensors/components/images/button_background_normal.png +++ /dev/null diff --git a/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png b/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png Binary files differdeleted file mode 100644 index e0ba0e7a..00000000 --- a/examples/sensors/qmlqtsensors/components/images/button_background_pressed.png +++ /dev/null diff --git a/examples/sensors/qmlqtsensors/doc/src/qmlqtsensors.qdoc b/examples/sensors/qmlqtsensors/doc/src/qmlqtsensors.qdoc deleted file mode 100644 index 410fb2c1..00000000 --- a/examples/sensors/qmlqtsensors/doc/src/qmlqtsensors.qdoc +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example qmlqtsensors - \title Qt Sensors - QML Example - \ingroup qtsensors-examples - \image qmlqtsensors.png - - \section2 Qt Sensors in QML - \brief The QtSensors - QML example demonstrates the QML sensors types in the QtSensors import. - - - To write a QML application that will use the QML sensors types in the QtSensors import you need to to the following steps: - - Import the QtSensors declarative plugin: - - \snippet qmlqtsensors/qmlqtsensors.qml 0 - - Add the Sensor QML types into your qml file. - - In this example we use the TiltSensor: - - \snippet qmlqtsensors/qmlqtsensors.qml 1 - - The Tilt-, AmbientLight- and the Proximity QML sensor types have the 'enabled' property in common. - To start or stop the sensor set this property to true or false. - - \snippet qmlqtsensors/qmlqtsensors.qml 2 - - Reading the data can be done for each sensor type like following: - - \l {TiltSensor} {TiltSensor} - - \snippet qmlqtsensors/qmlqtsensors.qml 3 - \snippet qmlqtsensors/qmlqtsensors.qml 4 - - \l {AmbientLightSensor} {AmbientLightSensor} - - \snippet qmlqtsensors/qmlqtsensors.qml 5 - - \l {ProximitySensor} {ProximitySensor} - - \snippet qmlqtsensors/qmlqtsensors.qml 6 -*/ - diff --git a/examples/sensors/qmlqtsensors/main.cpp b/examples/sensors/qmlqtsensors/main.cpp deleted file mode 100644 index 48705436..00000000 --- a/examples/sensors/qmlqtsensors/main.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "../stub.h" -SENSORS_EXAMPLE_MAIN(qmlqtsensors) diff --git a/examples/sensors/qmlqtsensors/qmlqtsensors.pro b/examples/sensors/qmlqtsensors/qmlqtsensors.pro deleted file mode 100644 index 4c8e83b3..00000000 --- a/examples/sensors/qmlqtsensors/qmlqtsensors.pro +++ /dev/null @@ -1,16 +0,0 @@ -TEMPLATE = app -TARGET = qmlqtsensors -QT += quick -qtConfig(static):QT += sensors - -SOURCES = main.cpp - -RESOURCES += \ - qmlqtsensors.qrc - -OTHER_FILES = \ - $$files(*.qml) \ - components - -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/qmlqtsensors -INSTALLS += target diff --git a/examples/sensors/qmlqtsensors/qmlqtsensors.qml b/examples/sensors/qmlqtsensors/qmlqtsensors.qml deleted file mode 100644 index 43bf140a..00000000 --- a/examples/sensors/qmlqtsensors/qmlqtsensors.qml +++ /dev/null @@ -1,212 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -/* Layout - mainWnd - / ---------------------------------------------------------------------------------- -|-------------------------------------------------------------------------------- -|| labelTitle | -|-------------------------------------------------------------------------------- -|-------------------------------------------------------------------------------- <---- tiltLine -|-------------------------------------------------------------------------------- -|| labelTilt | -|-------------------------------------------------------------------------------- -| / accuracyRect / speedRect -|-------------------------------------------||----------------------------------| -|| Accuracy <----- textAccuracy || Speed <-----textSpeed | -|| value <- textAccuracyValue || value <- textSpeedValue | -|| ----------------- ------------------ || --------------- ---------------- | -|| | accuracyLower | | accuracyHigher | || | speedLower | | speedHigher | | -|| ----------------- ------------------ || --------------- ---------------- | -|------------------------------------------ ||----------------------------------| -| ----------- -| |Calibrate| <------------------ calibrate -| ----------- -| --------- -| |Degree | <-------------------- useRadian X Rotation: 0 <------------------ xrottext -| --------- -| --------- -| |Start | <-------------------- tiltStart Y Rotation: 0 <------------------ yrottext -| --------- -|-------------------------------------------------------------------------------- <---- ambientlightLine -|-------------------------------------------------------------------------------- -|| labelAmbientLight | -|-------------------------------------------------------------------------------- -| --------- -| |Start | <-------------------- ablStart Ambient light: - <--------------- abltext -| --------- -|-------------------------------------------------------------------------------- <---- proximityLine -|-------------------------------------------------------------------------------- -|| labelProximityLight | -|-------------------------------------------------------------------------------- -| --------- -| |Start | <-------------------- proxiStart Proximity: - <--------------- proxitext -| --------- ------------------------------------------------------------------------------- -*/ - -//Import the declarative plugins -import QtQuick -import "components" - -//! [0] -import QtSensors -//! [0] - -ApplicationWindow { - - anchors.fill: parent - - // Sensor types used - //! [1] - TiltSensor { - id: tilt - active: false - } - //! [1] - - AmbientLightSensor { - id: ambientlight - active: false - //! [5] - onReadingChanged: { - if (reading.lightLevel == AmbientLightReading.Dark) - ambientlighttext.text = "Ambient light: Dark"; - else if (reading.lightLevel == AmbientLightReading.Twilight) - ambientlighttext.text = "Ambient light: Twilight"; - else if (reading.lightLevel == AmbientLightReading.Light) - ambientlighttext.text = "Ambient light: Light"; - else if (reading.lightLevel == AmbientLightReading.Bright) - ambientlighttext.text = "Ambient light: Bright"; - else if (reading.lightLevel == AmbientLightReading.Sunny) - ambientlighttext.text = "Ambient light: Sunny"; - else - ambientlighttext.text = "Ambient light: Unknown"; - } - //! [5] - } - - ProximitySensor { - id: proxi - active: false - } - - Column { - spacing: 10 - anchors.fill: parent - anchors.margins: 5 - - Text { - id: labelTitle - width: parent.width - horizontalAlignment: Text.AlignHCenter - font.pixelSize: 30 - font.bold: true - text: "QML QtSensors" - } - - // Tilt region - Divider { label: "TiltSensor" } - - Row { - spacing: 20 - width: parent.width - anchors.margins: 5 - Button { - id: calibrate - height: 30 - width: 80 - text: "Calibrate" - onClicked: tilt.calibrate(); - } - Text { - id: xrottext - height: 30 - verticalAlignment: Text.AlignVCenter - //! [3] - text: "X Rotation: " + (tilt.reading ? tilt.reading.xRotation.toFixed(2) + "°" : "Unknown") - //! [3] - } - } - Row { - spacing: 20 - width: parent.width - anchors.margins: 5 - Button { - id: tiltStart - height: 30 - width: 80 - text: tilt.active ? "Stop" : "Start" - onClicked: { - //! [2] - tilt.active = (tiltStart.text === "Start"); - //! [2] - } - } - Text { - id: yrottext - height: 30 - verticalAlignment: Text.AlignVCenter - //! [4] - text: "Y Rotation: " + (tilt.reading ? tilt.reading.yRotation.toFixed(2) + "°" : "Unknown") - //! [4] - } - } - - Divider { label: "AmbientLightSensor" } - - Row { - spacing: 20 - width: parent.width - anchors.margins: 5 - - Button{ - id: ambientlightStart - height: 30 - width: 80 - text: ambientlight.active ? "Stop" : "Start" - onClicked: { - ambientlight.active = (ambientlightStart.text === "Start" ? true : false); - } - } - - Text { - id: ambientlighttext - height: 30 - verticalAlignment: Text.AlignVCenter - text: "Ambient light: Unknown" - } - } - - // Proximity region - Divider { label: "ProximitySensor" } - - Row { - spacing: 20 - width: parent.width - anchors.margins: 5 - - Button { - id: proxiStart - height: 30 - width: 80 - text: proxi.active ? "Stop" : "Start" - - onClicked: { - proxi.active = (proxiStart.text === "Start" ? true: false); - } - } - - Text { - id: proxitext - height: 30 - verticalAlignment: Text.AlignVCenter - //! [6] - text: "Proximity: " + - (proxi.active ? (proxi.reading.near ? "Near" : "Far") : "Unknown") - //! [6] - } - } - } -} diff --git a/examples/sensors/qmlqtsensors/qmlqtsensors.qrc b/examples/sensors/qmlqtsensors/qmlqtsensors.qrc deleted file mode 100644 index 4ba06dad..00000000 --- a/examples/sensors/qmlqtsensors/qmlqtsensors.qrc +++ /dev/null @@ -1,11 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>qmlqtsensors.qml</file> - <file>components/ApplicationWindow.qml</file> - <file>components/Button.qml</file> - <file>components/images/button_background_disabled.png</file> - <file>components/images/button_background_normal.png</file> - <file>components/images/button_background_pressed.png</file> - <file>components/Divider.qml</file> - </qresource> -</RCC> diff --git a/examples/sensors/qmlsensorgestures/Button.qml b/examples/sensors/qmlsensorgestures/Button.qml deleted file mode 100644 index 1a07ceaa..00000000 --- a/examples/sensors/qmlsensorgestures/Button.qml +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -//Import the declarative plugins -import QtQuick - -//Implementation of the Button control. -Item { - id: button - width: 30 - height: 30 - property alias buttonText: 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/examples/sensors/qmlsensorgestures/CMakeLists.txt b/examples/sensors/qmlsensorgestures/CMakeLists.txt deleted file mode 100644 index b7c13c93..00000000 --- a/examples/sensors/qmlsensorgestures/CMakeLists.txt +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(qmlsensorgestures LANGUAGES CXX) - -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/sensors/qmlsensorgestures") - -find_package(Qt6 REQUIRED COMPONENTS Quick) - -qt_add_executable(qmlsensorgestures - main.cpp -) - -set_target_properties(qmlsensorgestures PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(qmlsensorgestures PUBLIC - Qt::Quick -) - -# Resources: -set(qml_resource_files - "Button.qml" - "GestureList.qml" - "GestureView.qml" - "GesturesView.qml" - "qmlsensorgestures.qml" -) - -qt6_add_resources(qmlsensorgestures "qml" - PREFIX - "/" - FILES - ${qml_resource_files} -) - -install(TARGETS qmlsensorgestures - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) - -add_subdirectory(plugin) diff --git a/examples/sensors/qmlsensorgestures/GestureList.qml b/examples/sensors/qmlsensorgestures/GestureList.qml deleted file mode 100644 index f7bc39dd..00000000 --- a/examples/sensors/qmlsensorgestures/GestureList.qml +++ /dev/null @@ -1,99 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -//Import the declarative plugins -import QtQuick -import QtSensors - -/* Layout - gesturerect - / ----------------------------------------/ -|-------------------------------------| -|| labelGesture || -|-------------------------------------| -|-------------------------------------| -|| |<---- gestureListRect -|| || -|| || -|| gestureList || -|| || -|| || -|| || -|| || -|| || -|| || -|-------------------------------------| -*/ - -Rectangle { - id: gesturerect - border.width: 1 - anchors.margins: 5 - - property string selectedGesture: "" - - SensorGesture { - id: gesture - } - - Text { - id: labelGesture - anchors.top: gesturerect.top - anchors.left: gesturerect.left - anchors.right: gesturerect.right - horizontalAlignment: Text.AlignHCenter - font.pixelSize: 30 - font.bold: true - text: "Gestures" - } - - Rectangle { - id: gestureListRect - border.width: 1 - anchors.top: labelGesture.bottom - anchors.left: gesturerect.left - anchors.right: gesturerect.right - anchors.bottom: gesturerect.bottom - anchors.margins: 5 - -//! [4] - ListView { - id: gestureList -//! [4] - anchors.fill: gestureListRect - anchors.margins: 5 -//! [5] - model: gesture.availableGestures -//! [5] - focus: true - currentIndex: -1 - delegate: gestureListDelegate - clip: true -//! [6] - } -//! [6] - - Component { - id: gestureListDelegate - - Rectangle { - width: gestureList.width - height: itemText.height - color: (index === gestureList.currentIndex ? "#999933" : "#FFFFFF") - - Text { - id: itemText - text: model.modelData - } - MouseArea { - anchors.fill: parent - onClicked: { - gestureList.currentIndex = index - selectedGesture = model.modelData - } - } - } - } - } -} diff --git a/examples/sensors/qmlsensorgestures/GestureView.qml b/examples/sensors/qmlsensorgestures/GestureView.qml deleted file mode 100644 index a7cde34d..00000000 --- a/examples/sensors/qmlsensorgestures/GestureView.qml +++ /dev/null @@ -1,115 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -//Import the declarative plugins -import QtQuick - -//! [0] -import QtSensors -//! [0] - -/* Layout - gesturerect - / ----------------------------------------/ -| ----------------------------------- | -| | id: titleText | | -| ----------------------------------- | -| | -| | -| ----------------------------------- | -| | id: detectionText | | -| ----------------------------------- | -| | -| | -| | -| ----------------------------------- | -| | id: valueText | | -| ----------------------------------- | -| | -| | -| | -| ------------------------------ | -| | id: gestureStartStopButton | | -| ------------------------------ | ---------------------------------------- -*/ - -Rectangle { - id: gestureRect - border.width: 1 - anchors.margins: 5 -//! [2] - property alias gestureId: sensorGesture.gestures -//! [2] - property alias gestureTitle: titleText.text - property alias enabled: sensorGesture.enabled - property string oldGesture: "" - property int count: 0 - -//! [1] - SensorGesture { - id: sensorGesture - enabled: false - onDetected: { - if (gesture !== oldGesture) - count = 0; - valueText.text = gesture + " " + count; - oldGesture = gesture; - count++; - } - onEnabledChanged: { - valueText.text = "" - } - } -//! [1] - - Text { - id: titleText - anchors.top: gestureRect.top - anchors.left: gestureRect.left - anchors.right: gestureRect.right - horizontalAlignment: Text.AlignHCenter - font.pixelSize: 20 - font.bold: true - text: "" - } - - Text { - id: detectionText - anchors.top: titleText.bottom - anchors.left: gestureRect.left - anchors.right: gestureRect.right - horizontalAlignment: Text.AlignHCenter - font.pixelSize: 15 - text: "Detection:" - } - - Text { - id: valueText - anchors.top: detectionText.bottom - anchors.left: gestureRect.left - anchors.right: gestureRect.right - horizontalAlignment: Text.AlignHCenter - font.pixelSize: 15 - visible: sensorGesture.enabled - } - - Button{ - id: gestureStartStopButton - anchors.left: gestureRect.left - anchors.bottom: gestureRect.bottom - height: 30 - width: 100 - buttonText: (sensorGesture.enabled ? "Stop" : "Start") - enabled: true; - onClicked: { - if (gestureStartStopButton.buttonText === "Start") { - sensorGesture.enabled = true; - } - else { - sensorGesture.enabled = false; - } - } - } -} diff --git a/examples/sensors/qmlsensorgestures/GesturesView.qml b/examples/sensors/qmlsensorgestures/GesturesView.qml deleted file mode 100644 index 3cd7e0a7..00000000 --- a/examples/sensors/qmlsensorgestures/GesturesView.qml +++ /dev/null @@ -1,119 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -//Import the declarative plugins -import QtQuick -import QtSensors - -/* Layout - gesturerect - / ----------------------------------------/ -| ----------------------------------- | -| | id: titleText | | -| ----------------------------------- | -| | -| | -| ----------------------------------- | -| | id: detectionText | | -| ----------------------------------- | -| | -| | -| | -| ----------------- ----------------- | -| | id: valueText | | id: valueText1| | -| ----------------- ----------------- | -| | -| | -| | -| ------------------------------ | -| | id: gestureStartStopButton | | -| ------------------------------ | ---------------------------------------- -*/ - -Rectangle { - id: gestureRect - border.width: 1 - anchors.margins: 5 - property alias enabled: sensorGesture.enabled - property int count: 0 - property int count1: 0 - - SensorGesture { - id: sensorGesture - enabled: true - gestures: availableGestures - onDetected:{ - if (gesture === "QtSensors.shake") - gestureRect.count++; - else - gestureRect.count1++; - } - onEnabledChanged: { - gestureRect.count = 0; - gestureRect.count1 = 0; - } - } - - Text { - id: titleText - anchors.top: gestureRect.top - anchors.left: gestureRect.left - anchors.right: gestureRect.right - horizontalAlignment: Text.AlignHCenter - font.pixelSize: 20 - font.bold: true - text: "Gesture Counter" - } - - Text { - id: detectionText - anchors.top: titleText.bottom - anchors.left: gestureRect.left - anchors.right: gestureRect.right - horizontalAlignment: Text.AlignHCenter - font.pixelSize: 15 - text: "Shake : SecondCounter" - } - - Text { - id: valueText - anchors.top: detectionText.bottom - anchors.left: gestureRect.left - width: gestureRect.width / 2 - horizontalAlignment: Text.AlignHCenter - font.pixelSize: 15 - text: gestureRect.count - visible: sensorGesture.enabled - } - - Text { - id: valueText1 - anchors.top: detectionText.bottom - anchors.right: gestureRect.right - width: gestureRect.width / 2 - horizontalAlignment: Text.AlignHCenter - font.pixelSize: 15 - text: gestureRect.count1 - visible: sensorGesture.enabled - } - - Button{ - id: gestureStartStopButton - anchors.left: gestureRect.left - anchors.bottom: gestureRect.bottom - height: 30 - width: 100 - buttonText: (sensorGesture.enabled ? "Stop" : "Start") - enabled: true; - onClicked: { - if (gestureStartStopButton.buttonText === "Start") { - sensorGesture.enabled = true; - } - else { - sensorGesture.enabled = false; - } - } - } -} diff --git a/examples/sensors/qmlsensorgestures/doc/src/qmlsensorgestures.qdoc b/examples/sensors/qmlsensorgestures/doc/src/qmlsensorgestures.qdoc deleted file mode 100644 index 4a742213..00000000 --- a/examples/sensors/qmlsensorgestures/doc/src/qmlsensorgestures.qdoc +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example qmlsensorgestures - \title Qt Sensors - SensorGesture QML Type Example - \ingroup qtsensors-examples - - \brief Demonstrates the use of SensorGesture QML type. - - \section1 Overview - To write a QML application that will use the gesture plugin, following - steps are needed: - - Import the QtSensors module: - - \snippet qmlsensorgestures/GestureView.qml 0 - - Add the SensorGesture QML type into your qml file. - - \snippet qmlsensorgestures/GestureView.qml 1 - - Each SensorGesture QML type contains a property called gestures. This example - uses an alias \c gestureId for this property. - - \snippet qmlsensorgestures/GestureView.qml 2 - - Then, the gesture or gestures to use can be specified using the alias: - - \snippet qmlsensorgestures/qmlsensorgestures.qml 3 - \dots 12 - \snippet qmlsensorgestures/qmlsensorgestures.qml 4 - - A list of all available gestures is accessible through the - \c availableGestures property: - - \snippet qmlsensorgestures/GestureList.qml 4 - \codeline - \snippet qmlsensorgestures/GestureList.qml 5 - \dots 12 - \snippet qmlsensorgestures/GestureList.qml 6 - - \sa {Qt Sensors - ShakeIt QML Example}, {Qt Sensor Gestures} -*/ diff --git a/examples/sensors/qmlsensorgestures/main.cpp b/examples/sensors/qmlsensorgestures/main.cpp deleted file mode 100644 index bf5bb9ac..00000000 --- a/examples/sensors/qmlsensorgestures/main.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "../stub.h" -SENSORS_EXAMPLE_MAIN(qmlsensorgestures) diff --git a/examples/sensors/qmlsensorgestures/plugin/CMakeLists.txt b/examples/sensors/qmlsensorgestures/plugin/CMakeLists.txt deleted file mode 100644 index 480fe220..00000000 --- a/examples/sensors/qmlsensorgestures/plugin/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(qtsensorgestures_counterplugin LANGUAGES CXX) - -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}") - -find_package(Qt6 REQUIRED COMPONENTS Core Gui Sensors) - -qt_add_plugin(qtsensorgestures_counterplugin) - -target_sources(qtsensorgestures_counterplugin PRIVATE - qcountergestureplugin.cpp qcountergestureplugin.h - qcounterrecognizer.cpp qcounterrecognizer.h -) - -set_target_properties(qtsensorgestures_counterplugin PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(qtsensorgestures_counterplugin PUBLIC - Qt::Core - Qt::Gui - Qt::Sensors -) - -install(TARGETS qtsensorgestures_counterplugin - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/sensors/qmlsensorgestures/plugin/plugin.pro b/examples/sensors/qmlsensorgestures/plugin/plugin.pro deleted file mode 100644 index bb519c8d..00000000 --- a/examples/sensors/qmlsensorgestures/plugin/plugin.pro +++ /dev/null @@ -1,30 +0,0 @@ -QT += sensors -TARGET = qtsensorgestures_counterplugin - -QTDIR_build { -# This is only for the Qt build. Do not use externally. We mean it. -PLUGIN_TYPE = sensorgestures -PLUGIN_CLASS_NAME = QCounterGesturePlugin -PLUGIN_EXTENDS = - -load(qt_plugin) -CONFIG += install_ok -} else { - -TEMPLATE = lib -CONFIG += plugin - -target.path += $$[QT_INSTALL_PLUGINS]/sensorgestures -INSTALLS += target - -} - -HEADERS += \ - qcountergestureplugin.h \ - qcounterrecognizer.h -SOURCES += \ - qcountergestureplugin.cpp \ - qcounterrecognizer.cpp - -OTHER_FILES += \ - plugin.json - diff --git a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp b/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp deleted file mode 100644 index d55412f2..00000000 --- a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include <QtPlugin> -#include <QStringList> -#include <QObject> - -#include "qcountergestureplugin.h" -#include <qsensorgestureplugininterface.h> -#include <qsensorgesturemanager.h> -#include "qcounterrecognizer.h" - - -QCounterGesturePlugin::QCounterGesturePlugin() -{ -} - -QCounterGesturePlugin::~QCounterGesturePlugin() -{ -} - -QStringList QCounterGesturePlugin::supportedIds() const -{ - QStringList list; - list << "QtSensors.SecondCounter"; - return list; -} - - -QList <QSensorGestureRecognizer *> QCounterGesturePlugin::createRecognizers() -{ - QList <QSensorGestureRecognizer *> recognizers; - - QSensorGestureRecognizer *sRec = new QCounterGestureRecognizer(this); - recognizers.append(sRec); - - return recognizers; -} diff --git a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h b/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h deleted file mode 100644 index 6f216970..00000000 --- a/examples/sensors/qmlsensorgestures/plugin/qcountergestureplugin.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef QCOUNTERGESTUREPLUGIN_H -#define QCOUNTERGESTUREPLUGIN_H - -#include <QObject> -#include <QStringList> - -#include <qsensorgestureplugininterface.h> - -class QCounterGesturePlugin : public QObject, public QSensorGesturePluginInterface -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.QSensorGesturePluginInterface") - Q_INTERFACES(QSensorGesturePluginInterface) - -public: - explicit QCounterGesturePlugin(); - ~QCounterGesturePlugin(); - - QList<QSensorGestureRecognizer *> createRecognizers() override; - - QStringList gestureSignals() const; - QStringList supportedIds() const override; - QString name() const override { return "CounterGestures"; } -}; - -#endif // QCOUNTERGESTUREPLUGIN_H diff --git a/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp b/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp deleted file mode 100644 index 2e872674..00000000 --- a/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.cpp +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include <QDebug> -#include <QTimer> - -#include "qcounterrecognizer.h" - -QCounterGestureRecognizer::QCounterGestureRecognizer(QObject *parent) - : QSensorGestureRecognizer(parent) -{ -} - -QCounterGestureRecognizer::~QCounterGestureRecognizer() -{ - -} - -void QCounterGestureRecognizer::create() -{ - connect(&_timer,SIGNAL(timeout()),this,SLOT(timeout())); - _timer.setInterval(1000); -} - -bool QCounterGestureRecognizer::start() -{ - Q_EMIT detected(id()); - _timer.start(); - return _timer.isActive(); -} - -bool QCounterGestureRecognizer::stop() -{ - _timer.stop(); - return true; -} - - -bool QCounterGestureRecognizer::isActive() -{ - return _timer.isActive(); -} - -QString QCounterGestureRecognizer::id() const -{ - return QString("QtSensors.SecondCounter"); -} - -void QCounterGestureRecognizer::timeout() -{ - Q_EMIT detected(id()); -} diff --git a/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.h b/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.h deleted file mode 100644 index 857860ea..00000000 --- a/examples/sensors/qmlsensorgestures/plugin/qcounterrecognizer.h +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef QCOUNTERGESTURERECOGNIZER_H -#define QCOUNTERGESTURERECOGNIZER_H - -#include <QDebug> -#include <QtCore/QTimer> -#include <qsensorgesturerecognizer.h> - -class QCounterGestureRecognizer : public QSensorGestureRecognizer -{ - Q_OBJECT -public: - - QCounterGestureRecognizer(QObject *parent = 0); - ~QCounterGestureRecognizer(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - -private slots: - void timeout(); - -private: - QTimer _timer; -}; - -#endif // QCOUNTERGESTURERECOGNIZER_H diff --git a/examples/sensors/qmlsensorgestures/qml.pro b/examples/sensors/qmlsensorgestures/qml.pro deleted file mode 100644 index 7b7e4493..00000000 --- a/examples/sensors/qmlsensorgestures/qml.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app -TARGET = qmlsensorgestures -QT += quick -qtConfig(static):QTPLUGIN += qtsensorgestures_plugin qtsensorgestures_shakeplugin - -SOURCES = main.cpp - -OTHER_FILES = \ - $$files(*.qml) - -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/qmlsensorgestures -INSTALLS += target - -RESOURCES += \ - qml.qrc diff --git a/examples/sensors/qmlsensorgestures/qml.qrc b/examples/sensors/qmlsensorgestures/qml.qrc deleted file mode 100644 index af48a3ed..00000000 --- a/examples/sensors/qmlsensorgestures/qml.qrc +++ /dev/null @@ -1,9 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>Button.qml</file> - <file>GestureList.qml</file> - <file>GesturesView.qml</file> - <file>GestureView.qml</file> - <file>qmlsensorgestures.qml</file> - </qresource> -</RCC> diff --git a/examples/sensors/qmlsensorgestures/qmlsensorgestures.pro b/examples/sensors/qmlsensorgestures/qmlsensorgestures.pro deleted file mode 100644 index 011f5f95..00000000 --- a/examples/sensors/qmlsensorgestures/qmlsensorgestures.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = subdirs -CONFIG += ordered - -SUBDIRS = \ - plugin \ - qml.pro diff --git a/examples/sensors/qmlsensorgestures/qmlsensorgestures.qml b/examples/sensors/qmlsensorgestures/qmlsensorgestures.qml deleted file mode 100644 index 7fed5792..00000000 --- a/examples/sensors/qmlsensorgestures/qmlsensorgestures.qml +++ /dev/null @@ -1,80 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -//Import the declarative plugins -import QtQuick -import QtSensors - -/* Layout --------------------------------------------------- -| ---------------------------------------------- | -| | | | -| | | | -| | | | -| | gestureList | | -| | | | -| | | | -| | | | -| | | | -| | | | -| | | | -| | | | -| | | | -| ---------------------------------------------- | -| ---------------------------------------------- | -| | | | -| | gesture | | -| | | | -| | | | -| ---------------------------------------------- | -| ---------------------------------------------- | -| | | | -| | gestures | | -| | | | -| | | | -| ---------------------------------------------- | --------------------------------------------------- -*/ - -Rectangle { - id: viewArea - width: 320 - height: 460 - color: '#d6d6d6' - - GestureList { - id: gestureList - parent: viewArea - anchors.left: viewArea.left - anchors.top: viewArea.top - anchors.right: viewArea.right - height: viewArea.height / 2 -//! [3] - onSelectedGestureChanged: { - gesture.enabled = false; - gesture.gestureId = gestureList.selectedGesture; -//! [3] - gesture.gestureTitle = gestureList.selectedGesture; -//! [4] - } -//! [4] - } - - GestureView { - id: gesture - parent: viewArea - anchors.left: viewArea.left - anchors.top: gestureList.bottom - anchors.right: viewArea.right - height: 100 - } - - GesturesView { - id: gestures - parent: viewArea - anchors.left: viewArea.left - anchors.top: gesture.bottom - anchors.right: viewArea.right - height: 100 - } -} diff --git a/examples/sensors/sensor_explorer/CMakeLists.txt b/examples/sensors/sensor_explorer/CMakeLists.txt deleted file mode 100644 index c0bccf80..00000000 --- a/examples/sensors/sensor_explorer/CMakeLists.txt +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(sensor_explorer LANGUAGES CXX) - -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/sensors/sensor_explorer") - -find_package(Qt6 REQUIRED COMPONENTS Qml Quick Sensors) - -qt_add_executable(sensor_explorer - main.cpp - sensormodels.cpp sensormodels.h -) - -set_target_properties(sensor_explorer PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(sensor_explorer PUBLIC - Qt::Qml - Qt::Quick - Qt::Sensors -) - -qt_add_qml_module(sensor_explorer - URI SensorModels - VERSION 1.0 - QML_FILES sensor_explorer.qml - NO_RESOURCE_TARGET_PATH -) - -install(TARGETS sensor_explorer - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/sensors/sensor_explorer/doc/images/qtsensors-examples-sensor-explorer.png b/examples/sensors/sensor_explorer/doc/images/qtsensors-examples-sensor-explorer.png Binary files differdeleted file mode 100644 index 830f9597..00000000 --- a/examples/sensors/sensor_explorer/doc/images/qtsensors-examples-sensor-explorer.png +++ /dev/null diff --git a/examples/sensors/sensor_explorer/doc/src/sensor_explorer.qdoc b/examples/sensors/sensor_explorer/doc/src/sensor_explorer.qdoc deleted file mode 100644 index f4d7c6bc..00000000 --- a/examples/sensors/sensor_explorer/doc/src/sensor_explorer.qdoc +++ /dev/null @@ -1,118 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example sensor_explorer - \title Qt Sensors - Explorer QML Example - \ingroup qtsensors-examples - \brief Demonstrates how to read the meta-data of available sensors. - - \image qtsensors-examples-sensor-explorer.png - - The example is implemented as a typical model-view application. The - models are written with C++ and exposed to QML, and the views are - implemented as QML types in the QML application. - - \section1 Exposing and Importing the Models - - The QML models written in C++ are exposed in the project build files - as a \c SensorModels QML module. - - \e CMake: - \code - qt_add_qml_module(sensor_explorer - URI SensorModels - VERSION 1.0 - ) - \endcode - - \e qmake: - \code - CONFIG += qmltypes - QML_IMPORT_NAME = SensorModels - QML_IMPORT_MAJOR_VERSION = 1 - \endcode - - The individual model elements are exposed as part of the model - code by using the \c QML_ELEMENT macro as illustrated here: - \snippet sensor_explorer/sensormodels.h 0 - - To access the models in the QML application, the module is imported - by the application QML: - \snippet sensor_explorer/sensor_explorer.qml 0 - - \section1 Populating the Model of Available Sensors - - The \c AvailableSensorsModel is a list model that provides information on - available sensors on the device. The model is populated once at the - element's construction time: - - \snippet sensor_explorer/sensormodels.cpp 0 - - The model's \c data() function returns a pointer to the requested sensor - object. - - \snippet sensor_explorer/sensormodels.cpp 1 - - Since the sensor (QSensor) is a QObject, the QML is then able to directly - access all metaproperties and -functions directly. - - \note It would be possible to refresh the sensor list later at will, but for - the simplicity of the example such functionality is not exposed to QML. - - \section1 Populating the Model of Sensor Properties - - The \c SensorPropertyModel is a table model that provides individual - sensor's property-value pairs as columns. The column \c 0 provides the - property's name and the column \c 1 provides the property's value. The - population of the properties is done by reading the metadata of the sensors. - The model reads both the sensor's metadata as well as the sensor's reading's - metadata. The code below illustrates the reading of the \c reading metadata: - - \snippet sensor_explorer/sensormodels.cpp 2 - - This metadata access allows providing the model data for all sensors - without prior compile-time understanding of their properties. - - Once the metadata is set, the code then subscribes to the - QSensor::readingChanged() signal to detect sensor reading changes. - Upon such changes (for example a rotation value changes), the model data - is updated accordingly. - - \section1 Viewing the Models - - The QML application is based on two views. The first view shows the available - sensors as a selectable list. The second view shows the selected sensor's - properties and their values. The delegates for viewing the individual items - are simplistic \e {rectangle and text} items. - - Binding the two views functionally together is done by binding the property - model's \c sensor property to the current selection of the available sensors - model: - - \snippet sensor_explorer/sensor_explorer.qml 1 - - When the selected sensor changes, the \c sensor of the property model changes - accordingly. - - The following snippet illustrates how the property view is implemented. For - more details about QML models and views, please see - \l{Models and Views in Qt Quick}. - - \snippet sensor_explorer/sensor_explorer.qml 3 - - For clarity it should be mentioned that the \c display attribute used by - the text element refers to the Qt::DisplayRole role of the model, which is - provided by default by Qt models. - - \section1 Activating the Sensors - - The example has a button for activating and deactivating the currently - selected sensor. The button is enabled only if a sensor is currently - selected, as illustrated below. - - \snippet sensor_explorer/sensor_explorer.qml 2 - - On clicking the button, the sensor's active property is toggled on/off. - -*/ diff --git a/examples/sensors/sensor_explorer/sensor_explorer.pro b/examples/sensors/sensor_explorer/sensor_explorer.pro deleted file mode 100644 index a27681e2..00000000 --- a/examples/sensors/sensor_explorer/sensor_explorer.pro +++ /dev/null @@ -1,22 +0,0 @@ -TEMPLATE = app -TARGET = sensor_explorer -QT += qml quick sensors - -# Avoid going to release/debug subdirectory -win32: DESTDIR = ./ - -SOURCES = main.cpp sensormodels.cpp -HEADERS = sensormodels.h - -CONFIG += qmltypes -QML_IMPORT_NAME = SensorModels -QML_IMPORT_MAJOR_VERSION = 1 - -OTHER_FILES = \ - sensor_explorer.qml - -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/sensor_explorer -INSTALLS += target - -RESOURCES += \ - qml.qrc diff --git a/examples/sensors/sensorgestures/CMakeLists.txt b/examples/sensors/sensorgestures/CMakeLists.txt deleted file mode 100644 index d7b274a9..00000000 --- a/examples/sensors/sensorgestures/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(gesture LANGUAGES CXX) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTOUIC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/sensors/sensorgestures") - -find_package(Qt6 REQUIRED COMPONENTS Core Gui Sensors Widgets) - -qt_add_executable(gesture - main.cpp - mainwindow.cpp mainwindow.h mainwindow.ui -) - -set_target_properties(gesture PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(gesture PUBLIC - Qt::Core - Qt::Gui - Qt::Sensors - Qt::Widgets -) - -install(TARGETS gesture - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/sensors/sensorgestures/doc/images/sensorgesturecpp.png b/examples/sensors/sensorgestures/doc/images/sensorgesturecpp.png Binary files differdeleted file mode 100644 index 4d453cf2..00000000 --- a/examples/sensors/sensorgestures/doc/images/sensorgesturecpp.png +++ /dev/null diff --git a/examples/sensors/sensorgestures/doc/src/sensorgestures.qdoc b/examples/sensors/sensorgestures/doc/src/sensorgestures.qdoc deleted file mode 100644 index 4a88a1ad..00000000 --- a/examples/sensors/sensorgestures/doc/src/sensorgestures.qdoc +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example sensorgestures - \title Qt Sensors - C++ Sensor Gestures Example - \ingroup qtsensors-examples - \brief The sensor gesture example demonstrates the steps for creating a C++ application - that uses sensor gestures and the included shake sensor. - \image sensorgesturecpp.png - - QSensorGestures class defines one predefined signal, \c { void detected(const QString &) } - - As well, Sensor Gesture Recognizers may implement any number of their own custom signals. - - Our shake recognizer defines one custom signal, \c {void shake()}, as well as the predefined - detected signal. - - \section1 SensorGestures Class Implementation - - In order to know about custom signals that may be available, we need to ask the QSensorGestureManager about them, - - Using the QSensorGesture::gestureIds() function, the manager will return a QStringList of known and valid gesture Ids. - \snippet sensorgestures/mainwindow.cpp 0 - - We can then use this to create a QSensorGesture object that we can use to connect signals to, - and start the detection process. A QSensorGesture object will take a list of one or more - recognizer ids in it's constructor. - - \snippet sensorgestures/mainwindow.cpp 1 - - and later stop the detection process. - - \snippet sensorgestures/mainwindow.cpp 2 - - The QSensorGesture object will contain all the signals of the valid requested recognizers found on the system. - - You can discover which of the requested recognizer ID's that were not found by using QSensorGesture::invalidIds(); - - By using QSensorGesture::gestureSignals(), you can get a QStringList of usable signals. - - -*/ diff --git a/examples/sensors/sensorgestures/main.cpp b/examples/sensors/sensorgestures/main.cpp deleted file mode 100644 index 30b745ec..00000000 --- a/examples/sensors/sensorgestures/main.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include <QtWidgets/QApplication> -#include "mainwindow.h" - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - MainWindow w; - w.show(); - - return a.exec(); -} diff --git a/examples/sensors/sensorgestures/mainwindow.cpp b/examples/sensors/sensorgestures/mainwindow.cpp deleted file mode 100644 index 99af9bfa..00000000 --- a/examples/sensors/sensorgestures/mainwindow.cpp +++ /dev/null @@ -1,131 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include <QtCore/QDebug> -#include <QtWidgets/QTreeWidget> - -#include "mainwindow.h" -#include "ui_mainwindow.h" - -#include <qsensorgesture.h> -#include <qsensorgesturemanager.h> - -MainWindow::MainWindow(QWidget *parent) - : QMainWindow(parent), - ui(new Ui::MainWindow) -{ - ui->setupUi(this); - //! [0] - - QSensorGestureManager manager; - - for (const QString &gesture : manager.gestureIds()) { - - QTreeWidgetItem *gestureId = new QTreeWidgetItem(ui->treeWidget); - QStringList recognizerSignals = manager.recognizerSignals(gesture); - gestureId->setText(0,gesture); - - for (int i = 0; i < recognizerSignals.count(); i++) { - QTreeWidgetItem *oneSignal = new QTreeWidgetItem(gestureId); - oneSignal->setText(0,recognizerSignals.at(i)); - } - ui->treeWidget->insertTopLevelItem(0,gestureId); - } - //! [0] - - - ui->textEdit->setReadOnly(true); -} - -MainWindow::~MainWindow() -{ - delete ui; -} - -void MainWindow::detectedShake(const QString &name) -{ - QString str = "<font size=+2><B>"+name+"</b></font><br>"; - ui->textEdit->insertHtml(str); - ui->textEdit->ensureCursorVisible(); -} - -void MainWindow::on_pushButton_clicked() -{ - ui->textEdit->clear(); -} - -void MainWindow::onShake() -{ - QString str = "<font size=+2><B>onShake()</b></font><br>"; - ui->textEdit->insertHtml(str); - ui->textEdit->ensureCursorVisible(); -} - -void MainWindow::on_startPushButton_clicked() -{ - if (ui->treeWidget->currentItem() == 0) - return; - QString currentRecognizer; - - if (ui->treeWidget->currentItem()->childCount() == 0) { - currentRecognizer = ui->treeWidget->currentItem()->parent()->text(0); - } else { - currentRecognizer = ui->treeWidget->currentItem()->text(0); - } - - if (recognizerMap.contains(currentRecognizer)) - return; - //! [1] - QSensorGestureManager manager; - QSensorGesture *thisGesture = new QSensorGesture(QStringList() << currentRecognizer, this); - - if (currentRecognizer.contains("QtSensors.shake")) { - connect(thisGesture,SIGNAL(shake()), - this,SLOT(onShake())); - } - - connect(thisGesture,SIGNAL(detected(QString)), - this,SLOT(detectedShake(QString))); - thisGesture->startDetection(); - - //! [1] - - recognizerMap.insert(currentRecognizer,thisGesture); - - QString str = QString("<font size=+2><B>Started %1</b></font><br>").arg(currentRecognizer); - ui->textEdit->insertHtml(str); - ui->textEdit->ensureCursorVisible(); -} - -void MainWindow::on_stopPushButton_clicked() -{ - if (ui->treeWidget->currentItem() == 0) - return; - QString currentRecognizer; - - if (ui->treeWidget->currentItem()->childCount() == 0) { - currentRecognizer = ui->treeWidget->currentItem()->parent()->text(0); - } else { - currentRecognizer = ui->treeWidget->currentItem()->text(0); - } - - if (!recognizerMap.contains(currentRecognizer)) - return; - //! [2] - - recognizerMap[currentRecognizer]->stopDetection(); - - if (currentRecognizer == "QtSensors.shake") { - disconnect(recognizerMap[currentRecognizer],SIGNAL(shake()), - this,SLOT(onShake())); - } - disconnect(recognizerMap[currentRecognizer],SIGNAL(detected(QString)), - this,SLOT(detectedShake(QString))); - //! [2] - - recognizerMap.take(currentRecognizer); - - QString str = QString("<font size=+2><B>Stopped %1</b></font><br>").arg(currentRecognizer); - ui->textEdit->insertHtml(str); - ui->textEdit->ensureCursorVisible(); -} diff --git a/examples/sensors/sensorgestures/mainwindow.h b/examples/sensors/sensorgestures/mainwindow.h deleted file mode 100644 index 2eb37b14..00000000 --- a/examples/sensors/sensorgestures/mainwindow.h +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include <QtWidgets/QMainWindow> -#include <qsensorgesture.h> -QT_BEGIN_NAMESPACE -namespace Ui { - class MainWindow; -} - -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - explicit MainWindow(QWidget *parent = 0); - ~MainWindow(); - -private: - Ui::MainWindow *ui; - QMap <QString, QSensorGesture *> recognizerMap; - -private slots: - void detectedShake(const QString&); - void onShake(); - - void on_pushButton_clicked(); - - void on_startPushButton_clicked(); - void on_stopPushButton_clicked(); -}; - - -QT_END_NAMESPACE - -#endif // MAINWINDOW_H diff --git a/examples/sensors/sensorgestures/mainwindow.ui b/examples/sensors/sensorgestures/mainwindow.ui deleted file mode 100644 index baccf98c..00000000 --- a/examples/sensors/sensorgestures/mainwindow.ui +++ /dev/null @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>MainWindow</class> - <widget class="QMainWindow" name="MainWindow"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>423</width> - <height>474</height> - </rect> - </property> - <property name="windowTitle"> - <string>MainWindow</string> - </property> - <widget class="QWidget" name="centralWidget"> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0" colspan="2"> - <widget class="QTreeWidget" name="treeWidget"> - <column> - <property name="text"> - <string>Gesture Recognizer Id</string> - </property> - </column> - </widget> - </item> - <item row="1" column="0"> - <widget class="QPushButton" name="startPushButton"> - <property name="text"> - <string>Start</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QPushButton" name="stopPushButton"> - <property name="text"> - <string>Stop</string> - </property> - </widget> - </item> - <item row="2" column="0" colspan="2"> - <widget class="QTextEdit" name="textEdit"> - <property name="html"> - <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"></p></body></html></string> - </property> - </widget> - </item> - <item row="3" column="0"> - <widget class="QPushButton" name="pushButton"> - <property name="text"> - <string>Clear</string> - </property> - </widget> - </item> - </layout> - </widget> - <widget class="QMenuBar" name="menuBar"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>423</width> - <height>22</height> - </rect> - </property> - </widget> - <widget class="QToolBar" name="mainToolBar"> - <attribute name="toolBarArea"> - <enum>TopToolBarArea</enum> - </attribute> - <attribute name="toolBarBreak"> - <bool>false</bool> - </attribute> - </widget> - <widget class="QStatusBar" name="statusBar"/> - </widget> - <layoutdefault spacing="6" margin="11"/> - <resources/> - <connections/> -</ui> diff --git a/examples/sensors/sensorgestures/sensorgestures.pro b/examples/sensors/sensorgestures/sensorgestures.pro deleted file mode 100644 index 9310ecd9..00000000 --- a/examples/sensors/sensorgestures/sensorgestures.pro +++ /dev/null @@ -1,16 +0,0 @@ -TEMPLATE = app -TARGET = gesture -QT += sensors widgets -qtConfig(static):QTPLUGIN += qtsensorgestures_plugin qtsensorgestures_shakeplugin - -requires(qtConfig(treewidget)) - -SOURCES += main.cpp\ - mainwindow.cpp - -HEADERS += mainwindow.h - -FORMS += mainwindow.ui - -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/sensorgestures -INSTALLS += target diff --git a/examples/sensors/sensors.pro b/examples/sensors/sensors.pro index 62bb9e06..d304cbd9 100644 --- a/examples/sensors/sensors.pro +++ b/examples/sensors/sensors.pro @@ -1,21 +1,5 @@ TEMPLATE = subdirs -SUBDIRS += grue - -qtHaveModule(quick) { - SUBDIRS += \ - maze \ - qmlqtsensors \ - sensor_explorer - # qmlsensorgestures \ - # shakeit - - qtHaveModule(svg): SUBDIRS += \ - accelbubble +qtHaveModule(quick): qtHaveModule(svg): { + SUBDIRS += sensorsshowcase } - -# qtHaveModule(widgets): SUBDIRS += \ -# sensorgestures - -EXAMPLE_FILES += \ - stub.h diff --git a/examples/sensors/sensorsshowcase/Accelerometer.qml b/examples/sensors/sensorsshowcase/Accelerometer.qml new file mode 100644 index 00000000..a22e1404 --- /dev/null +++ b/examples/sensors/sensorsshowcase/Accelerometer.qml @@ -0,0 +1,70 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +pragma ComponentBehavior: Bound +import QtQuick +import QtQuick.Layouts +import QtSensors + +Item { + id: root + + required property int fontSize + required property int imageSize + + //! [0] + Accelerometer { + id: accelerometer + + property real x: 0 + property real y: 0 + property real z: 0 + + active: true + dataRate: 25 + + onReadingChanged: { + x = (reading as AccelerometerReading).x + y = (reading as AccelerometerReading).y + z = (reading as AccelerometerReading).z + imageTranslation.x = -x * 10 + imageTranslation.y = y * 10 + } + } + //! [0] + ColumnLayout { + id: layout + + anchors.fill: parent + spacing: 10 + + Image { + id: image + + Layout.alignment: Qt.AlignCenter + Layout.preferredHeight: root.imageSize + Layout.preferredWidth: root.imageSize + fillMode: Image.PreserveAspectFit + source: "images/qt_logo.png" + + transform: [ + Translate { + id: imageTranslation + + x: 0 + y: 0 + } + ] + } + + ProgressXYZBar { + Layout.fillWidth: true + fontSize: root.fontSize + xText: "X: " + accelerometer.x.toFixed(2) + xValue: 0.5 + (accelerometer.x / 100) + yText: "Y: " + accelerometer.y.toFixed(2) + yValue: 0.5 + (accelerometer.y / 100) + zText: "Z: " + accelerometer.z.toFixed(2) + zValue: 0.5 + (accelerometer.z / 100) + } + } +} diff --git a/examples/sensors/sensorsshowcase/CMakeLists.txt b/examples/sensors/sensorsshowcase/CMakeLists.txt index 8575af75..b949213a 100644 --- a/examples/sensors/sensorsshowcase/CMakeLists.txt +++ b/examples/sensors/sensorsshowcase/CMakeLists.txt @@ -1,18 +1,16 @@ -# Copyright (C) 2022 The Qt Company Ltd. +# Copyright (C) 2023 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(sensorsshowcase LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) - if(NOT DEFINED INSTALL_EXAMPLESDIR) set(INSTALL_EXAMPLESDIR "examples") endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/sensors/sensorsshowcase") - -find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Sensors Svg) +find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick Svg Sensors) +qt_standard_project_setup(REQUIRES 6.5) qt_add_executable(sensorsshowcase main.cpp @@ -26,43 +24,47 @@ set_target_properties(sensorsshowcase PROPERTIES if(ANDROID) set_property(TARGET sensorsshowcase PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android) - endif() -if(APPLE) - if(IOS) - set_property(TARGET sensorsshowcase PROPERTY - MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist" - ) - endif() endif() -target_link_libraries(sensorsshowcase PUBLIC - Qt::Core - Qt::Gui - Qt::Quick - Qt::Sensors - Qt::Svg -) +if(APPLE AND IOS) + set_property(TARGET sensorsshowcase PROPERTY + MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist" + ) +else() + # default search path for the config file is "qrc:/" + qt_add_resources(sensorsshowcase "resources" + FILES qtquickcontrols2.conf) +endif() -# Resources: -set(sensorsshowcase_resource_files - "sensorsshowcase.qml" - "accelerometer.qml" - "proximity.qml" - "compass.qml" - "magnetometer.qml" - "gyroscope.qml" - "images/magnet.svg" - "images/compass.svg" - "images/qt_logo.png" +qt_add_qml_module(sensorsshowcase + URI SensorShowcaseModule + VERSION 1.0 + QML_FILES + "Main.qml" + "Accelerometer.qml" + "Compass.qml" + "Gyroscope.qml" + "Magnetometer.qml" + "Proximity.qml" + "ProgressXYZBar.qml" + RESOURCES + "images/compass.svg" + "images/magnet.svg" + "images/qt_logo.png" + SOURCES + sensorsupport.h ) -qt6_add_resources(sensorsshowcase "sensorsshowcase" - PREFIX - "/" - FILES - ${sensorsshowcase_resource_files} +target_link_libraries(sensorsshowcase + PRIVATE + Qt::Core + Qt::Gui + Qt::Quick + Qt::Svg + Qt::Sensors ) + install(TARGETS sensorsshowcase RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/sensors/sensorsshowcase/Compass.qml b/examples/sensors/sensorsshowcase/Compass.qml new file mode 100644 index 00000000..b4bc5ff1 --- /dev/null +++ b/examples/sensors/sensorsshowcase/Compass.qml @@ -0,0 +1,61 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +pragma ComponentBehavior: Bound +import QtQuick +import QtQuick.Layouts +import QtSensors + +Item { + id: root + + required property int fontSize + required property int imageSize + property alias isActive: compass.active + + property real azimuth: 30 + + Compass { + id: compass + active: true + dataRate: 7 + onReadingChanged: root.azimuth = -(reading as CompassReading).azimuth + } + + ColumnLayout { + id: layout + + anchors.fill: parent + spacing: 10 + + Image { + id: arrow + + Layout.alignment: Qt.AlignHCenter + Layout.preferredWidth: root.imageSize * 1.25 + Layout.fillHeight: true + + source: "images/compass.svg" + fillMode: Image.PreserveAspectFit + rotation: root.azimuth + } + + Rectangle { + id: separator + + Layout.topMargin: 10 + Layout.preferredWidth: parent.width * 0.75 + Layout.preferredHeight: 1 + Layout.alignment: Qt.AlignHCenter + color: "black" + } + + Text { + id: info + Layout.fillWidth: true + Layout.fillHeight: true + Layout.topMargin: 10 + text: "Azimuth: " + root.azimuth.toFixed(2) + "°" + font.pixelSize: root.fontSize + } + } +} diff --git a/examples/sensors/sensorsshowcase/Gyroscope.qml b/examples/sensors/sensorsshowcase/Gyroscope.qml new file mode 100644 index 00000000..9f0ffd2f --- /dev/null +++ b/examples/sensors/sensorsshowcase/Gyroscope.qml @@ -0,0 +1,128 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +pragma ComponentBehavior: Bound +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts +import QtSensors + +Item { + id: root + + required property int fontSize + required property int imageSize + + function resetRotations() : void + { + imageXRotation.angle = 0 + imageYRotation.angle = 0 + imageZRotation.angle = 0 + } + + //! [0] + Gyroscope { + id: gyroscope + + property var lastTimeStamp: 0 + property real x: 0 + property real y: 0 + property real z: 0 + + active: true + dataRate: 25 + + onReadingChanged: { + x = (reading as GyroscopeReading).x + y = (reading as GyroscopeReading).y + z = (reading as GyroscopeReading).z + let firstCall = false + if (lastTimeStamp == 0) { + firstCall = true + } + let timeSinceLast = reading.timestamp - lastTimeStamp + lastTimeStamp = reading.timestamp + + //Skipping the initial time jump from 0 + if (firstCall === true) + return + let normalizedX = x * (timeSinceLast / 1000000) + imageXRotation.angle += normalizedX + let normalizedY = y * (timeSinceLast / 1000000) + imageYRotation.angle -= normalizedY + let normalizedZ = z * (timeSinceLast / 1000000) + imageZRotation.angle += normalizedZ + } + } + //! [0] + ColumnLayout { + id: layout + + anchors.fill: parent + spacing: 10 + + Image { + id: image + + Layout.alignment: Qt.AlignHCenter + Layout.fillHeight: true + Layout.preferredWidth: root.imageSize + fillMode: Image.PreserveAspectFit + source: "images/qt_logo.png" + + transform: [ + Rotation { + id: imageXRotation + + angle: 0 + axis.x: 1 + axis.y: 0 + axis.z: 0 + origin.x: layout.width / 2 + origin.y: layout.height / 3 + }, + Rotation { + id: imageYRotation + + angle: 0 + axis.x: 0 + axis.y: 1 + axis.z: 0 + origin.x: layout.width / 2 + origin.y: layout.height / 3 + }, + Rotation { + id: imageZRotation + + angle: 0 + axis.x: 0 + axis.y: 0 + axis.z: 1 + origin.x: layout.width / 2 + origin.y: layout.height / 3 + } + ] + } + + ProgressXYZBar { + Layout.fillWidth: true + Layout.topMargin: 20 + fontSize: root.fontSize + xText: "X: " + gyroscope.x.toFixed(2) + xValue: 0.5 + (gyroscope.x / 1000) + yText: "Y: " + gyroscope.y.toFixed(2) + yValue: 0.5 + (gyroscope.y / 1000) + zText: "Z: " + gyroscope.z.toFixed(2) + zValue: 0.5 + (gyroscope.z / 1000) + } + + Button { + Layout.alignment: Qt.AlignHCenter + Layout.topMargin: 20 + Layout.bottomMargin: 10 + Layout.preferredWidth: parent.width / 2 + Layout.preferredHeight: 60 + onClicked: root.resetRotations() + text: "Reset rotation" + } + } +} diff --git a/examples/sensors/sensorsshowcase/Magnetometer.qml b/examples/sensors/sensorsshowcase/Magnetometer.qml new file mode 100644 index 00000000..551f8627 --- /dev/null +++ b/examples/sensors/sensorsshowcase/Magnetometer.qml @@ -0,0 +1,68 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +pragma ComponentBehavior: Bound +import QtQuick +import QtQuick.Layouts +import QtSensors + +Item { + id: root + + required property int fontSize + required property int imageSize + + property real magnetRotation: 40 + property real magnetometerX: 0 + property real magnetometerY: 0 + property real magnetometerZ: 0 + property int barScaleFactor: 10000 + + //! [0] + Magnetometer { + id: magnetometer + active: true + dataRate: 25 + onReadingChanged: { + root.magnetometerX = (reading as MagnetometerReading).x + root.magnetometerY = (reading as MagnetometerReading).y + root.magnetometerZ = (reading as MagnetometerReading).z + root.magnetRotation = + ((Math.atan2(root.magnetometerX, root.magnetometerY) / Math.PI) * 180) + } + } + //! [0] + + ColumnLayout { + id: layout + + anchors.fill: parent + spacing: 10 + + Image { + id: image + + Layout.alignment: Qt.AlignHCenter + Layout.bottomMargin: 20 + Layout.preferredWidth: root.imageSize * 0.9 + Layout.preferredHeight: root.imageSize * 0.9 + + source: "images/magnet.svg" + fillMode: Image.PreserveAspectFit + rotation: root.magnetRotation + } + + ProgressXYZBar { + Layout.fillWidth: true + fontSize: root.fontSize + + xText: "X: " + root.magnetometerX.toFixed(9) + xValue: 0.5 + (root.magnetometerX * root.barScaleFactor) + + yText: "Y: " + root.magnetometerY.toFixed(9) + yValue: 0.5 + (root.magnetometerY * root.barScaleFactor) + + zText: "Z: " + root.magnetometerZ.toFixed(9) + zValue: 0.5 + (root.magnetometerZ * root.barScaleFactor) + } + } +} diff --git a/examples/sensors/sensorsshowcase/Main.qml b/examples/sensors/sensorsshowcase/Main.qml new file mode 100644 index 00000000..4587ba21 --- /dev/null +++ b/examples/sensors/sensorsshowcase/Main.qml @@ -0,0 +1,116 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +pragma ComponentBehavior: Bound + +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts + +ApplicationWindow { + id: root + + readonly property int defaultFontSize: 22 + readonly property int imageSize: width / 2 + + width: 420 + height: 760 + visible: true + title: "Sensors Showcase" + + header : ToolBar { + RowLayout { + anchors.fill: parent + anchors.leftMargin: 10 + anchors.rightMargin: 10 + ToolButton { + id: back + text: qsTr("Back") + font.pixelSize: root.defaultFontSize - 4 + visible: stack.depth > 1 + onClicked: { + stack.pop(); + heading.text = root.title; + } + Layout.alignment: Qt.AlignLeft + } + Label { + id: heading + text: root.title + font.pixelSize: root.defaultFontSize + font.weight: Font.Medium + verticalAlignment: Qt.AlignVCenter + Layout.alignment: Qt.AlignCenter + Layout.preferredHeight: 55 + } + Item { + visible: back.visible + Layout.preferredWidth: back.width + } + } + } + + StackView { + id: stack + + // Pushes the object and forwards the properties + function pusher(object : string) : void { + // Trim the suffix and set it as new heading + heading.text = object.split(".")[0] + return stack.push(object, { + fontSize: root.defaultFontSize, + imageSize: root.imageSize + }) + } + + anchors.fill: parent + anchors.margins: width / 12 + + initialItem: Item { + ColumnLayout { + id: initialItem + + anchors.fill: parent + anchors.topMargin: 20 + anchors.bottomMargin: 20 + spacing: 5 + + component CustomButton: Button { + highlighted: true + font.pixelSize: root.defaultFontSize + font.letterSpacing: 1.5 + + Layout.alignment: Qt.AlignCenter + Layout.fillHeight: true + Layout.fillWidth: true + } + + CustomButton { + text: "Accelerometer" + onClicked: stack.pusher("Accelerometer.qml") + enabled: SensorSupport.hasAccelerometer() + } + CustomButton { + text: "Proximity" + onClicked: stack.pusher("Proximity.qml") + enabled: SensorSupport.hasProximity() + } + CustomButton { + text: "Compass" + onClicked: stack.pusher("Compass.qml") + enabled: SensorSupport.hasCompass() + } + CustomButton { + text: "Magnetometer" + onClicked: stack.pusher("Magnetometer.qml") + enabled: SensorSupport.hasMagnetometer() + } + CustomButton { + text: "Gyroscope" + onClicked: stack.pusher("Gyroscope.qml") + enabled: SensorSupport.hasGyroscope() + } + } + } + } + +} diff --git a/examples/sensors/sensorsshowcase/ProgressXYZBar.qml b/examples/sensors/sensorsshowcase/ProgressXYZBar.qml new file mode 100644 index 00000000..be7bf7ae --- /dev/null +++ b/examples/sensors/sensorsshowcase/ProgressXYZBar.qml @@ -0,0 +1,45 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +pragma ComponentBehavior: Bound +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts + +ColumnLayout { + id: root + spacing: 0 + + required property int fontSize + property alias xText: xBar.text + property alias xValue: xBar.value + property alias yText: yBar.text + property alias yValue: yBar.value + property alias zText: zBar.text + property alias zValue: zBar.value + + component NamedProgressBar: ColumnLayout { + property alias text: axes.text + property alias value: bar.value + Text { + id: axes + font.pixelSize: root.fontSize + Layout.fillWidth: true + } + ProgressBar { + id: bar + Layout.fillWidth: true + } + } + + NamedProgressBar { + id: xBar + } + + NamedProgressBar { + id: yBar + } + + NamedProgressBar { + id: zBar + } +} diff --git a/examples/sensors/sensorsshowcase/Proximity.qml b/examples/sensors/sensorsshowcase/Proximity.qml new file mode 100644 index 00000000..41121983 --- /dev/null +++ b/examples/sensors/sensorsshowcase/Proximity.qml @@ -0,0 +1,55 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +pragma ComponentBehavior: Bound +import QtQuick +import QtQuick.Layouts +import QtSensors + +Item { + id: root + + required property int imageSize + required property int fontSize + + property bool near: false + + ProximitySensor { + id: proximity + onReadingChanged: root.near = (reading as ProximityReading).near + active: true + } + + ColumnLayout { + id: layout + + anchors.fill: parent + spacing: 10 + + Image { + id: image + + Layout.alignment: Qt.AlignHCenter + Layout.preferredWidth: root.near ? root.imageSize : root.imageSize * 0.75 + Layout.fillHeight: true + + source: "images/qt_logo.png" + fillMode: Image.PreserveAspectFit + } + + Rectangle { + id: separator + Layout.topMargin: 10 + Layout.bottomMargin: 10 + Layout.preferredWidth: parent.width * 0.75 + Layout.preferredHeight: 1 + Layout.alignment: Qt.AlignHCenter + color: "black" + } + + Text { + Layout.fillHeight: true + font.pixelSize: root.fontSize + text: "Near: " + root.near + } + } +} diff --git a/examples/sensors/sensorsshowcase/accelerometer.qml b/examples/sensors/sensorsshowcase/accelerometer.qml deleted file mode 100644 index e4f6e39b..00000000 --- a/examples/sensors/sensorsshowcase/accelerometer.qml +++ /dev/null @@ -1,122 +0,0 @@ -// Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -import QtQuick -import QtQuick.Controls -import QtQuick.Layouts -import QtSensors - -Rectangle { - id: root - color: "dimgray" - - function resetRotations() { - imageXRotation.angle = 0 - imageYRotation.angle = 0 - imageZRotation.angle = 0 - } - -//! [0] - Accelerometer { - id: accelerometer - active: true - dataRate: 25 - - property real x: 0 - property real y: 0 - property real z: 0 - - onReadingChanged: { - x = reading.x - y = reading.y - z = reading.z - - imageTranslation.x = -reading.x * 10 - imageTranslation.y = reading.y * 10 - } - } -//! [0] - - ColumnLayout { - anchors.fill: parent - id: layout - - Text { - Layout.topMargin: titleTopMargin - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - Layout.preferredHeight: textHeight - color: "White" - text: "Accelerometer" - font.pixelSize: titleFontSize - } - - Image { - id: image - Layout.alignment: Qt.AlignCenter - Layout.fillHeight: true - Layout.preferredWidth: root.width/2 - Layout.preferredHeight: root.height/3 - source: "qrc:/images/qt_logo.png" - fillMode: Image.PreserveAspectFit - - transform: [ - Translate { - id: imageTranslation - x: 0 - y: 0 - } - ] - } - - Text { - Layout.preferredWidth: root.width - Layout.preferredHeight: textHeight - Layout.leftMargin: layout.spacing - color: "White" - text: "X: " + accelerometer.x.toFixed(2) - font.pixelSize: textFontSize - } - - ProgressBar { - id: xbar - value: 0.5 + (accelerometer.x / 100) - Layout.preferredWidth: root.width - } - - Text { - Layout.preferredWidth: root.width - Layout.preferredHeight: textHeight - Layout.leftMargin: layout.spacing - color: "White" - text: "Y: " + accelerometer.y.toFixed(2) - font.pixelSize: textFontSize - } - ProgressBar { - id: ybar - value: 0.5 + (accelerometer.y / 100) - Layout.preferredWidth: root.width - } - Text { - Layout.preferredWidth: root.width - Layout.preferredHeight: textHeight - Layout.leftMargin: layout.spacing - color: "White" - text: "Z: " + accelerometer.z.toFixed(2) - font.pixelSize: textFontSize - } - ProgressBar { - id: zbar - value: 0.5 + (accelerometer.z / 100) - Layout.preferredWidth: root.width - } - Button { - Layout.alignment: Qt.AlignBottom - Layout.preferredWidth: root.width - Layout.preferredHeight: buttonHeight - text:"Back" - font.pixelSize: buttonFontSize - onClicked:stack.pop() - } - } -} - diff --git a/examples/sensors/sensorsshowcase/android/AndroidManifest.xml b/examples/sensors/sensorsshowcase/android/AndroidManifest.xml index 3c152a90..359c0114 100644 --- a/examples/sensors/sensorsshowcase/android/AndroidManifest.xml +++ b/examples/sensors/sensorsshowcase/android/AndroidManifest.xml @@ -11,7 +11,6 @@ <!-- The comment below will be replaced with dependencies permissions upon deployment. Remove the comment if you do not require these default features. --> <!-- %%INSERT_FEATURES --> - <supports-screens android:anyDensity="true" android:largeScreens="true" @@ -22,26 +21,37 @@ android:extractNativeLibs="true" android:hardwareAccelerated="true" android:label="-- %%INSERT_APP_NAME%% --" - android:requestLegacyExternalStorage="true"> + android:requestLegacyExternalStorage="true" + android:allowNativeHeapPointerTagging="false" + android:allowBackup="true" + android:fullBackupOnly="false" + android:icon="@drawable/icon"> <activity android:name="org.qtproject.qt.android.bindings.QtActivity" android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density" android:label="-- %%INSERT_APP_NAME%% --" android:launchMode="singleTop" - android:screenOrientation="portrait"> + android:screenOrientation="portrait" + android:exported="true"> <intent-filter> - <action android:name="android.intent.action.MAIN"/> - <category android:name="android.intent.category.LAUNCHER"/> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> + <meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --" /> - <meta-data - android:name="android.app.background_running" - android:value="false" /> + + <meta-data android:name="android.app.arguments" + android:value="" /> + <meta-data android:name="android.app.extract_android_style" android:value="minimal" /> + + <meta-data + android:name="android.app.background_running" + android:value="false" /> </activity> </application> </manifest> diff --git a/examples/sensors/sensorsshowcase/android/res/drawable-hdpi/icon.png b/examples/sensors/sensorsshowcase/android/res/drawable-hdpi/icon.png Binary files differnew file mode 100644 index 00000000..5f61088b --- /dev/null +++ b/examples/sensors/sensorsshowcase/android/res/drawable-hdpi/icon.png diff --git a/examples/sensors/sensorsshowcase/android/res/drawable-ldpi/icon.png b/examples/sensors/sensorsshowcase/android/res/drawable-ldpi/icon.png Binary files differnew file mode 100644 index 00000000..605497de --- /dev/null +++ b/examples/sensors/sensorsshowcase/android/res/drawable-ldpi/icon.png diff --git a/examples/sensors/sensorsshowcase/android/res/drawable-mdpi/icon.png b/examples/sensors/sensorsshowcase/android/res/drawable-mdpi/icon.png Binary files differnew file mode 100644 index 00000000..3eb10832 --- /dev/null +++ b/examples/sensors/sensorsshowcase/android/res/drawable-mdpi/icon.png diff --git a/examples/sensors/sensorsshowcase/android/res/drawable-xhdpi/icon.png b/examples/sensors/sensorsshowcase/android/res/drawable-xhdpi/icon.png Binary files differnew file mode 100644 index 00000000..a9e39f88 --- /dev/null +++ b/examples/sensors/sensorsshowcase/android/res/drawable-xhdpi/icon.png diff --git a/examples/sensors/sensorsshowcase/android/res/drawable-xxhdpi/icon.png b/examples/sensors/sensorsshowcase/android/res/drawable-xxhdpi/icon.png Binary files differnew file mode 100644 index 00000000..b489d81e --- /dev/null +++ b/examples/sensors/sensorsshowcase/android/res/drawable-xxhdpi/icon.png diff --git a/examples/sensors/sensorsshowcase/android/res/drawable-xxxhdpi/icon.png b/examples/sensors/sensorsshowcase/android/res/drawable-xxxhdpi/icon.png Binary files differnew file mode 100644 index 00000000..9443da63 --- /dev/null +++ b/examples/sensors/sensorsshowcase/android/res/drawable-xxxhdpi/icon.png diff --git a/examples/sensors/sensorsshowcase/compass.qml b/examples/sensors/sensorsshowcase/compass.qml deleted file mode 100644 index 65ea3543..00000000 --- a/examples/sensors/sensorsshowcase/compass.qml +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -import QtQuick -import QtQuick.Controls -import QtQuick.Layouts -import QtSensors - -Rectangle { - id: root - color: "dimgray" - property real azimuth: 30 - readonly property real buttonHeight: height/8 - - Compass { - id: compass - active: true - dataRate: 7 - onReadingChanged: { - root.azimuth = -reading.azimuth - } - } - - ColumnLayout { - anchors.fill: parent - id: layout - - Text { - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - Layout.preferredHeight: titleHeight - Layout.topMargin: titleTopMargin - verticalAlignment: Text.AlignVCenter - color: "White" - text: "Compass" - font.pixelSize: titleFontSize - } - Image { - Layout.alignment: Qt.AlignCenter - Layout.fillHeight: true - Layout.preferredWidth: root.width - Layout.preferredHeight: root.height - id: arrow - source: "qrc:/images/compass.svg" - fillMode: Image.PreserveAspectFit - rotation:root.azimuth - } - Text { - Layout.preferredWidth: root.width - Layout.preferredHeight: textHeight - Layout.leftMargin: layout.spacing - color: "White" - text: "Azimuth: " + root.azimuth.toFixed(2) + "°" - font.pixelSize: textFontSize - } - Button { - Layout.alignment: Qt.AlignBottom - Layout.preferredWidth: root.width - Layout.preferredHeight: buttonHeight - text:"Back" - font.pixelSize: buttonFontSize - onClicked:stack.pop() - } - } -} diff --git a/examples/sensors/sensorsshowcase/doc/images/sensorsshowcase-gyroscope.png b/examples/sensors/sensorsshowcase/doc/images/sensorsshowcase-gyroscope.png Binary files differdeleted file mode 100644 index b26aa459..00000000 --- a/examples/sensors/sensorsshowcase/doc/images/sensorsshowcase-gyroscope.png +++ /dev/null diff --git a/examples/sensors/sensorsshowcase/doc/images/sensorsshowcase-gyroscope.webp b/examples/sensors/sensorsshowcase/doc/images/sensorsshowcase-gyroscope.webp Binary files differnew file mode 100644 index 00000000..0ff45403 --- /dev/null +++ b/examples/sensors/sensorsshowcase/doc/images/sensorsshowcase-gyroscope.webp diff --git a/examples/sensors/sensorsshowcase/doc/images/sensorsshowcase-mainview.png b/examples/sensors/sensorsshowcase/doc/images/sensorsshowcase-mainview.png Binary files differdeleted file mode 100644 index 838b39c9..00000000 --- a/examples/sensors/sensorsshowcase/doc/images/sensorsshowcase-mainview.png +++ /dev/null diff --git a/examples/sensors/sensorsshowcase/doc/images/sensorsshowcase-mainview.webp b/examples/sensors/sensorsshowcase/doc/images/sensorsshowcase-mainview.webp Binary files differnew file mode 100644 index 00000000..b045b7ba --- /dev/null +++ b/examples/sensors/sensorsshowcase/doc/images/sensorsshowcase-mainview.webp diff --git a/examples/sensors/sensorsshowcase/doc/src/sensorsshowcase.qdoc b/examples/sensors/sensorsshowcase/doc/src/sensorsshowcase.qdoc index b2971f01..d3d31c34 100644 --- a/examples/sensors/sensorsshowcase/doc/src/sensorsshowcase.qdoc +++ b/examples/sensors/sensorsshowcase/doc/src/sensorsshowcase.qdoc @@ -1,13 +1,15 @@ -// Copyright (C) 2021 The Qt Company Ltd. +// Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only /*! \example sensorsshowcase - \title Qt Sensors - Sensors Showcase + \title Sensors Showcase \brief The Sensors Showcase example demonstrates sensor usage with visual examples. + \meta tag {sensors,quick,mobile} \ingroup qtsensors-examples + \examplecategory {Mobile} - \image sensorsshowcase-mainview.png + \image sensorsshowcase-mainview.webp \section1 Overview @@ -17,9 +19,14 @@ \section1 Main Menu - The main view shows the title with the name of the application and a button for each - subview laid out evenly by a \c ColumnLayout. The navigation between the subviews - and the main menu is managed by a \c StackView. + The main view shows the title with the name of the application and a button + for each subview laid out evenly by a \c ColumnLayout. A \c StackView + manages the navigation between the subviews and the main menu. The + application checks the availability of the sensors during startup and + disables the buttons for the sensors that are not available. + + \note To simplify the example, the sensor availability is checked only once + during the startup. \section1 Accelerometer View @@ -29,7 +36,7 @@ Moving around the image happens in the accelerometer \c onReadingChanged method. - \snippet sensorsshowcase/accelerometer.qml 0 + \snippet sensorsshowcase/Accelerometer.qml 0 Whenever there is a new accelerometer value the image translation coordinates are updated accordingly. @@ -52,11 +59,11 @@ case of how the magnetometer readings can be used. Since the magnetometer provides readings along all three axes, there is more freedom with how these readings can be used. - \snippet sensorsshowcase/magnetometer.qml 0 + \snippet sensorsshowcase/Magnetometer.qml 0 \section1 Gyroscope View - \image sensorsshowcase-gyroscope.png + \image sensorsshowcase-gyroscope.webp The gyroscope view also shows an image that is rotated around three axes with an amount that is calculated from the gyroscope readings. Since the gyroscope provides relative @@ -64,7 +71,7 @@ can vary, the time of the readings are stored and the rotational change is normalized based on the time passed between reading updates. - \snippet sensorsshowcase/gyroscope.qml 0 + \snippet sensorsshowcase/Gyroscope.qml 0 By pressing the reset button the image rotation is reset to 0. */ diff --git a/examples/sensors/sensorsshowcase/gyroscope.qml b/examples/sensors/sensorsshowcase/gyroscope.qml deleted file mode 100644 index 39252c0e..00000000 --- a/examples/sensors/sensorsshowcase/gyroscope.qml +++ /dev/null @@ -1,174 +0,0 @@ -// Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -import QtQuick -import QtQuick.Controls -import QtQuick.Layouts -import QtSensors - -Rectangle { - id: root - color: "dimgray" - - function resetRotations() { - imageXRotation.angle = 0 - imageYRotation.angle = 0 - imageZRotation.angle = 0 - } - -//! [0] - Gyroscope { - id: gyroscope - active: true - dataRate: 25 - - property variant lastTimeStamp: 0 - - property real x: 0 - property real y: 0 - property real z: 0 - - onReadingChanged: { - - x = reading.x - y = reading.y - z = reading.z - - var firstCall = false - if (lastTimeStamp == 0) { - firstCall = true - } - - var timeSinceLast = reading.timestamp - lastTimeStamp - lastTimeStamp = reading.timestamp - - //Skipping the initial time jump from 0 - if (firstCall === true) return - - var normalizedX = reading.x * (timeSinceLast/1000000) - imageXRotation.angle += normalizedX - - var normalizedY = reading.y * (timeSinceLast/1000000) - imageYRotation.angle -= normalizedY - - var normalizedZ = reading.z * (timeSinceLast/1000000) - imageZRotation.angle += normalizedZ - } - } -//! [0] - - ColumnLayout { - anchors.fill: parent - id: layout - - Text { - Layout.topMargin: titleTopMargin - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - Layout.preferredHeight: textHeight - color: "White" - text: "Gyroscope" - font.pixelSize: titleFontSize - } - - Image { - id: image - Layout.alignment: Qt.AlignCenter - Layout.fillHeight: true - Layout.preferredWidth: root.height/3 - Layout.preferredHeight: root.height/3 - source: "qrc:/images/qt_logo.png" - fillMode: Image.PreserveAspectFit - - transform: [ - Rotation { - id: imageXRotation - origin.x: layout.width/2 - origin.y: layout.height/3 - axis.x: 1 - axis.y: 0 - axis.z: 0 - angle: 0 - }, - Rotation { - id: imageYRotation - origin.x: layout.width/2 - origin.y: layout.height/3 - axis.x: 0 - axis.y: 1 - axis.z: 0 - angle: 0 - }, - Rotation { - id: imageZRotation - origin.x: layout.width/2 - origin.y: layout.height/3 - axis.x: 0 - axis.y: 0 - axis.z: 1 - angle: 0 - } - ] - } - - Text { - Layout.preferredWidth: root.width - Layout.preferredHeight: textHeight - Layout.leftMargin: layout.spacing - color: "White" - text: "X: " + gyroscope.x.toFixed(2) - font.pixelSize: textFontSize - } - - ProgressBar { - id: xbar - value: 0.5 + (gyroscope.x / 1000) - Layout.preferredWidth: root.width - } - - Text { - Layout.preferredWidth: root.width - Layout.preferredHeight: textHeight - Layout.leftMargin: layout.spacing - color: "White" - text: "Y: " + gyroscope.y.toFixed(2) - font.pixelSize: textFontSize - } - ProgressBar { - id: ybar - value: 0.5 + (gyroscope.y / 1000) - Layout.preferredWidth: root.width - } - Text { - Layout.preferredWidth: root.width - Layout.preferredHeight: textHeight - Layout.leftMargin: layout.spacing - color: "White" - text: "Z: " + gyroscope.z.toFixed(2) - font.pixelSize: textFontSize - } - ProgressBar { - id: zbar - value: 0.5 + (gyroscope.z / 1000) - Layout.preferredWidth: root.width - } - Button { - Layout.alignment: Qt.AlignBottom - Layout.preferredWidth: root.width - Layout.preferredHeight: buttonHeight - text:"Reset rotation" - font.pixelSize: buttonFontSize - onClicked: { - resetRotations() - } - } - Button { - Layout.alignment: Qt.AlignBottom - Layout.preferredWidth: root.width - Layout.preferredHeight: buttonHeight - text:"Back" - font.pixelSize: buttonFontSize - onClicked:stack.pop() - } - } -} - diff --git a/examples/sensors/sensorsshowcase/images/qt_logo.png b/examples/sensors/sensorsshowcase/images/qt_logo.png Binary files differindex 30c621c9..3a75e10c 100644 --- a/examples/sensors/sensorsshowcase/images/qt_logo.png +++ b/examples/sensors/sensorsshowcase/images/qt_logo.png diff --git a/examples/sensors/sensorsshowcase/magnetometer.qml b/examples/sensors/sensorsshowcase/magnetometer.qml deleted file mode 100644 index c40bb867..00000000 --- a/examples/sensors/sensorsshowcase/magnetometer.qml +++ /dev/null @@ -1,103 +0,0 @@ -// Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -import QtQuick -import QtQuick.Controls -import QtQuick.Layouts -import QtSensors - -Rectangle { - id: root - color: "dimgray" - - property real magnetRotation: 40 - property real magnetometerX: 0 - property real magnetometerY: 0 - property real magnetometerZ: 0 - property int barScaleFactor: 10000 - -//! [0] - Magnetometer { - id: magnetometer - active: true - dataRate: 25 - onReadingChanged: { - root.magnetometerX = reading.x - root.magnetometerY = reading.y - root.magnetometerZ = reading.z - root.magnetRotation = ((Math.atan2(reading.x, reading.y) / Math.PI) * 180) - } - } -//! [0] - - ColumnLayout { - anchors.fill: parent - id: layout - - Text { - Layout.topMargin: titleTopMargin - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - Layout.preferredHeight: titleHeight - verticalAlignment: Text.AlignVCenter - color: "White" - text: "Magnetometer" - font.pixelSize: titleFontSize - } - Image { - Layout.alignment: Qt.AlignCenter - Layout.fillHeight: true - Layout.preferredWidth: root.width / 2 - Layout.preferredHeight: root.height / 2 - source: "qrc:/images/magnet.svg" - fillMode: Image.PreserveAspectFit - rotation: magnetRotation - } - Text { - Layout.preferredWidth: root.width - Layout.preferredHeight: textHeight - Layout.leftMargin: layout.spacing - color: "White" - text: "X: " + root.magnetometerX.toFixed(9) - font.pixelSize: textFontSize - } - ProgressBar { - id: xbar - value: 0.5 + (root.magnetometerX * barScaleFactor) - Layout.preferredWidth: root.width - } - Text { - Layout.preferredWidth: root.width - Layout.preferredHeight: textHeight - Layout.leftMargin: layout.spacing - color: "White" - text: "Y: " + root.magnetometerY.toFixed(9) - font.pixelSize: textFontSize - } - ProgressBar { - id: ybar - value: 0.5 + (root.magnetometerY * barScaleFactor) - Layout.preferredWidth: root.width - } - Text { - Layout.preferredWidth: root.width - Layout.preferredHeight: textHeight - Layout.leftMargin: layout.spacing - color: "White" - text: "Z: " + root.magnetometerZ.toFixed(9) - font.pixelSize: textFontSize - } - ProgressBar { - id: zbar - value: 0.5 + (root.magnetometerZ * barScaleFactor) - Layout.preferredWidth: root.width - } - Button { - Layout.alignment: Qt.AlignBottom - Layout.preferredWidth: root.width - Layout.preferredHeight: buttonHeight - text:"Back" - font.pixelSize: buttonFontSize - onClicked:stack.pop() - } - } -} diff --git a/examples/sensors/sensorsshowcase/main.cpp b/examples/sensors/sensorsshowcase/main.cpp index 52e27a06..4a7bd285 100644 --- a/examples/sensors/sensorsshowcase/main.cpp +++ b/examples/sensors/sensorsshowcase/main.cpp @@ -1,14 +1,18 @@ -// Copyright (C) 2021 The Qt Company Ltd. +// Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - - -#include <QtGui/QGuiApplication> -#include <QtQml/QQmlApplicationEngine> +#include <QGuiApplication> +#include <QQmlApplicationEngine> int main(int argc, char *argv[]) { QGuiApplication app(argc,argv); - QQmlApplicationEngine engine(QUrl("qrc:///sensorsshowcase.qml")); + QGuiApplication::setOrganizationName("QtProject"); + QGuiApplication::setApplicationName("Sensors Showcase"); + + QQmlApplicationEngine engine; + engine.loadFromModule("SensorShowcaseModule", "Main"); + if (engine.rootObjects().isEmpty()) + return -1; return app.exec(); } diff --git a/examples/sensors/sensorsshowcase/proximity.qml b/examples/sensors/sensorsshowcase/proximity.qml deleted file mode 100644 index 7e4f6486..00000000 --- a/examples/sensors/sensorsshowcase/proximity.qml +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -import QtQuick -import QtQuick.Controls -import QtQuick.Layouts -import QtSensors - -Rectangle { - id: root - color: "dimgray" - property bool near: false - - ProximitySensor { - id: proximity - active: true - onReadingChanged: { - root.near = reading.near - } - } - - ColumnLayout { - anchors.fill: parent - id: layout - - Text { - Layout.topMargin: titleTopMargin - Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter - Layout.preferredHeight: textHeight - color: "White" - text: "Proximity" - font.pixelSize: titleFontSize - } - Image { - Layout.alignment: Qt.AlignCenter - Layout.fillHeight: true - Layout.preferredWidth: root.near ? root.height/3 : root.height/4 - Layout.preferredHeight: root.near ? root.height/3 : root.height/4 - source: "qrc:/images/qt_logo.png" - fillMode: Image.PreserveAspectFit - } - Text { - visible: !proximity - Layout.preferredWidth: root.width - Layout.preferredHeight: textHeight - Layout.leftMargin: layout.spacing - font.pixelSize: textFontSize - verticalAlignment: Text.AlignVCenter - wrapMode: Text.WordWrap - color: "White" - text: "The proximity sensor is not available on this device!" - } - Text { -// visible: typeof proximity.available !== 'undefined' - Layout.preferredWidth: root.width - Layout.preferredHeight: textHeight - Layout.leftMargin: layout.spacing - color: "White" - text: "Near: " + root.near - font.pixelSize: textFontSize - } - Button { - Layout.alignment: Qt.AlignBottom - Layout.preferredWidth: root.width - Layout.preferredHeight: buttonHeight - text:"Back" - font.pixelSize: buttonFontSize - onClicked:stack.pop() - } - } -} diff --git a/examples/sensors/sensorsshowcase/qmldir b/examples/sensors/sensorsshowcase/qmldir new file mode 100644 index 00000000..76e61cdf --- /dev/null +++ b/examples/sensors/sensorsshowcase/qmldir @@ -0,0 +1,9 @@ +module SensorShowcaseModule +prefer :/qt/qml/SensorShowcaseModule/ +Main 1.0 Main.qml +Accelerometer 1.0 Accelerometer.qml +Compass 1.0 Compass.qml +Gyroscope 1.0 Gyroscope.qml +Magnetometer 1.0 Magnetometer.qml +Proximity 1.0 Proximity.qml +ProgressXYZBar 1.0 ProgressXYZBar.qml diff --git a/examples/sensors/sensorsshowcase/qtquickcontrols2.conf b/examples/sensors/sensorsshowcase/qtquickcontrols2.conf new file mode 100644 index 00000000..76439328 --- /dev/null +++ b/examples/sensors/sensorsshowcase/qtquickcontrols2.conf @@ -0,0 +1,6 @@ +[Controls] +Style=Material + +[Material] +Background=#eafcf3 +Accent=#28c878 diff --git a/examples/sensors/sensorsshowcase/sensorsshowcase.pro b/examples/sensors/sensorsshowcase/sensorsshowcase.pro index f57733f5..cded9071 100644 --- a/examples/sensors/sensorsshowcase/sensorsshowcase.pro +++ b/examples/sensors/sensorsshowcase/sensorsshowcase.pro @@ -1,27 +1,46 @@ -TEMPLATE = app -TARGET = sensorsshowcase +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + QT += quick sensors svg + +TARGET = sensorsshowcase +TEMPLATE = app + SOURCES = main.cpp -RESOURCES += \ - sensorsshowcase.qrc +qml_resources.files = \ + qmldir \ + Main.qml \ + Accelerometer.qml \ + Compass.qml \ + Gyroscope.qml \ + Magnetometer.qml \ + Proximity.qml \ + ProgressXYZBar.qml \ + images/compass.svg \ + images/magnet.svg \ + images/qt_logo.png -OTHER_FILES = \ - $$files(*.qml) \ - images \ - android/AndroidManifest.xml +qml_resources.prefix = /qt/qml/SensorShowcaseModule -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/sensorsshowcase -INSTALLS += target +data_resources.files = \ + qtquickcontrols2.conf -ios { -QMAKE_INFO_PLIST = Info.plist +data_resources.prefix = / + +RESOURCES += \ + qml_resources \ + data_resources -# manual plugin loading needed with older Qt -# QTPLUGIN += qsvg qtsensors_ios qtsensors_generic +android { + OTHER_FILES = android/AndroidManifest.xml + ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android } -ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android +ios { + QMAKE_INFO_PLIST = Info.plist + EXAMPLE_FILES += Info.plist +} -EXAMPLE_FILES += \ - Info.plist +target.path = $$[QT_INSTALL_EXAMPLES]/sensors/sensorsshowcase +INSTALLS += target diff --git a/examples/sensors/sensorsshowcase/sensorsshowcase.qml b/examples/sensors/sensorsshowcase/sensorsshowcase.qml deleted file mode 100644 index e0fbd944..00000000 --- a/examples/sensors/sensorsshowcase/sensorsshowcase.qml +++ /dev/null @@ -1,76 +0,0 @@ -// Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -import QtQuick -import QtQuick.Controls -import QtQuick.Layouts -import QtSensors - -ApplicationWindow { - title: "Sensors Showcase" - id: mainWindow - width: 540 - height: 1200 - visible: true - color: "dimgray" - - property int titleHeight: height/7 - readonly property real buttonHeight: height/7 - property int textHeight: height/24 - readonly property int buttonFontSize: 30 - readonly property int textFontSize: 20 - readonly property int titleFontSize: 35 - readonly property int titleTopMargin: mainWindow.height/24 - - StackView { - id: stack - anchors.fill: parent - initialItem: ColumnLayout { - width: stack.width - Text { - Layout.topMargin: mainWindow.height/12 - Layout.alignment: Qt.AlignCenter - Layout.preferredHeight: titleHeight - text: "Sensors Showcase" - color: "White" - font.pixelSize: titleFontSize - } - - Button { - Layout.fillHeight: true - Layout.preferredWidth: stack.width - text: "Accelerometer" - font.pixelSize: buttonFontSize - onClicked: stack.push("qrc:/accelerometer.qml") - } - Button { - Layout.fillHeight: true - Layout.preferredWidth: stack.width - text: "Proximity" - font.pixelSize: buttonFontSize - onClicked: stack.push("qrc:/proximity.qml") - } - Button { - Layout.fillHeight: true - Layout.preferredWidth: stack.width - text: "Compass" - font.pixelSize: buttonFontSize - onClicked: stack.push("qrc:/compass.qml") - } - Button { - Layout.fillHeight: true - Layout.preferredWidth: stack.width - text: "Magnetometer" - font.pixelSize: buttonFontSize - onClicked: stack.push("qrc:/magnetometer.qml") - } - Button { - Layout.fillHeight: true - Layout.preferredWidth: stack.width - text: "Gyroscope" - font.pixelSize: buttonFontSize - onClicked: stack.push("qrc:/gyroscope.qml") - } - } - } -} diff --git a/examples/sensors/sensorsshowcase/sensorsshowcase.qrc b/examples/sensors/sensorsshowcase/sensorsshowcase.qrc deleted file mode 100644 index e647c384..00000000 --- a/examples/sensors/sensorsshowcase/sensorsshowcase.qrc +++ /dev/null @@ -1,13 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>sensorsshowcase.qml</file> - <file>accelerometer.qml</file> - <file>proximity.qml</file> - <file>compass.qml</file> - <file>magnetometer.qml</file> - <file>gyroscope.qml</file> - <file>images/magnet.svg</file> - <file>images/compass.svg</file> - <file>images/qt_logo.png</file> - </qresource> -</RCC> diff --git a/examples/sensors/sensorsshowcase/sensorsupport.h b/examples/sensors/sensorsshowcase/sensorsupport.h new file mode 100644 index 00000000..915157f8 --- /dev/null +++ b/examples/sensors/sensorsshowcase/sensorsupport.h @@ -0,0 +1,41 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +#ifndef SENSORSUPPORT_H +#define SENSORSUPPORT_H + +#include <QObject> +#include <QtQmlIntegration> +#include <QtSensors/QtSensors> + +class SensorSupport : public QObject +{ + Q_OBJECT + QML_ELEMENT + QML_SINGLETON + QML_UNCREATABLE("SensorSupport is a utility class") +public: + explicit SensorSupport(QObject *parent = nullptr) : QObject(parent) { } + + Q_INVOKABLE static bool hasAccelerometer() + { + return !QSensor::sensorsForType(QAccelerometer::sensorType).empty(); + } + Q_INVOKABLE static bool hasCompass() + { + return !QSensor::sensorsForType(QCompass::sensorType).empty(); + } + Q_INVOKABLE static bool hasGyroscope() + { + return !QSensor::sensorsForType(QGyroscope::sensorType).empty(); + } + Q_INVOKABLE static bool hasMagnetometer() + { + return !QSensor::sensorsForType(QMagnetometer::sensorType).empty(); + } + Q_INVOKABLE static bool hasProximity() + { + return !QSensor::sensorsForType(QProximitySensor::sensorType).empty(); + } +}; + +#endif // SENSORSUPPORT_H diff --git a/examples/sensors/shakeit/CMakeLists.txt b/examples/sensors/shakeit/CMakeLists.txt deleted file mode 100644 index b455090c..00000000 --- a/examples/sensors/shakeit/CMakeLists.txt +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -cmake_minimum_required(VERSION 3.16) -project(shakeit LANGUAGES CXX) - -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/sensors/shakeit") - -find_package(Qt6 REQUIRED COMPONENTS Core Gui Quick) - -qt_add_executable(shakeit - main.cpp -) - -set_target_properties(shakeit PROPERTIES - WIN32_EXECUTABLE TRUE - MACOSX_BUNDLE TRUE -) - -target_link_libraries(shakeit PUBLIC - Qt::Core - Qt::Gui - Qt::Quick -) - -# Resources: -set(shakeit_resource_files - "audio/loopy2a_mono.wav" - "audio/phone.wav" - "content/triangle.png" - "content/triangle2.png" - "content/triangle3.png" - "shakeit.qml" -) - -qt6_add_resources(shakeit "shakeit" - PREFIX - "/" - FILES - ${shakeit_resource_files} -) - -install(TARGETS shakeit - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) diff --git a/examples/sensors/shakeit/audio/loopy2a_mono.wav b/examples/sensors/shakeit/audio/loopy2a_mono.wav Binary files differdeleted file mode 100644 index 7d76cb65..00000000 --- a/examples/sensors/shakeit/audio/loopy2a_mono.wav +++ /dev/null diff --git a/examples/sensors/shakeit/audio/phone.wav b/examples/sensors/shakeit/audio/phone.wav Binary files differdeleted file mode 100644 index 884e9ac2..00000000 --- a/examples/sensors/shakeit/audio/phone.wav +++ /dev/null diff --git a/examples/sensors/shakeit/content/triangle.png b/examples/sensors/shakeit/content/triangle.png Binary files differdeleted file mode 100644 index f366537e..00000000 --- a/examples/sensors/shakeit/content/triangle.png +++ /dev/null diff --git a/examples/sensors/shakeit/content/triangle2.png b/examples/sensors/shakeit/content/triangle2.png Binary files differdeleted file mode 100644 index 9318d5a3..00000000 --- a/examples/sensors/shakeit/content/triangle2.png +++ /dev/null diff --git a/examples/sensors/shakeit/content/triangle3.png b/examples/sensors/shakeit/content/triangle3.png Binary files differdeleted file mode 100644 index 4cc5ccda..00000000 --- a/examples/sensors/shakeit/content/triangle3.png +++ /dev/null diff --git a/examples/sensors/shakeit/doc/images/shakeit.png b/examples/sensors/shakeit/doc/images/shakeit.png Binary files differdeleted file mode 100644 index 5ca1b58c..00000000 --- a/examples/sensors/shakeit/doc/images/shakeit.png +++ /dev/null diff --git a/examples/sensors/shakeit/doc/src/shakeit.qdoc b/examples/sensors/shakeit/doc/src/shakeit.qdoc deleted file mode 100644 index 2dfb33bb..00000000 --- a/examples/sensors/shakeit/doc/src/shakeit.qdoc +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! - \example shakeit - \title Qt Sensors - ShakeIt QML Example - \ingroup qtsensors-examples - \image shakeit.png - - \section2 ShakeIt in QML - \brief The sensor gesture example demonstrates the steps for creating a QML application - that uses sensor gestures and the included shake sensor. - - Writing a QML application that uses the Shake QML sensorgestures type requires the following steps: - - Import the Sensors Declarative module. - - \snippet shakeit/shakeit.qml 0 - - Add a SensorGesture QML type. - - \snippet shakeit/shakeit.qml 1 - - In the SensorGesture type, specify which gesture to be used. - Note that this can be a comma separated list. Here we are only interested in one - gesture recognizer. - - \snippet shakeit/shakeit.qml 2 - - Use the 'enabled' property to start the sensor gesture. - - \snippet shakeit/shakeit.qml 3 - - Use the onDetected signal to do stuff. - - \snippet shakeit/shakeit.qml 4 - - There are additional gestures to shake which are supported: - whip, twistRight, hover, cover, turnover and pickup. -*/ diff --git a/examples/sensors/shakeit/main.cpp b/examples/sensors/shakeit/main.cpp deleted file mode 100644 index d550f8bc..00000000 --- a/examples/sensors/shakeit/main.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "../stub.h" -SENSORS_EXAMPLE_MAIN(shakeit) diff --git a/examples/sensors/shakeit/shakeit.pro b/examples/sensors/shakeit/shakeit.pro deleted file mode 100644 index 327c669b..00000000 --- a/examples/sensors/shakeit/shakeit.pro +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE = app -TARGET = shakeit -QT += quick sensors -qtConfig(static):QTPLUGIN += qtsensorgestures_plugin qtsensorgestures_shakeplugin - -SOURCES = main.cpp - -RESOURCES += \ - shakeit.qrc - -OTHER_FILES = \ - $$files(*.qml) \ - audio \ - content - -target.path = $$[QT_INSTALL_EXAMPLES]/sensors/shakeit -INSTALLS += target diff --git a/examples/sensors/shakeit/shakeit.qml b/examples/sensors/shakeit/shakeit.qml deleted file mode 100644 index 683e3b16..00000000 --- a/examples/sensors/shakeit/shakeit.qml +++ /dev/null @@ -1,328 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -import QtQuick -//! [0] -import QtSensors -//! [0] - -Rectangle { - id: window - anchors.fill: parent - - state: "default" - - Text { - id: label - text: qsTr("Shake to rotate triangles") - y: parent.height / 4 - anchors.horizontalCenter: parent.horizontalCenter - } - Image { - id: triangle1 - smooth: true - source: "content/triangle.png" - x: parent.width / 2 - (triangle1.width / 2) - y: parent.height / 2 - (triangle1.height); - Behavior on x { SmoothedAnimation { velocity: 200 } } - Behavior on y { SmoothedAnimation { velocity: 200 } } - transform: Rotation { - id: myRot - } - } - Image { - id: triangle2 - smooth: true - source: "content/triangle2.png" - x: parent.width / 2 - (triangle1.width + triangle2.width / 2) - y: parent.height / 2 + (triangle2.height / 2); - Behavior on x { SmoothedAnimation { velocity: 200 } } - Behavior on y { SmoothedAnimation { velocity: 200 } } - } - Image { - id: triangle3 - smooth: true - source: "content/triangle3.png" - x: parent.width / 2 + (triangle1.width / 2) - y: parent.height / 2 + (triangle3.height / 2); - Behavior on x { SmoothedAnimation { velocity: 200 } } - Behavior on y { SmoothedAnimation { velocity: 200 } } - } - - states: [ - State { - name: "rotated" - PropertyChanges { target: triangle1; rotation: 180 } - PropertyChanges { target: triangle2; rotation: 90 } - PropertyChanges { target: triangle3; rotation: 270 } - }, - State { - name: "default" - PropertyChanges { target: triangle1; rotation: 0; - x: parent.width / 2 - (triangle1.width / 2) - y: parent.height / 2 - (triangle1.height) - scale: 1; - - } - PropertyChanges { target: triangle2; rotation: 0; - x: parent.width / 2 - (triangle1.width + triangle2.width / 2) - y: parent.height / 2 + (triangle2.height / 2); - scale: 1; - } - PropertyChanges { target: triangle3; rotation: 0; - x: parent.width / 2 + (triangle1.width / 2) - y: parent.height / 2 + (triangle3.height / 2); - scale: 1; - } - }, - State { - name: "whipped" - PropertyChanges { target: triangle1; rotation: 0; x:0; } - PropertyChanges { target: triangle2; rotation: 0; x:0; - y: triangle1.x + triangle1.height; } - PropertyChanges { target: triangle3; rotation: 0; x:0; - y: triangle2.y + triangle2.height; } - }, - State { - name: "twistedR" - PropertyChanges { target: triangle1; rotation: 270; - x:window.width - triangle1.width; - } - PropertyChanges { target: triangle2; rotation: 180; - x:window.width - triangle2.width; - } - PropertyChanges { target: triangle3; rotation: 90; - x:window.width - triangle3.width; - y:triangle2.y + triangle2.height; - } - }, - State { - name: "twistedL" - PropertyChanges { target: triangle1; rotation: 270; - x:0; - } - PropertyChanges { target: triangle2; rotation: 180; - x:0; - } - PropertyChanges { target: triangle3; rotation: 90; - x:0; - y:triangle2.y + triangle2.height; - } - }, - State { - name: "covered" - PropertyChanges { target: triangle1; rotation: 0; - x: window.width / 3 - triangle1.width / 2; - y: window.height - triangle1.height; - } - PropertyChanges { target: triangle2; rotation: 0; - x: window.width / 2 - triangle2.width / 2; // middle - y: window.height - triangle2.height; - } - PropertyChanges { target: triangle3; rotation: 0; - x: (window.width / 3 + window.width / 3) - triangle3.width / 2; - y: window.height - triangle3.height; - } - }, - State { - name: "hovered" - PropertyChanges { target: triangle1; rotation: 90; - x: window.width / 3 - triangle1.width / 2; - y: triangle1.height; - } - PropertyChanges { target: triangle2; rotation: 270; - x: window.width / 2 - triangle2.width / 2; // middle - y: triangle2.height; - } - PropertyChanges { target: triangle3; rotation: 195; - x: (window.width / 3 + window.width / 3) - triangle3.width / 2; - y: triangle3.height - } - }, - State { - name :"slammed" - PropertyChanges { target: triangle1; rotation: 0; - x: 0; - y: 0 + 30 - } - PropertyChanges { target: triangle2; rotation: 0; - x: window.width - triangle2.width; - y: 0 + 30 - ;} - PropertyChanges { target: triangle3; rotation: 0; - x: window.width / 2 - triangle3.width / 2; - y:window.height - triangle3.height; - } - }, - State { - name: "doubletapped" - PropertyChanges { target: triangle1; rotation: 114; - transformOrigin: Item.BottomLeft - } - PropertyChanges { target: triangle2; rotation: 120; - transformOrigin: Item.BottomLeft - } - }, - State { - name: "turnedover" - PropertyChanges { target: triangle1; rotation: 180; - } - PropertyChanges { target: triangle2; rotation: 180; - } - PropertyChanges { target: triangle3; rotation: 180; - } - }, - State { - name: "pickedup" - PropertyChanges { target: triangle1; scale: 1.5; - } - PropertyChanges { target: triangle2; scale: 1.5; - } - PropertyChanges { target: triangle3; scale: 1.5; - } - } - ] - - - transitions: [ - Transition { - - ParallelAnimation { - NumberAnimation { properties: "x,y"; easing.type: Easing.OutBounce; - duration: 2000; } - RotationAnimation { id: t1Rotation; target: triangle1; duration: 1000; - direction: RotationAnimation.Clockwise } - RotationAnimation { id: t2Rotation; target: triangle2; duration: 2000; - direction: RotationAnimation.Counterclockwise } - RotationAnimation { id: t3Rotation; target: triangle3; duration: 2000; - direction: RotationAnimation.Clockwise } - } - - }, Transition { - to: "slammed" - SequentialAnimation { - NumberAnimation { properties: "x"; easing.type: Easing.OutBounce;duration: 500; } - - } - }, Transition { - to: "doubletapped" - SequentialAnimation { - PropertyAction { target: triangle1; property: "transformOrigin" } - PropertyAction { target: triangle2; property: "transformOrigin" } - NumberAnimation { target: triangle1; properties: "rotation"; - easing.type: Easing.OutBounce;duration: 500; } - NumberAnimation { target: triangle2; properties: "rotation"; - easing.type: Easing.OutBounce;duration: 1500; } - } - }, Transition { - from: "doubletapped" - SequentialAnimation { - NumberAnimation { properties: "rotation"; - easing.type: Easing.OutBounce;duration: 1500; } - PropertyAction { target: triangle1; property: "transformOrigin" } - PropertyAction { target: triangle2; property: "transformOrigin" } - } - }, Transition { - to: "turnedover" - SequentialAnimation { - NumberAnimation { properties: "rotation"; - easing.type: Easing.OutBounce;duration: 750; } - PropertyAction { target: triangle1; property: "transformOrigin" } - PropertyAction { target: triangle2; property: "transformOrigin" } - } - }, Transition { - from: "turnedover" - SequentialAnimation { - NumberAnimation { properties: "rotation"; - easing.type: Easing.OutBounce;duration: 750; } - PropertyAction { target: triangle1; property: "transformOrigin" } - PropertyAction { target: triangle2; property: "transformOrigin" } - } - }, Transition { - to: "pickedup" - SequentialAnimation { - NumberAnimation { properties: "scale"; - easing.type: Easing.OutBounce;duration: 750; } - } - }, Transition { - from: "pickedup" - SequentialAnimation { - NumberAnimation { properties: "scale"; - easing.type: Easing.OutBounce;duration: 750; } - } - } - ] - -//! [1] - SensorGesture { -//! [1] - id: sensorGesture -//! [3] - enabled: true -//! [3] -//! [2] - gestures : ["QtSensors.shake", "QtSensors.whip", "QtSensors.twist", "QtSensors.cover", - "QtSensors.hover", "QtSensors.turnover", "QtSensors.pickup", "QtSensors.slam", - "QtSensors.doubletap"] -//! [2] -//! [4] - onDetected:{ - console.debug(gesture) - - label.text = gesture - - if (gesture == "shake") { - window.state == "rotated" ? window.state = "default" : window.state = "rotated" - timer.start() - } - if (gesture == "whip") { - window.state == "whipped" ? window.state = "default" : window.state = "whipped" - timer.start() - } - if (gesture == "twistRight") { - window.state == "twistedR" ? window.state = "default" : window.state = "twistedR" - timer.start() - } - if (gesture == "twistLeft") { - window.state == "twistedL" ? window.state = "default" : window.state = "twistedL" - timer.start() - } - if (gesture == "cover") { - window.state == "covered" ? window.state = "default" : window.state = "covered" - timer.start() - } - if (gesture == "hover") { - window.state == "hovered" ? window.state = "default" : window.state = "hovered" - timer.start() - } - if (gesture == "turnover") { - window.state == "turnedover" ? window.state = "default" : window.state = "hovered" - timer.start() - } - if (gesture == "pickup") { - window.state == "pickedup" ? window.state = "default" : window.state = "pickedup" - timer.start() - } - if (gesture == "slam") { - window.state == "slammed" ? window.state = "default" : window.state = "slammed" - timer.start() - } - if (gesture == "doubletap") { - window.state == "doubletapped" ? window.state = "default" : window.state = "doubletapped" - timer.start() - } - } -//! [4] - } - Timer { - id: timer - running: false - repeat: false - interval: 3000 - onTriggered: { - console.log("timer triggered") - window.state = "default" - label.text = "Try another gesture" - } - } -} diff --git a/examples/sensors/shakeit/shakeit.qrc b/examples/sensors/shakeit/shakeit.qrc deleted file mode 100644 index 1a2c75d8..00000000 --- a/examples/sensors/shakeit/shakeit.qrc +++ /dev/null @@ -1,10 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>shakeit.qml</file> - <file>audio/loopy2a_mono.wav</file> - <file>audio/phone.wav</file> - <file>content/triangle.png</file> - <file>content/triangle2.png</file> - <file>content/triangle3.png</file> - </qresource> -</RCC> diff --git a/examples/sensors/stub.h b/examples/sensors/stub.h deleted file mode 100644 index 0bee2026..00000000 --- a/examples/sensors/stub.h +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include <QGuiApplication> -#include <QQuickView> -#include <QLoggingCategory> - -#define SENSORS_EXAMPLE_MAIN(NAME) int main(int argc, char **argv) \ -{\ - QGuiApplication app(argc,argv);\ - QQuickView view;\ - view.setSource(QUrl("qrc:///" #NAME ".qml"));\ - view.show();\ - return app.exec();\ -} diff --git a/licenseRule.json b/licenseRule.json new file mode 100644 index 00000000..d68d5838 --- /dev/null +++ b/licenseRule.json @@ -0,0 +1,89 @@ +[ + { + "comment" : ["file_pattern_ending: strings matched against the end of a file name.", + "location keys: regular expression matched against the beginning of", + "the file path (relative to the git submodule root).", + "spdx: list of SPDX-License-Expression's allowed in the matching files.", + "-------------------------------------------------------", + "Files with the following endings are Build System licensed,", + "unless they are examples", + "Files with other endings can also be build system files" + ], + "file_pattern_ending" : ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf", + "configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in"], + "location" : { + "" : { + "comment" : "Default", + "file type" : "build system", + "spdx" : ["BSD-3-Clause"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Example takes precedence", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + }, + { + "comments" : ["Files with the following endings are Tool licensed,", + "unless they are examples.", + "Files with other endings can also be tool files."], + "file_pattern_ending" : [".sh", ".py", ".pl", ".bat", ".ps1"], + "location" :{ + "" : { + "comment" : "Default", + "file type" : "tools and utils", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Example takes precedence", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + }, + { + "comment" : "Files with the following endings are Documentation licensed.", + "file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", ".txt", "README", "qt_attribution.json"], + "location" :{ + "" : { + "comment" : "", + "file type" : "documentation", + "spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] + } + } + }, + { + "comment" : ["All other files", + "The licensing is defined only by the file location in the Qt module repository.", + "NO <file_pattern_ending> key for this case!", + "This needs to be the last entry of the file."], + "location" : { + "" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] + }, + "src/" : { + "comment" : "Default", + "file type" : "module and plugin", + "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] + }, + "tests/" : { + "comment" : "Default", + "file type" : "test", + "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] + }, + "(.*)(examples/|snippets/)" : { + "comment" : "Default", + "file type" : "examples and snippets", + "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + }, + "config.tests/" : { + "comment" : "Default", + "file type" : "build system", + "spdx" : ["BSD-3-Clause"] + } + } + } +] diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 566d5457..97b75b56 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(sensors) add_subdirectory(plugins) diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 0da96701..64b9584e 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -1,2 +1 @@ add_subdirectory(sensors) -# add_subdirectory(sensorgestures) diff --git a/src/plugins/sensorgestures/CMakeLists.txt b/src/plugins/sensorgestures/CMakeLists.txt deleted file mode 100644 index 07fbacc9..00000000 --- a/src/plugins/sensorgestures/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_subdirectory(shake) -add_subdirectory(qtsensors) diff --git a/src/plugins/sensorgestures/qtsensors/CMakeLists.txt b/src/plugins/sensorgestures/qtsensors/CMakeLists.txt deleted file mode 100644 index 08e4d83a..00000000 --- a/src/plugins/sensorgestures/qtsensors/CMakeLists.txt +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -##################################################################### -## QtSensorGesturePlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QtSensorGesturePlugin - OUTPUT_NAME qtsensorgestures_plugin - PLUGIN_TYPE sensorgestures - DEFAULT_IF FALSE - SOURCES - qcoversensorgesturerecognizer.cpp qcoversensorgesturerecognizer.h - qdoubletapsensorgesturerecognizer.cpp qdoubletapsensorgesturerecognizer.h - qfreefallsensorgesturerecognizer.cpp qfreefallsensorgesturerecognizer.h - qhoversensorgesturerecognizer.cpp qhoversensorgesturerecognizer.h - qpickupsensorgesturerecognizer.cpp qpickupsensorgesturerecognizer.h - qshake2recognizer.cpp qshake2recognizer.h - qslamgesturerecognizer.cpp qslamgesturerecognizer.h - qtsensorgestureplugin.cpp qtsensorgestureplugin.h - qtsensorgesturesensorhandler.cpp qtsensorgesturesensorhandler.h - qturnoversensorgesturerecognizer.cpp qturnoversensorgesturerecognizer.h - qtwistsensorgesturerecognizer.cpp qtwistsensorgesturerecognizer.h - qwhipsensorgesturerecognizer.cpp qwhipsensorgesturerecognizer.h - LIBRARIES - Qt::Core - Qt::Sensors -) - -#### Keys ignored in scope 1:.:.:qtsensors.pro:<TRUE>: -# OTHER_FILES = "plugin.json" -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp deleted file mode 100644 index e7b4cd84..00000000 --- a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.cpp +++ /dev/null @@ -1,108 +0,0 @@ -// 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 "qcoversensorgesturerecognizer.h" -#include "qtsensorgesturesensorhandler.h" - -QT_BEGIN_NAMESPACE - -QCoverSensorGestureRecognizer::QCoverSensorGestureRecognizer(QObject *parent) - : QSensorGestureRecognizer(parent), - orientationReading(0), - proximityReading(0), - timer(0), - active(0), - detecting(0) -{ -} - -QCoverSensorGestureRecognizer::~QCoverSensorGestureRecognizer() -{ -} - -void QCoverSensorGestureRecognizer::create() -{ - timer = new QTimer(this); - connect(timer,SIGNAL(timeout()),this,SLOT(timeout())); - timer->setSingleShot(true); - timer->setInterval(750); -} - -QString QCoverSensorGestureRecognizer::id() const -{ - return QString("QtSensors.cover"); -} - -bool QCoverSensorGestureRecognizer::start() -{ - if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Proximity)) { - if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Orientation)) { - active = true; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(proximityReadingChanged(QProximityReading*)), - this,SLOT(proximityChanged(QProximityReading*))); - - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), - this,SLOT(orientationReadingChanged(QOrientationReading*))); - } else { - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Proximity); - active = false; - } - } else { - active = false; - } - return active; -} - -bool QCoverSensorGestureRecognizer::stop() -{ - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Proximity); - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Orientation); - - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(proximityReadingChanged(QProximityReading*)), - this,SLOT(proximityChanged(QProximityReading*))); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), - this,SLOT(orientationReadingChanged(QOrientationReading*))); - - active = false; - timer->stop(); - return active; -} - -bool QCoverSensorGestureRecognizer::isActive() -{ - return active; -} - -void QCoverSensorGestureRecognizer::proximityChanged(QProximityReading *reading) -{ - if (orientationReading == 0) - return; - - proximityReading = reading->close(); - - // look at case of face up->face down->face up. - if (orientationReading->orientation() == QOrientationReading::FaceUp - && proximityReading) { - if (!timer->isActive()) { - timer->start(); - detecting = true; - } - } -} - -void QCoverSensorGestureRecognizer::orientationReadingChanged(QOrientationReading *reading) -{ - orientationReading = reading; -} - -void QCoverSensorGestureRecognizer::timeout() -{ - if ((orientationReading->orientation() == QOrientationReading::FaceUp) - && proximityReading) { - Q_EMIT cover(); - Q_EMIT detected("cover"); - detecting = false; - } -} - -QT_END_NAMESPACE diff --git a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h deleted file mode 100644 index 2981fa1a..00000000 --- a/src/plugins/sensorgestures/qtsensors/qcoversensorgesturerecognizer.h +++ /dev/null @@ -1,48 +0,0 @@ -// 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 - - -#ifndef QCOVERSENSORGESTURERECOGNIZER_H -#define QCOVERSENSORGESTURERECOGNIZER_H - -#include <QtSensors/qsensorgesturerecognizer.h> -#include <QTimer> - -#include "qtsensorgesturesensorhandler.h" - -QT_BEGIN_NAMESPACE - -class QCoverSensorGestureRecognizer : public QSensorGestureRecognizer -{ - Q_OBJECT -public: - explicit QCoverSensorGestureRecognizer(QObject *parent = 0); - ~QCoverSensorGestureRecognizer(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - -Q_SIGNALS: - void cover(); - -private slots: - void proximityChanged(QProximityReading *reading); - void orientationReadingChanged(QOrientationReading *reading); - void timeout(); - -private: - - QOrientationReading *orientationReading; - bool proximityReading; - - QTimer *timer; - bool active; - bool detecting; -}; - -QT_END_NAMESPACE -#endif // QCOVERSENSORGESTURERECOGNIZER_H diff --git a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp deleted file mode 100644 index 95d4de72..00000000 --- a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.cpp +++ /dev/null @@ -1,63 +0,0 @@ -// 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 <QtSensors/QTapSensor> -#include "qdoubletapsensorgesturerecognizer.h" -QT_BEGIN_NAMESPACE - -QDoubleTapSensorGestureRecognizer::QDoubleTapSensorGestureRecognizer(QObject *parent) : - QSensorGestureRecognizer(parent) - , active(0) -{ -} - -QDoubleTapSensorGestureRecognizer::~QDoubleTapSensorGestureRecognizer() -{ -} - -void QDoubleTapSensorGestureRecognizer::create() -{ -} - - -QString QDoubleTapSensorGestureRecognizer::id() const -{ - return QString("QtSensors.doubletap"); -} - -bool QDoubleTapSensorGestureRecognizer::start() -{ - if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Tap)) { - active = true; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(dTabReadingChanged(QTapReading*)), - this,SLOT(tapChanged(QTapReading*))); - } else { - active = false; - } - return active; -} - -bool QDoubleTapSensorGestureRecognizer::stop() -{ - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Tap); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(dTabReadingChanged(QTapReading*)), - this,SLOT(tapChanged(QTapReading*))); - active = false; - return active; -} - -bool QDoubleTapSensorGestureRecognizer::isActive() -{ - return active; -} - -void QDoubleTapSensorGestureRecognizer::tapChanged(QTapReading *reading) -{ - if (reading->isDoubleTap()) { - Q_EMIT doubletap(); - Q_EMIT detected("doubletap"); - } -} - - -QT_END_NAMESPACE diff --git a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h deleted file mode 100644 index 9eb04b90..00000000 --- a/src/plugins/sensorgestures/qtsensors/qdoubletapsensorgesturerecognizer.h +++ /dev/null @@ -1,42 +0,0 @@ -// 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 - -#ifndef QDOUBLETAPSENSORGESTURERECOGNIZER_H -#define QDOUBLETAPSENSORGESTURERECOGNIZER_H - -#include <QtSensors/QSensor> - -#include <QtSensors/qsensorgesturerecognizer.h> -#include <QtSensors/QTapSensor> - -#include "qtsensorgesturesensorhandler.h" - -QT_BEGIN_NAMESPACE - -class QDoubleTapSensorGestureRecognizer : public QSensorGestureRecognizer -{ - Q_OBJECT -public: - explicit QDoubleTapSensorGestureRecognizer(QObject *parent = 0); - ~QDoubleTapSensorGestureRecognizer(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - -Q_SIGNALS: - void doubletap(); - -private slots: - void tapChanged(QTapReading *reading); - -private: - QTapSensor *tapSensor; - bool active; - -}; -QT_END_NAMESPACE -#endif // QDOUBLETAPSENSORGESTURERECOGNIZER_H diff --git a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.cpp deleted file mode 100644 index aaa2f4ce..00000000 --- a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.cpp +++ /dev/null @@ -1,87 +0,0 @@ -// Copyright (C) 2016 Lorn Potter -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#include <qmath.h> - -#include "qfreefallsensorgesturerecognizer.h" - -QT_BEGIN_NAMESPACE - -QFreefallSensorGestureRecognizer::QFreefallSensorGestureRecognizer(QObject *parent) - : QSensorGestureRecognizer(parent) - , active(0) - , detecting(0) -{ -} - -QFreefallSensorGestureRecognizer::~QFreefallSensorGestureRecognizer() -{ -} - -void QFreefallSensorGestureRecognizer::create() -{ -} - -QString QFreefallSensorGestureRecognizer::id() const -{ - return QString("QtSensors.freefall"); -} - -bool QFreefallSensorGestureRecognizer::start() -{ - if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Accel)) { - active = true; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), - this,SLOT(accelChanged(QAccelerometerReading*))); - } else { - active = false; - } - return active; - -} - -bool QFreefallSensorGestureRecognizer::stop() -{ - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), - this,SLOT(accelChanged(QAccelerometerReading*))); - active = false; - - return active; -} - -bool QFreefallSensorGestureRecognizer::isActive() -{ - return active; -} - -#define FREEFALL_THRESHOLD 1.0 -#define LANDED_THRESHOLD 20.0 -#define FREEFALL_MAX 4 - -void QFreefallSensorGestureRecognizer::accelChanged(QAccelerometerReading *reading) -{ - const qreal x = reading->x(); - const qreal y = reading->y(); - const qreal z = reading->z(); - qreal sum = qSqrt(x * x + y * y + z * z); - - if (qAbs(sum) < FREEFALL_THRESHOLD) { - detecting = true; - freefallList.append(sum); - } else { - if (detecting && qAbs(sum) > LANDED_THRESHOLD) { - Q_EMIT landed(); - Q_EMIT detected("landed"); - freefallList.clear(); - } - } - - if (freefallList.count() > FREEFALL_MAX) { - Q_EMIT freefall(); - Q_EMIT detected("freefall"); - } -} - - -QT_END_NAMESPACE - diff --git a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h deleted file mode 100644 index 00da78f0..00000000 --- a/src/plugins/sensorgestures/qtsensors/qfreefallsensorgesturerecognizer.h +++ /dev/null @@ -1,44 +0,0 @@ -// Copyright (C) 2016 Lorn Potter -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - - - -#ifndef QFREEFALLSENSORGESTURERECOGNIZER_H -#define QFREEFALLSENSORGESTURERECOGNIZER_H - -#include <QtSensors/qsensorgesturerecognizer.h> - -#include "qtsensorgesturesensorhandler.h" - -QT_BEGIN_NAMESPACE - -class QFreefallSensorGestureRecognizer : public QSensorGestureRecognizer -{ - Q_OBJECT -public: - explicit QFreefallSensorGestureRecognizer(QObject *parent = 0); - ~QFreefallSensorGestureRecognizer(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - -Q_SIGNALS: - void freefall(); - void landed(); - -private slots: - void accelChanged(QAccelerometerReading *reading); - -private: - - bool active; - bool detecting; - QList <qreal> freefallList; - -}; -QT_END_NAMESPACE -#endif // QPICKUPSENSORGESTURERECOGNIZER_H diff --git a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.cpp deleted file mode 100644 index bf26d219..00000000 --- a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.cpp +++ /dev/null @@ -1,186 +0,0 @@ -// 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 "qhoversensorgesturerecognizer.h" -#include <math.h> - -#define TIMER2_TIMEOUT 5000 - -QT_BEGIN_NAMESPACE - -QHoverSensorGestureRecognizer::QHoverSensorGestureRecognizer(QObject *parent) : - QSensorGestureRecognizer(parent), - orientationReading(0),reflectance(0), - hoverOk(0), detecting(0), active(0), initialReflectance(0), useHack(0), - lastTimestamp(0), timer2Active(0), lapsedTime2(0) -{ -} - -QHoverSensorGestureRecognizer::~QHoverSensorGestureRecognizer() -{ -} - -void QHoverSensorGestureRecognizer::create() -{ - -} - -QString QHoverSensorGestureRecognizer::id() const -{ - return QString("QtSensors.hover"); -} - -bool QHoverSensorGestureRecognizer::start() -{ - if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::IrProximity)) { - if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Orientation)) { - active = true; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(irProximityReadingChanged(QIRProximityReading*)), - this,SLOT(irProximityReadingChanged(QIRProximityReading*))); - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), - this,SLOT(orientationReadingChanged(QOrientationReading*))); - } else { - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::IrProximity); - active = false; - } - } else { - active = false; - } - - detecting = false; - detectedHigh = 0; - initialReflectance = 0; - useHack = false; - timer2Active = false; - lapsedTime2 = 0; - return active; -} - -bool QHoverSensorGestureRecognizer::stop() -{ - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::IrProximity); - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Orientation); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(irProximityReadingChanged(QIRProximityReading*)), - this,SLOT(irProximityReadingChanged(QIRProximityReading*))); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), - this,SLOT(orientationReadingChanged(QOrientationReading*))); - active = false; - timer2Active = false; - initialReflectance = 0; - return active; -} - -bool QHoverSensorGestureRecognizer::isActive() -{ - return active; -} - - -void QHoverSensorGestureRecognizer::orientationReadingChanged(QOrientationReading *reading) -{ - orientationReading = reading; -} - -void QHoverSensorGestureRecognizer::irProximityReadingChanged(QIRProximityReading *reading) -{ - reflectance = reading->reflectance(); - if (reflectance == 0) - return; - - if (initialReflectance == 0) { - initialReflectance = reflectance; - } - - if (initialReflectance > .2) { - useHack = true; - initialReflectance -= .1; - } - if (useHack) - reflectance -= .1; - - if (detecting && !hoverOk) { - detectedHigh = qMax(detectedHigh, reflectance); - } - - if (reflectance > 0.4) { - // if close stop detecting - hoverOk = false; - detecting = false; - detectedHigh = 0; - } - - qreal detectedPercent = 100 - (detectedHigh / reflectance * 100); - - qint16 percentCheck; - if (useHack) - percentCheck = -60; - else - percentCheck = -101; - - quint64 timestamp = reading->timestamp(); - - if (!detecting - && checkForHovering()) { - detecting = true; - detecting = true; - timer2Active = true; - detectedHigh = reflectance; - } else if (detecting - && detectedPercent < percentCheck - && !checkForHovering()) { - // went light again after 1 seconds - Q_EMIT hover(); - Q_EMIT detected("hover"); - hoverOk = false; - detecting = false; - detectedHigh = 0; - timer2Active = false;; - } - if (detecting && reflectance < 0.2) { - timeout(); - } - if (timer2Active && lastTimestamp > 0) - lapsedTime2 += (timestamp - lastTimestamp )/1000; - - if (timer2Active && lapsedTime2 >= TIMER2_TIMEOUT) { - timeout2(); - } - - lastTimestamp = reading->timestamp(); -} - -bool QHoverSensorGestureRecognizer::checkForHovering() -{ - if (orientationReading == 0) { - return false; - } - if (orientationReading->orientation() != QOrientationReading::FaceUp) - return false; - if ( (reflectance > 0.2 && reflectance < 0.4) - && (initialReflectance - reflectance) < -0.1) - return true; - - return false; -} - - -void QHoverSensorGestureRecognizer::timeout() -{ - if (checkForHovering()) { - hoverOk = true; - timer2Active = true; - } else { - detecting = false; - detectedHigh = 0; - } -} - -void QHoverSensorGestureRecognizer::timeout2() -{ - detecting = false; - hoverOk = false; - detectedHigh = 0; -} - -QT_END_NAMESPACE diff --git a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h deleted file mode 100644 index 1f5cfba0..00000000 --- a/src/plugins/sensorgestures/qtsensors/qhoversensorgesturerecognizer.h +++ /dev/null @@ -1,56 +0,0 @@ -// 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 - - -#ifndef QHOVERSENSORGESTURERECOGNIZER_H -#define QHOVERSENSORGESTURERECOGNIZER_H - -#include <QtSensors/QSensorGestureRecognizer> - -#include "qtsensorgesturesensorhandler.h" - - -QT_BEGIN_NAMESPACE - -class QHoverSensorGestureRecognizer : public QSensorGestureRecognizer -{ - Q_OBJECT -public: - explicit QHoverSensorGestureRecognizer(QObject *parent = 0); - ~QHoverSensorGestureRecognizer(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - -Q_SIGNALS: - void hover(); - -private slots: - void orientationReadingChanged(QOrientationReading *reading); - void irProximityReadingChanged(QIRProximityReading *reading); - void timeout(); - void timeout2(); -private: - QOrientationReading *orientationReading; - qreal reflectance; - bool hoverOk; - bool detecting; - - qreal detectedHigh; - bool active; - qreal initialReflectance; - bool checkForHovering(); - bool useHack; - - quint64 lastTimestamp; - - bool timer2Active; - quint64 lapsedTime2; - -}; -QT_END_NAMESPACE -#endif // QHOVERSENSORGESTURERECOGNIZER_H diff --git a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp deleted file mode 100644 index 061110cd..00000000 --- a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.cpp +++ /dev/null @@ -1,177 +0,0 @@ -// 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 "qpickupsensorgesturerecognizer.h" - -#include <QtCore/qmath.h> - -#define TIMER_TIMEOUT 250 - -QT_BEGIN_NAMESPACE - -QPickupSensorGestureRecognizer::QPickupSensorGestureRecognizer(QObject *parent) - : QSensorGestureRecognizer(parent) - , accelReading(0) - , active(0) - , pXaxis(0) - , pYaxis(0) - , pZaxis(0) - , lastpitch(0) - , detecting(0) -{ -} - -QPickupSensorGestureRecognizer::~QPickupSensorGestureRecognizer() -{ -} - -void QPickupSensorGestureRecognizer::create() -{ -} - -QString QPickupSensorGestureRecognizer::id() const -{ - return QString("QtSensors.pickup"); -} - -bool QPickupSensorGestureRecognizer::start() -{ - if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Accel)) { - active = true; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), - this,SLOT(accelChanged(QAccelerometerReading*))); - } else { - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); - active = false; - } - clear(); - - return active; - -} - -bool QPickupSensorGestureRecognizer::stop() -{ - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), - this,SLOT(accelChanged(QAccelerometerReading*))); - active = false; - - return active; -} - -bool QPickupSensorGestureRecognizer::isActive() -{ - return active; -} - -#define PICKUP_BOTTOM_THRESHOLD 25 -#define PICKUP_TOP_THRESHOLD 80 -#define PICKUP_ANGLE_THRESHOLD 25 -#define PICKUP_ROLL_THRESHOLD 13 - -void QPickupSensorGestureRecognizer::accelChanged(QAccelerometerReading *reading) -{ - accelReading = reading; - const qreal x = reading->x(); - const qreal y = reading->y(); - const qreal z = reading->z(); - const qreal xdiff = pXaxis - x; - const qreal ydiff = pYaxis - y; - const qreal zdiff = pZaxis - z; - - qreal pitch = qRadiansToDegrees(qAtan(y / qSqrt(x * x + z * z))); - qreal roll = qRadiansToDegrees(qAtan(x / qSqrt(y * y + z * z))); - - if ((qAbs(xdiff) < 0.7 && qAbs(ydiff) < .7 && qAbs(zdiff) < .7) - || z < 0) { - detecting = false; - } else if (pitch > PICKUP_BOTTOM_THRESHOLD && pitch < PICKUP_TOP_THRESHOLD) { - detecting = true; - } - - if ( pitchList.count() > 21) { - pitchList.removeFirst(); - } - if ( rollList.count() > 21) { - rollList.removeFirst(); - } - - if (pitch > 1) { - pitchList.append(pitch); - } - if (roll > 1) { - rollList.append(roll); - } - - if (detecting && pitchList.count() > 5 ) { - timeout(); - } - - lastpitch = pitch; - pXaxis = x; - pYaxis = y; - pZaxis = z; -} - -void QPickupSensorGestureRecognizer::timeout() -{ - qreal averageRoll = 0; - for (int r = 0; r < rollList.count(); r++) { - averageRoll += rollList.at(r); - } - averageRoll /= rollList.count(); - - if (averageRoll > PICKUP_ROLL_THRESHOLD) { - clear(); - return; - } - if (pitchList.isEmpty() - || pitchList.at(0) > PICKUP_BOTTOM_THRESHOLD) { - clear(); - return; - } - - qreal previousPitch = 0; - qreal startPitch = -1.0; - int goodCount = 0; - - qreal averagePitch = 0; - for (int i = 0; i < pitchList.count(); i++) { - averagePitch += pitchList.at(i); - if (previousPitch < pitchList.at(i) - && qAbs(pitchList.at(i)) - qAbs(previousPitch) < 20) { - if (goodCount == 1 && previousPitch != 0) { - startPitch = previousPitch; - } - goodCount++; - } - - previousPitch = pitchList.at(i); - } - averagePitch /= pitchList.count(); - - if (averagePitch < 5) { - clear(); - return; - } - - if (goodCount >= 3 && - (pitchList.last() < PICKUP_TOP_THRESHOLD - && pitchList.last() > PICKUP_BOTTOM_THRESHOLD) - && startPitch > 0 - && (pitchList.last() - startPitch) > PICKUP_ANGLE_THRESHOLD) { - Q_EMIT pickup(); - Q_EMIT detected("pickup"); - } - clear(); -} - -void QPickupSensorGestureRecognizer::clear() -{ - pitchList.clear(); - detecting = false; -} - -QT_END_NAMESPACE - diff --git a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h deleted file mode 100644 index 7728185a..00000000 --- a/src/plugins/sensorgestures/qtsensors/qpickupsensorgesturerecognizer.h +++ /dev/null @@ -1,51 +0,0 @@ -// 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 - - -#ifndef QPICKUPSENSORGESTURERECOGNIZER_H -#define QPICKUPSENSORGESTURERECOGNIZER_H - -#include <QtSensors/qsensorgesturerecognizer.h> -#include "qtsensorgesturesensorhandler.h" - -QT_BEGIN_NAMESPACE - -class QPickupSensorGestureRecognizer : public QSensorGestureRecognizer -{ - Q_OBJECT -public: - explicit QPickupSensorGestureRecognizer(QObject *parent = 0); - ~QPickupSensorGestureRecognizer(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - -Q_SIGNALS: - void pickup(); - -private slots: - void accelChanged(QAccelerometerReading *reading); - - void timeout(); -private: - QAccelerometerReading *accelReading; - - bool active; - qreal pXaxis; - qreal pYaxis; - qreal pZaxis; - - qreal lastpitch; - bool detecting; - - QList <qreal> pitchList; - QList <qreal> rollList; - - void clear(); -}; -QT_END_NAMESPACE -#endif // QPICKUPSENSORGESTURERECOGNIZER_H diff --git a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp deleted file mode 100644 index 1a366308..00000000 --- a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.cpp +++ /dev/null @@ -1,195 +0,0 @@ -// 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 <QDebug> - -#include "qshake2recognizer.h" -#include <math.h> - - -QT_BEGIN_NAMESPACE - -QShake2SensorGestureRecognizer::QShake2SensorGestureRecognizer(QObject *parent) - : QSensorGestureRecognizer(parent) - , active(0) - , shakeDirection(QShake2SensorGestureRecognizer::ShakeUndefined) - , shaking(0) - , shakeCount(0) - , lapsedTime(0) - , lastTimestamp(0), - timerActive(0) -{ - timerTimeout = 250; -} - -QShake2SensorGestureRecognizer::~QShake2SensorGestureRecognizer() -{ -} - -void QShake2SensorGestureRecognizer::create() -{ -} - -bool QShake2SensorGestureRecognizer::start() -{ - if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Accel)) { - active = true; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), - this,SLOT(accelChanged(QAccelerometerReading*))); - } else { - active = false; - } - prevData.x = 0; - prevData.y = 0; - prevData.z = 0; - shakeCount = 0; - shaking = false; - shakeDirection = QShake2SensorGestureRecognizer::ShakeUndefined; - - return active; -} - -bool QShake2SensorGestureRecognizer::stop() -{ - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), - this,SLOT(accelChanged(QAccelerometerReading*))); - active = false; - return active; -} - -bool QShake2SensorGestureRecognizer::isActive() -{ - return active; -} - -QString QShake2SensorGestureRecognizer::id() const -{ - return QString("QtSensors.shake2"); -} - -#define NUMBER_SHAKES 3 -#define THRESHOLD 25 - -void QShake2SensorGestureRecognizer::accelChanged(QAccelerometerReading *reading) -{ - const qreal x = reading->x(); - const qreal y = reading->y(); - const qreal z = reading->z(); - - const quint64 timestamp = reading->timestamp(); - - currentData.x = x; - currentData.y = y; - currentData.z = z; - - if (qAbs(prevData.x - currentData.x) < 1 - && qAbs(prevData.y - currentData.y) < 1 - && qAbs(prevData.z - currentData.z) < 1) { - - prevData.x = currentData.x; - prevData.y = currentData.y; - prevData.z = currentData.z; - return; - } - - bool wasShake; - wasShake = checkForShake(prevData, currentData, THRESHOLD); - - if (!shaking && wasShake && - shakeCount == NUMBER_SHAKES) { - shaking = true; - shakeCount = 0; - lapsedTime = 0; - timerActive = false; - switch (shakeDirection) { - case QShake2SensorGestureRecognizer::ShakeLeft: - Q_EMIT shakeLeft(); - Q_EMIT detected("shakeLeft"); - break; - case QShake2SensorGestureRecognizer::ShakeRight: - Q_EMIT shakeRight(); - Q_EMIT detected("shakeRight"); - break; - case QShake2SensorGestureRecognizer::ShakeUp: - Q_EMIT shakeUp(); - Q_EMIT detected("shakeUp"); - break; - case QShake2SensorGestureRecognizer::ShakeDown: - Q_EMIT shakeDown(); - Q_EMIT detected("shakeDown"); - break; - default: - break; - }; - - } else if (wasShake) { - - if (shakeCount == 0 && shakeDirection == QShake2SensorGestureRecognizer::ShakeUndefined) { - - const int xdiff = prevData.x - currentData.x; - const int ydiff = prevData.x - currentData.y; - - const int max = qMax(qAbs(ydiff), qAbs(xdiff)); - if (max == qAbs(xdiff)) { - if (isNegative(xdiff)) - shakeDirection = QShake2SensorGestureRecognizer::ShakeLeft; - else - shakeDirection = QShake2SensorGestureRecognizer::ShakeRight; - - } else if (max == qAbs(ydiff)) { - if (isNegative(ydiff)) - shakeDirection = QShake2SensorGestureRecognizer::ShakeDown; - else - shakeDirection = QShake2SensorGestureRecognizer::ShakeUp; - } - } - shakeCount++; - if (shakeCount == NUMBER_SHAKES) { - timerActive = true; - } - } - - if (timerActive && lastTimestamp > 0) - lapsedTime += (timestamp - lastTimestamp )/1000; - - if (timerActive && lapsedTime >= timerTimeout) { - timeout(); - } - prevData.x = currentData.x; - prevData.y = currentData.y; - prevData.z = currentData.z; - lastTimestamp = timestamp; -} - -void QShake2SensorGestureRecognizer::timeout() -{ - shakeCount = 0; - shaking = false; - shakeDirection = QShake2SensorGestureRecognizer::ShakeUndefined; - timerActive = false; - lapsedTime = 0; - lastTimestamp = 0; -} - -bool QShake2SensorGestureRecognizer::checkForShake(ShakeData prevSensorData, ShakeData currentSensorData, qreal threshold) -{ - const double deltaX = qAbs(prevSensorData.x - currentSensorData.x); - const double deltaY = qAbs(prevSensorData.y - currentSensorData.y); - const double deltaZ = qAbs(prevSensorData.z - currentSensorData.z); - - return (deltaX > threshold - || deltaY > threshold - || deltaZ > threshold); -} - -bool QShake2SensorGestureRecognizer::isNegative(qreal num) -{ - if (num < 0) - return true; - return false; -} - - - -QT_END_NAMESPACE diff --git a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h b/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h deleted file mode 100644 index 2fbcb230..00000000 --- a/src/plugins/sensorgestures/qtsensors/qshake2recognizer.h +++ /dev/null @@ -1,80 +0,0 @@ -// 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 - -#ifndef QSHAKERECOGNIZER_H -#define QSHAKERECOGNIZER_H - -#include <QDebug> - -#include <QtSensors/qsensorgesturerecognizer.h> - -#include "qtsensorgesturesensorhandler.h" - -QT_BEGIN_NAMESPACE - -struct ShakeData { - qreal x; - qreal y; - qreal z; -}; - -class QShake2SensorGestureRecognizer : public QSensorGestureRecognizer -{ - Q_OBJECT - -public: - - enum ShakeDirection { - ShakeUndefined = 0, - ShakeLeft, - ShakeRight, - ShakeUp, - ShakeDown - }; - - QShake2SensorGestureRecognizer(QObject *parent = 0); - ~QShake2SensorGestureRecognizer(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - - int timerTimeout; - - -Q_SIGNALS: - void shakeLeft(); - void shakeRight(); - void shakeUp(); - void shakeDown(); - -private slots: - void accelChanged(QAccelerometerReading *reading); - void timeout(); - - -private: - QAccelerometerReading *accelReading; - - bool active; - - ShakeDirection shakeDirection; - - ShakeData prevData; - ShakeData currentData; - - bool checkForShake(ShakeData prevSensorData, ShakeData currentSensorData, qreal threshold); - bool shaking; - int shakeCount; - int threshold; - - bool isNegative(qreal num); - qreal lapsedTime; - quint64 lastTimestamp; - bool timerActive; -}; -QT_END_NAMESPACE -#endif // QSHAKERECOGNIZER_H diff --git a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp deleted file mode 100644 index 4cc6c7e4..00000000 --- a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.cpp +++ /dev/null @@ -1,179 +0,0 @@ -// 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 "qslamgesturerecognizer.h" -#include "qtsensorgesturesensorhandler.h" - - -#include <QtCore/qmath.h> - -QT_BEGIN_NAMESPACE - -QSlamSensorGestureRecognizer::QSlamSensorGestureRecognizer(QObject *parent) : - QSensorGestureRecognizer(parent), - orientationReading(0), - accelRange(0), - active(0), - lastX(0), - lastY(0), - lastZ(0), - detectedX(0), - detecting(0), - accelX(0), - roll(0), - resting(0), - lastTimestamp(0), - lapsedTime(0), - timerActive(0) -{ -} - -QSlamSensorGestureRecognizer::~QSlamSensorGestureRecognizer() -{ -} - -void QSlamSensorGestureRecognizer::create() -{ -} - - -QString QSlamSensorGestureRecognizer::id() const -{ - return QString("QtSensors.slam"); -} - -bool QSlamSensorGestureRecognizer::start() -{ - if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Accel)) { - if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Orientation)) { - active = true; - accelRange = QtSensorGestureSensorHandler::instance()->accelRange; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), - this,SLOT(orientationReadingChanged(QOrientationReading*))); - - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), - this,SLOT(accelChanged(QAccelerometerReading*))); - } else { - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); - active = false; - } - } else { - active = false; - } - return active; -} - -bool QSlamSensorGestureRecognizer::stop() -{ - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Orientation); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), - this,SLOT(orientationReadingChanged(QOrientationReading*))); - - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), - this,SLOT(accelChanged(QAccelerometerReading*))); - detecting = false; - restingList.clear(); - active = false; - return active; -} - -bool QSlamSensorGestureRecognizer::isActive() -{ - return active; -} - -void QSlamSensorGestureRecognizer::orientationReadingChanged(QOrientationReading *reading) -{ - orientationReading = reading; -} - -#define SLAM_DETECTION_FACTOR 0.3 // 11.7 -#define SLAM_RESTING_FACTOR 2.5 -#define SLAM_RESTING_COUNT 5 -#define SLAM_ZERO_FACTOR .02 - -void QSlamSensorGestureRecognizer::accelChanged(QAccelerometerReading *reading) -{ - const qreal x = reading->x(); - const qreal y = reading->y(); - const qreal z = reading->z(); - quint64 timestamp = reading->timestamp(); - - if (qAbs(lastX - x) < SLAM_RESTING_FACTOR - && qAbs(lastY - y) < SLAM_RESTING_FACTOR - && qAbs(lastZ - z) < SLAM_RESTING_FACTOR) { - resting = true; - } else { - resting = false; - } - - if (restingList.count() > SLAM_RESTING_COUNT) - restingList.removeLast(); - restingList.insert(0, resting); - - - if (timerActive && lastTimestamp > 0) - lapsedTime += (timestamp - lastTimestamp )/1000; - - if (timerActive && lapsedTime >= 250) { - doSlam(); - } - lastTimestamp = timestamp; - - if (orientationReading == 0) { - return; - } - - const qreal difference = lastX - x; - - if (!detecting - && orientationReading->orientation() == QOrientationReading::TopUp - && resting - && hasBeenResting()) { - detectedX = x; - // start of gesture - detecting = true; - if (difference > 0) - wasNegative = false; - else - wasNegative = true; - restingList.clear(); - } - if (detecting - && qAbs(difference) > (accelRange * SLAM_DETECTION_FACTOR)) { - timerActive = true; - } - if (detecting && - (qAbs(difference) < SLAM_ZERO_FACTOR && qAbs(difference) > 0)) { - detecting = false; - } - lastX = x; - lastY = y; - lastZ = z; -} - -bool QSlamSensorGestureRecognizer::hasBeenResting() -{ - for (int i = 0; i < restingList.count() - 1; i++) { - if (!restingList.at(i)) { - return false; - } - } - return true; -} - -void QSlamSensorGestureRecognizer::doSlam() -{ - if (detecting && (orientationReading->orientation() == QOrientationReading::RightUp - || orientationReading->orientation() == QOrientationReading::LeftUp)) { - Q_EMIT slam(); - Q_EMIT detected("slam"); - restingList.clear(); - detecting = false; - } - timerActive = false; - lapsedTime = 0; -} - -QT_END_NAMESPACE diff --git a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h deleted file mode 100644 index dbc263e5..00000000 --- a/src/plugins/sensorgestures/qtsensors/qslamgesturerecognizer.h +++ /dev/null @@ -1,64 +0,0 @@ -// 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 - - -#ifndef QSLAMSENSORGESTURERECOGNIZER_H -#define QSLAMSENSORGESTURERECOGNIZER_H - -#include <QtSensors/qsensorgesturerecognizer.h> -#include <QtSensors/QOrientationSensor> -#include <QtSensors/QAccelerometer> -#include <QtSensors/QAccelerometerReading> -#include <QtSensors/QOrientationReading> -QT_BEGIN_NAMESPACE - -class QSlamSensorGestureRecognizer : public QSensorGestureRecognizer -{ - Q_OBJECT -public: - explicit QSlamSensorGestureRecognizer(QObject *parent = 0); - ~QSlamSensorGestureRecognizer(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - -Q_SIGNALS: - void slam(); - -private slots: - void accelChanged(QAccelerometerReading *reading); - void orientationReadingChanged(QOrientationReading *reading); - void doSlam(); - -private: - - QAccelerometer *accel; - QOrientationReading *orientationReading; - int accelRange; - bool active; - - bool wasNegative; - qreal lastX; - qreal lastY; - qreal lastZ; - qreal detectedX; - - bool detecting; - - qreal accelX; - qreal roll; - QList<qreal> restingList; - bool resting; - - bool hasBeenResting(); - quint64 lastTimestamp; - quint64 lapsedTime; - bool timerActive; -}; - -QT_END_NAMESPACE -#endif // QSLAMSENSORGESTURERECOGNIZER_H diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp deleted file mode 100644 index ea642383..00000000 --- a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.cpp +++ /dev/null @@ -1,77 +0,0 @@ -// 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 <QtPlugin> -#include <QStringList> -#include <QObject> - -#include "qtsensorgestureplugin.h" - -#include <QtSensors/qsensorgestureplugininterface.h> - -#include "qcoversensorgesturerecognizer.h" -#include "qtwistsensorgesturerecognizer.h" -#include "qdoubletapsensorgesturerecognizer.h" -#include "qhoversensorgesturerecognizer.h" -#include "qpickupsensorgesturerecognizer.h" -#include "qshake2recognizer.h" -#include "qslamgesturerecognizer.h" -#include "qturnoversensorgesturerecognizer.h" -#include "qwhipsensorgesturerecognizer.h" -#include "qfreefallsensorgesturerecognizer.h" - - -QT_BEGIN_NAMESPACE - - -QtSensorGesturePlugin::QtSensorGesturePlugin() -{ -} - -QtSensorGesturePlugin::~QtSensorGesturePlugin() -{ -} - -QStringList QtSensorGesturePlugin::supportedIds() const -{ - QStringList list; - list << "QtSensors.cover"; - list << "QtSensors.doubletap"; - list << "QtSensors.hover"; - list << "QtSensors.freefall"; - list << "QtSensors.pickup"; - list << "QtSensors.shake2"; - list << "QtSensors.slam"; - list << "QtSensors.turnover"; - list << "QtSensors.twist"; - list << "QtSensors.whip"; - return list; -} - -QList <QSensorGestureRecognizer *> QtSensorGesturePlugin::createRecognizers() -{ - QList <QSensorGestureRecognizer *> recognizers; - - recognizers.append(new QCoverSensorGestureRecognizer(this)); - - recognizers.append(new QDoubleTapSensorGestureRecognizer(this)); - - recognizers.append(new QHoverSensorGestureRecognizer(this)); - - recognizers.append(new QPickupSensorGestureRecognizer(this)); - - recognizers.append(new QShake2SensorGestureRecognizer(this)); - - recognizers.append(new QSlamSensorGestureRecognizer(this)); - - recognizers.append(new QTurnoverSensorGestureRecognizer(this)); - - recognizers.append(new QWhipSensorGestureRecognizer(this)); - - recognizers.append(new QTwistSensorGestureRecognizer(this)); - - recognizers.append(new QFreefallSensorGestureRecognizer(this)); - return recognizers; -} - -QT_END_NAMESPACE diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h b/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h deleted file mode 100644 index 4f7bdd66..00000000 --- a/src/plugins/sensorgestures/qtsensors/qtsensorgestureplugin.h +++ /dev/null @@ -1,32 +0,0 @@ -// 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 - -#ifndef QTSENSORGESTURESPLUGIN_H -#define QTSENSORGESTURESPLUGIN_H - -#include <QObject> -#include <QStringList> - -#include <QtSensors/qsensorgestureplugininterface.h> - -QT_BEGIN_NAMESPACE - -class QtSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.QSensorGesturePluginInterface") - Q_INTERFACES(QSensorGesturePluginInterface) - -public: - explicit QtSensorGesturePlugin(); - ~QtSensorGesturePlugin(); - QList <QSensorGestureRecognizer *> createRecognizers() override; - - QStringList gestureSignals() const; - QStringList supportedIds() const override; - QString name() const override { return "QtSensorGestures"; } - -}; - -QT_END_NAMESPACE -#endif // QTSENSORGESTURESPLUGIN_H diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgesturesensorhandler.cpp b/src/plugins/sensorgestures/qtsensors/qtsensorgesturesensorhandler.cpp deleted file mode 100644 index 83fbba5f..00000000 --- a/src/plugins/sensorgestures/qtsensors/qtsensorgesturesensorhandler.cpp +++ /dev/null @@ -1,157 +0,0 @@ -// 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 <QDebug> - -#include "qtsensorgesturesensorhandler.h" - -QtSensorGestureSensorHandler::QtSensorGestureSensorHandler(QObject *parent) : - QObject(parent), - accel(0), orientation(0), proximity(0), irProx(0),tapSensor(0) -{ -} - -QtSensorGestureSensorHandler* QtSensorGestureSensorHandler::instance() -{ - static QtSensorGestureSensorHandler *instance = 0; - if (!instance) { - instance = new QtSensorGestureSensorHandler; - } - return instance; -} - -void QtSensorGestureSensorHandler::accelChanged() -{ - Q_EMIT accelReadingChanged(accel->reading()); -} - -void QtSensorGestureSensorHandler::orientationChanged() -{ - Q_EMIT orientationReadingChanged(orientation->reading()); -} - -void QtSensorGestureSensorHandler::proximityChanged() -{ - Q_EMIT proximityReadingChanged(proximity->reading()); -} - -void QtSensorGestureSensorHandler::irProximityChanged() -{ - Q_EMIT irProximityReadingChanged(irProx->reading()); -} - -void QtSensorGestureSensorHandler::doubletap() -{ - Q_EMIT dTabReadingChanged(tapSensor->reading()); -} - -bool QtSensorGestureSensorHandler::startSensor(SensorGestureSensors sensor) -{ - bool ok = true; - switch (sensor) { - case Accel: - //accel - if (accel == 0x0) { - accel = new QAccelerometer(this); - ok = accel->connectToBackend(); - accel->setDataRate(100); - qoutputrangelist outputranges = accel->outputRanges(); - - if (outputranges.count() > 0) - accelRange = (int)(outputranges.at(0).maximum);//39 - else - accelRange = 39; //this should never happen - connect(accel,SIGNAL(readingChanged()),this,SLOT(accelChanged())); - } - if (ok && !accel->isActive()) - accel->start(); - break; - case Orientation: - //orientation - if (orientation == 0x0) { - orientation = new QOrientationSensor(this); - ok = orientation->connectToBackend(); - orientation->setDataRate(50); - connect(orientation,SIGNAL(readingChanged()),this,SLOT(orientationChanged())); - } - if (ok && !orientation->isActive()) - orientation->start(); - break; - case Proximity: - //proximity - if (proximity == 0x0) { - proximity = new QProximitySensor(this); - ok = proximity->connectToBackend(); - connect(proximity,SIGNAL(readingChanged()),this,SLOT(proximityChanged())); - } - if (ok && !proximity->isActive()) - proximity->start(); - break; - case IrProximity: - //irproximity - if (irProx == 0x0) { - irProx = new QIRProximitySensor(this); - irProx->setDataRate(50); - ok = irProx->connectToBackend(); - connect(irProx,SIGNAL(readingChanged()),this,SLOT(irProximityChanged())); - } - if (ok && !irProx->isActive()) - irProx->start(); - break; - case Tap: - //dtap - if (tapSensor == 0x0) { - tapSensor = new QTapSensor(this); - ok = tapSensor->connectToBackend(); - connect(tapSensor,SIGNAL(readingChanged()),this,SLOT(doubletap())); - } - if (ok && !tapSensor->isActive()) - tapSensor->start(); - break; - }; - int val = usedSensorsMap.value(sensor); - usedSensorsMap.insert(sensor,++val); - - return ok; -} - -void QtSensorGestureSensorHandler::stopSensor(SensorGestureSensors sensor) -{ - // qDebug() << __FUNCTION__ << sensor; - if (usedSensorsMap.value(sensor) == 0) - return; - int val = usedSensorsMap.value(sensor); - usedSensorsMap.insert(sensor,--val); - switch (sensor) { - case Accel: - //accel - if (usedSensorsMap.value(sensor) == 0) { - accel->stop(); - } - break; - case Orientation: - if (usedSensorsMap.value(sensor) == 0) { - orientation->stop(); - } - //orientation - break; - case Proximity: - if (usedSensorsMap.value(sensor) == 0) { - proximity->stop(); - } - //proximity - break; - case IrProximity: - if (usedSensorsMap.value(sensor) == 0) { - irProx->stop(); - } - //irproximity - break; - case Tap: - if (usedSensorsMap.value(sensor) == 0) { - tapSensor->stop(); - } - //dtap - break; - }; -} diff --git a/src/plugins/sensorgestures/qtsensors/qtsensorgesturesensorhandler.h b/src/plugins/sensorgestures/qtsensors/qtsensorgesturesensorhandler.h deleted file mode 100644 index 0090e3d6..00000000 --- a/src/plugins/sensorgestures/qtsensors/qtsensorgesturesensorhandler.h +++ /dev/null @@ -1,62 +0,0 @@ -// 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 - -#ifndef QTSENSORGESTURESENSORHANDLER_H -#define QTSENSORGESTURESENSORHANDLER_H - -#include <QObject> - -#include <QtSensors/QAccelerometer> -#include <QtSensors/QAccelerometerFilter> -#include <QtSensors/QSensor> -#include <QtSensors/QOrientationSensor> -#include <QtSensors/QProximitySensor> -#include <QtSensors/QIRProximitySensor> -#include <QtSensors/QTapSensor> - -class QtSensorGestureSensorHandler : public QObject -{ - Q_OBJECT -public: - explicit QtSensorGestureSensorHandler(QObject *parent = 0); - - enum SensorGestureSensors { - Accel = 0, - Orientation, - Proximity, - IrProximity, - Tap - }; - Q_ENUM(SensorGestureSensors) - static QtSensorGestureSensorHandler *instance(); - qreal accelRange; - -public slots: - void accelChanged(); - void orientationChanged(); - void proximityChanged(); - void irProximityChanged(); - void doubletap(); - - bool startSensor(SensorGestureSensors sensor); - void stopSensor(SensorGestureSensors sensor); - -Q_SIGNALS: - void accelReadingChanged(QAccelerometerReading *reading); - void orientationReadingChanged(QOrientationReading *reading); - void proximityReadingChanged(QProximityReading *reading); - void irProximityReadingChanged(QIRProximityReading *reading); - void dTabReadingChanged(QTapReading *reading); - -private: - QAccelerometer *accel; - QOrientationSensor *orientation; - QProximitySensor *proximity; - QIRProximitySensor *irProx; - QTapSensor *tapSensor; - - QMap<SensorGestureSensors, int> usedSensorsMap; - -}; - -#endif // QTSENSORGESTURESENSORHANDLER_H diff --git a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.cpp deleted file mode 100644 index 15dfc837..00000000 --- a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.cpp +++ /dev/null @@ -1,103 +0,0 @@ -// 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 <QtSensors/QSensor> - -#include "qturnoversensorgesturerecognizer.h" -#include "qtsensorgesturesensorhandler.h" - -QT_BEGIN_NAMESPACE - -// turnover and put down i.e. facedown - -QTurnoverSensorGestureRecognizer::QTurnoverSensorGestureRecognizer(QObject *parent) : - QSensorGestureRecognizer(parent), - isClose(0) - , isFaceDown(0), active(0) -{ -} - -QTurnoverSensorGestureRecognizer::~QTurnoverSensorGestureRecognizer() -{ -} - -void QTurnoverSensorGestureRecognizer::create() -{ -} - -bool QTurnoverSensorGestureRecognizer::start() -{ - if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Proximity)) { - if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Orientation)) { - active = true; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(proximityReadingChanged(QProximityReading*)), - this,SLOT(proximityChanged(QProximityReading*))); - - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), - this,SLOT(orientationReadingChanged(QOrientationReading*))); - } else { - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Proximity); - active = false; - } - } else { - active = false; - } - return active; -} - -bool QTurnoverSensorGestureRecognizer::stop() -{ - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Proximity); - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Orientation); - - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(proximityReadingChanged(QProximityReading*)), - this,SLOT(proximityChanged(QProximityReading*))); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), - this,SLOT(orientationReadingChanged(QOrientationReading*))); - - active = false; - - return active; -} - -bool QTurnoverSensorGestureRecognizer::isActive() -{ - return active; -} - -QString QTurnoverSensorGestureRecognizer::id() const -{ - return QString("QtSensors.turnover"); -} - -void QTurnoverSensorGestureRecognizer::proximityChanged(QProximityReading *reading) -{ - isClose = reading->close(); - if (isClose) - isRecognized(); -} - -void QTurnoverSensorGestureRecognizer::orientationReadingChanged(QOrientationReading *reading) -{ - switch (reading->orientation()) { - case QOrientationReading::FaceDown: - { - isFaceDown = true; - isRecognized(); - } - break; - default: - isFaceDown = false; - break; - }; -} - -void QTurnoverSensorGestureRecognizer::isRecognized() -{ - if (isClose && isFaceDown) { - Q_EMIT turnover(); - Q_EMIT detected("turnover"); - } -} -QT_END_NAMESPACE - diff --git a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h deleted file mode 100644 index f5770dfd..00000000 --- a/src/plugins/sensorgestures/qtsensors/qturnoversensorgesturerecognizer.h +++ /dev/null @@ -1,44 +0,0 @@ -// 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 - -#ifndef QTURNOVERSENSORGESTURERECOGNIZER_H -#define QTURNOVERSENSORGESTURERECOGNIZER_H - -#include <QtSensors/qsensorgesturerecognizer.h> -#include "qtsensorgesturesensorhandler.h" - -QT_BEGIN_NAMESPACE - -class QTurnoverSensorGestureRecognizer : public QSensorGestureRecognizer -{ - Q_OBJECT -public: - explicit QTurnoverSensorGestureRecognizer(QObject *parent = 0); - ~QTurnoverSensorGestureRecognizer(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - -Q_SIGNALS: - void turnover(); - -private slots: - void orientationReadingChanged(QOrientationReading *reading); - void proximityChanged(QProximityReading *reading); - void isRecognized(); - -private: - - bool isClose; - bool isFaceDown; - bool active; - - QList<qreal> zList; - -}; -QT_END_NAMESPACE -#endif // QTURNOVERSENSORGESTURERECOGNIZER_H diff --git a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp deleted file mode 100644 index 5ac06724..00000000 --- a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.cpp +++ /dev/null @@ -1,255 +0,0 @@ -// 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 "qtwistsensorgesturerecognizer.h" - -#include <QtCore/qmath.h> - -QT_BEGIN_NAMESPACE - -#define TIMER_TIMEOUT 750 -QTwistSensorGestureRecognizer::QTwistSensorGestureRecognizer(QObject *parent) - : QSensorGestureRecognizer(parent) - , orientationReading(0) - , active(0) - , detecting(0) - , checking(0) - , increaseCount(0) - , decreaseCount(0) - , lastAngle(0) - , detectedAngle(0) -{ -} - -QTwistSensorGestureRecognizer::~QTwistSensorGestureRecognizer() -{ -} - -void QTwistSensorGestureRecognizer::create() -{ -} - -QString QTwistSensorGestureRecognizer::id() const -{ - return QString("QtSensors.twist"); -} - -bool QTwistSensorGestureRecognizer::start() -{ - if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Accel)) { - if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Orientation)) { - active = true; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), - this,SLOT(orientationReadingChanged(QOrientationReading*))); - - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), - this,SLOT(accelChanged(QAccelerometerReading*))); - } else { - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); - active = false; - } - } else { - - active = false; - } - - return active; -} - -bool QTwistSensorGestureRecognizer::stop() -{ - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Orientation); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), - this,SLOT(orientationReadingChanged(QOrientationReading*))); - - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), - this,SLOT(accelChanged(QAccelerometerReading*))); - - reset(); - orientationList.clear(); - active = false; - return active; -} - -bool QTwistSensorGestureRecognizer::isActive() -{ - return active; -} - -void QTwistSensorGestureRecognizer::orientationReadingChanged(QOrientationReading *reading) -{ - orientationReading = reading; - if (orientationList.count() == 3) - orientationList.removeFirst(); - - orientationList.append(reading->orientation()); - - if (orientationList.count() == 3 - && orientationList.at(2) == QOrientationReading::FaceUp - && (orientationList.at(1) == QOrientationReading::RightUp - || orientationList.at(1) == QOrientationReading::LeftUp)) { - checkTwist(); - } - - checkOrientation(); -} - -bool QTwistSensorGestureRecognizer::checkOrientation() -{ - if (orientationReading->orientation() == QOrientationReading::TopDown - || orientationReading->orientation() == QOrientationReading::FaceDown) { - reset(); - return false; - } - return true; -} - -void QTwistSensorGestureRecognizer::accelChanged(QAccelerometerReading *reading) -{ - if (orientationReading == 0) - return; - - const qreal x = reading->x(); - const qreal y = reading->y(); - const qreal z = reading->z(); - - if (!detecting && !checking&& dataList.count() > 21) - dataList.removeFirst(); - - qreal angle = qRadiansToDegrees(qAtan(x / qSqrt(y * y + z * z))); - - if (qAbs(angle) > 2) { - if (detecting) { - if ((angle > 0 && angle < lastAngle) - || (angle < 0 && angle > lastAngle)) { - decreaseCount++; - } else { - if (decreaseCount > 0) - decreaseCount--; - } - } - - if (!detecting && ((angle > 0 && angle > lastAngle) - || (angle < 0 && angle < lastAngle)) - && ((angle > 0 && lastAngle > 0) - || (angle < 0 && lastAngle < 0))) { - increaseCount++; - } else - if (!detecting && increaseCount > 3 && qAbs(angle) > 30) { - decreaseCount = 0; - detecting = true; - detectedAngle = qRadiansToDegrees(qAtan(y / qSqrt(x * x + z * z))); - } - } else { - increaseCount = 0; - increaseCount = 0; - } - - lastAngle = angle; - if (detecting && decreaseCount >= 4 && qAbs(angle) < 25) { - checkTwist(); - } - - twistAccelData data; - data.x = x; - data.y = y; - data.z = z; - - if (qAbs(x) > 1) - dataList.append(data); - - if (qAbs(z) > 15.0) { - reset(); - } - -} - -void QTwistSensorGestureRecognizer::checkTwist() -{ - checking = true; - int lastx = 0; - bool ok = false; - bool spinpoint = false; - - if (detectedAngle < 0) { - reset(); - return; - } - - //// check for orientation changes first - if (orientationList.count() < 2) - return; - - if (orientationList.count() > 2) - if (orientationList.at(0) == orientationList.at(2) - && (orientationList.at(1) == QOrientationReading::LeftUp - || orientationList.at(1) == QOrientationReading::RightUp)) { - ok = true; - if (orientationList.at(1) == QOrientationReading::RightUp) - detectedAngle = 1; - else - detectedAngle = -1; - } - - // now the manual increase/decrease count - if (!ok) { - if (increaseCount < 1 || decreaseCount < 3) - return; - - if (increaseCount > 6 && decreaseCount > 4) { - ok = true; - if (orientationList.at(1) == QOrientationReading::RightUp) - detectedAngle = 1; - else - detectedAngle = -1; - } - } - // now we're really grasping for anything - if (!ok) - for (int i = 0; i < dataList.count(); i++) { - twistAccelData curData = dataList.at(i); - if (!spinpoint && qAbs(curData.x) < 1) - continue; - if (curData.z >= 0 ) { - if (!spinpoint && (curData.x > lastx || curData.x < lastx) && curData.x - lastx > 1) { - ok = true; - } else if (spinpoint && (curData.x < lastx || curData.x > lastx)&& lastx - curData.x > 1) { - ok = true; - } else { - ok = false; - } - } else if (!spinpoint && curData.z < 0) { - spinpoint = true; - } else if (spinpoint && curData.z > 9) { - break; - } - - lastx = curData.x; - } - if (ok) { - if (detectedAngle > 0) { - Q_EMIT twistLeft(); - Q_EMIT detected("twistLeft"); - } else { - Q_EMIT twistRight(); - Q_EMIT detected("twistRight"); - } - } - reset(); -} - -void QTwistSensorGestureRecognizer::reset() -{ - detecting = false; - checking = false; - dataList.clear(); - increaseCount = 0; - decreaseCount = 0; - lastAngle = 0; -} - - - -QT_END_NAMESPACE diff --git a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h deleted file mode 100644 index 6db83ba2..00000000 --- a/src/plugins/sensorgestures/qtsensors/qtwistsensorgesturerecognizer.h +++ /dev/null @@ -1,60 +0,0 @@ -// 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 - - -#ifndef QWFLICKSENSORGESTURERECOGNIZER_H -#define QWFLICKSENSORGESTURERECOGNIZER_H - -#include <QtSensors/qsensorgesturerecognizer.h> -#include <QtSensors/QAccelerometer> -#include <QtSensors/QOrientationSensor> -#include "qtsensorgesturesensorhandler.h" - -QT_BEGIN_NAMESPACE - -struct twistAccelData { - qreal x; - qreal y; - qreal z; -}; - -class QTwistSensorGestureRecognizer : public QSensorGestureRecognizer -{ - Q_OBJECT -public: - explicit QTwistSensorGestureRecognizer(QObject *parent = 0); - ~QTwistSensorGestureRecognizer(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - -Q_SIGNALS: - void twistLeft(); - void twistRight(); - -private slots: - void accelChanged(QAccelerometerReading *reading); - void orientationReadingChanged(QOrientationReading *reading); - void checkTwist(); - -private: - - QOrientationReading *orientationReading; - bool active; - bool detecting; - QList <twistAccelData> dataList; - bool checking; - void reset(); - bool checkOrientation(); - int increaseCount; - int decreaseCount; - qreal lastAngle; - QList <QOrientationReading::Orientation> orientationList; - qreal detectedAngle; -}; -QT_END_NAMESPACE -#endif // QWFLICKSENSORGESTURERECOGNIZER_H diff --git a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp deleted file mode 100644 index da6621c5..00000000 --- a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.cpp +++ /dev/null @@ -1,204 +0,0 @@ -// 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 "qwhipsensorgesturerecognizer.h" -#include "qtsensorgesturesensorhandler.h" - -#include <QtCore/qmath.h> - -#define TIMER_TIMEOUT 850 - -QT_BEGIN_NAMESPACE - -QWhipSensorGestureRecognizer::QWhipSensorGestureRecognizer(QObject *parent) - : QSensorGestureRecognizer(parent), - orientationReading(0), - accelRange(0), - active(0), - lastX(0), - lastY(0), - lastZ(0), - detecting(0), - whipOk(0) - , lastTimestamp(0) - , timerActive(0) - , lapsedTime(0) -{ -} - -QWhipSensorGestureRecognizer::~QWhipSensorGestureRecognizer() -{ -} - -void QWhipSensorGestureRecognizer::create() -{ -} - -QString QWhipSensorGestureRecognizer::id() const -{ - return QString("QtSensors.whip"); -} - -bool QWhipSensorGestureRecognizer::start() -{ - if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Accel)) { - if (QtSensorGestureSensorHandler::instance()->startSensor(QtSensorGestureSensorHandler::Orientation)) { - accelRange = QtSensorGestureSensorHandler::instance()->accelRange; - active = true; - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), - this,SLOT(orientationReadingChanged(QOrientationReading*))); - - connect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), - this,SLOT(accelChanged(QAccelerometerReading*))); - } else { - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); - active = false; - } - } else { - active = false; - } - lastTimestamp = 0; - timerActive = false; - lapsedTime = 0; - return active; -} - -bool QWhipSensorGestureRecognizer::stop() -{ - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Accel); - QtSensorGestureSensorHandler::instance()->stopSensor(QtSensorGestureSensorHandler::Orientation); - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(orientationReadingChanged(QOrientationReading*)), - this,SLOT(orientationReadingChanged(QOrientationReading*))); - - disconnect(QtSensorGestureSensorHandler::instance(),SIGNAL(accelReadingChanged(QAccelerometerReading*)), - this,SLOT(accelChanged(QAccelerometerReading*))); - active = false; - return active; -} - -bool QWhipSensorGestureRecognizer::isActive() -{ - return active; -} - -void QWhipSensorGestureRecognizer::orientationReadingChanged(QOrientationReading *reading) -{ - orientationReading = reading; -} - -#define WHIP_FACTOR -11.0 -#define WHIP_WIGGLE_FACTOR 0.35 - -void QWhipSensorGestureRecognizer::accelChanged(QAccelerometerReading *reading) -{ - const qreal x = reading->x(); - const qreal y = reading->y(); - qreal z = reading->z(); - - quint64 timestamp = reading->timestamp(); - - if (zList.count() > 4) - zList.removeLast(); - - qreal averageZ = 0; - for (const qreal& az : qAsConst<QList<qreal>>(zList)) - averageZ += az; - - averageZ /= zList.count(); - - zList.insert(0,z); - - if (orientationReading == 0) - return; - //// very hacky - if (orientationReading->orientation() == QOrientationReading::FaceUp) { - z = z - 9.8; - } - - const qreal diffX = lastX - x; - const qreal diffY = lastY - y; - - if (detecting && whipMap.count() > 5 && whipMap.at(5) == true) { - checkForWhip(); - } - - if (whipMap.count() > 5) - whipMap.removeLast(); - - if (negativeList.count() > 5) - negativeList.removeLast(); - - if (z < WHIP_FACTOR - && qAbs(diffX) > -(accelRange * .1285)//-5.0115 - && qAbs(lastX) < 7 - && qAbs(x) < 7) { - whipMap.insert(0,true); - if (!detecting && !timerActive) { - timerActive = true; - detecting = true; - } - } else { - whipMap.insert(0,false); - } - - // check if shaking - if ((((x < 0 && lastX > 0) || (x > 0 && lastX < 0)) - && qAbs(diffX) > (accelRange * 0.7)) //27.3 - || (((y < 0 && lastY > 0) || (y > 0 && lastY < 0)) - && qAbs(diffY) > (accelRange * 0.7))) { - negativeList.insert(0,true); - } else { - negativeList.insert(0,false); - } - - lastX = x; - lastY = y; - lastZ = z; - - if (timerActive && lastTimestamp > 0) - lapsedTime += (timestamp - lastTimestamp )/1000; - - if (timerActive && lapsedTime >= TIMER_TIMEOUT) { - timeout(); - } -} - -void QWhipSensorGestureRecognizer::timeout() -{ - detecting = false; -} - - -void QWhipSensorGestureRecognizer::checkForWhip() -{ - whipOk = false; - - int check = 0; - for (const qreal& az : qAsConst<QList<qreal>>(zList)) { - if (az < -10) - check++; - } - if (check >= 4) - whipOk = true; - else - return; - - if (whipOk) { - bool ok = true; - for (int i = 0; i < negativeList.count() - 1; i++) { - if (negativeList.at(i)) { - ok = false; - } - } - if (ok) { - Q_EMIT whip(); - Q_EMIT detected("whip"); - } - detecting = false; - whipMap.clear(); - timerActive = false; - } -} - -QT_END_NAMESPACE diff --git a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h b/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h deleted file mode 100644 index 5f9a304d..00000000 --- a/src/plugins/sensorgestures/qtsensors/qwhipsensorgesturerecognizer.h +++ /dev/null @@ -1,64 +0,0 @@ -// 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 - - -#ifndef QWHIPSENSORGESTURERECOGNIZER_H -#define QWHIPSENSORGESTURERECOGNIZER_H - -#include <QtSensors/qsensorgesturerecognizer.h> - -#include "qtsensorgesturesensorhandler.h" - -QT_BEGIN_NAMESPACE - -class QWhipSensorGestureRecognizer : public QSensorGestureRecognizer -{ - Q_OBJECT -public: - explicit QWhipSensorGestureRecognizer(QObject *parent = 0); - ~QWhipSensorGestureRecognizer(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - -Q_SIGNALS: - void whip(); - -private slots: - void accelChanged(QAccelerometerReading *reading); - void orientationReadingChanged(QOrientationReading *reading); - void timeout(); - -private: - QOrientationReading *orientationReading; - qreal accelRange; - bool active; - - qreal lastX; - qreal lastY; - qreal lastZ; - - bool detecting; - bool whipOk; - - QList<bool> whipMap; - - void checkForWhip(); - - QList <bool> negativeList; - - QList<qreal> zList; - - quint64 lastTimestamp; - - bool timerActive; - quint64 lapsedTime; - -}; - -QT_END_NAMESPACE -#endif // QWHIPSENSORGESTURERECOGNIZER_H diff --git a/src/plugins/sensorgestures/shake/CMakeLists.txt b/src/plugins/sensorgestures/shake/CMakeLists.txt deleted file mode 100644 index 10dc1d33..00000000 --- a/src/plugins/sensorgestures/shake/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -##################################################################### -## QShakeSensorGesturePlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QShakeSensorGesturePlugin - OUTPUT_NAME qtsensorgestures_shakeplugin - PLUGIN_TYPE sensorgestures - DEFAULT_IF FALSE - SOURCES - qshakerecognizer.cpp qshakerecognizer.h - qshakesensorgestureplugin.cpp qshakesensorgestureplugin.h - LIBRARIES - Qt::Core - Qt::Sensors -) - -#### Keys ignored in scope 1:.:.:shake.pro:<TRUE>: -# OTHER_FILES = "plugin.json" -# PLUGIN_EXTENDS = "-" diff --git a/src/plugins/sensorgestures/shake/qshakerecognizer.cpp b/src/plugins/sensorgestures/shake/qshakerecognizer.cpp deleted file mode 100644 index d2739c8b..00000000 --- a/src/plugins/sensorgestures/shake/qshakerecognizer.cpp +++ /dev/null @@ -1,124 +0,0 @@ -// 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 <QDebug> -#include <QTimer> - -#include "qshakerecognizer.h" - -QShakeSensorGestureRecognizer::QShakeSensorGestureRecognizer(QObject *parent) - : QSensorGestureRecognizer(parent) - , timerTimeout(450) - , active(0) - , shaking(0) - , shakeCount(0) -{ -} - -QShakeSensorGestureRecognizer::~QShakeSensorGestureRecognizer() -{ -} - -void QShakeSensorGestureRecognizer::create() -{ - accel = new QAccelerometer(this); - accel->connectToBackend(); - accel->setDataRate(50); - - qoutputrangelist outputranges = accel->outputRanges(); - - if (outputranges.count() > 0) - accelRange = (int)(outputranges.at(0).maximum *2) / 9.8; //approx range in g's - else - accelRange = 4; //this should never happen - - connect(accel,SIGNAL(readingChanged()),this,SLOT(accelChanged())); - timer = new QTimer(this); - connect(timer,SIGNAL(timeout()),this,SLOT(timeout())); - timer->setSingleShot(true); - timer->setInterval(timerTimeout); -} - -bool QShakeSensorGestureRecognizer::start() -{ - active = accel->start(); - return active; -} - -bool QShakeSensorGestureRecognizer::stop() -{ - accel->stop(); - active = accel->isActive(); - return !active; -} - -bool QShakeSensorGestureRecognizer::isActive() -{ - return active; -} - -QString QShakeSensorGestureRecognizer::id() const -{ - return QString("QtSensors.shake"); -} - -#define NUMBER_SHAKES 3 -#define THRESHOLD 25 - -void QShakeSensorGestureRecognizer::accelChanged() -{ - qreal x = accel->reading()->x(); - qreal y = accel->reading()->y(); - qreal z = accel->reading()->z(); - - currentData.x = x; - currentData.y = y; - currentData.z = z; - - if (qAbs(prevData.x - currentData.x) < 1 - && qAbs(prevData.y - currentData.y) < 1 - && qAbs(prevData.z - currentData.z) < 1) { - prevData.x = currentData.x; - prevData.y = currentData.y; - prevData.z = currentData.z; - return; - } - - bool wasShake = checkForShake(prevData, currentData, THRESHOLD); - if (!shaking && wasShake && - shakeCount >= NUMBER_SHAKES) { - shaking = true; - shakeCount = 0; - Q_EMIT shake(); - Q_EMIT detected("shake"); - - } else if (wasShake) { - - shakeCount++; - if (shakeCount > NUMBER_SHAKES) { - timer->start(); - } - } - - prevData.x = currentData.x; - prevData.y = currentData.y; - prevData.z = currentData.z; -} - -void QShakeSensorGestureRecognizer::timeout() -{ - shakeCount = 0; - shaking = false; -} - -bool QShakeSensorGestureRecognizer::checkForShake(AccelData prevSensorData, AccelData currentSensorData, qreal threshold) -{ - double deltaX = qAbs(prevSensorData.x - currentSensorData.x); - double deltaY = qAbs(prevSensorData.y - currentSensorData.y); - double deltaZ = qAbs(prevSensorData.z - currentSensorData.z); - - return (deltaX > threshold - || deltaY > threshold - || deltaZ > threshold); -} - diff --git a/src/plugins/sensorgestures/shake/qshakerecognizer.h b/src/plugins/sensorgestures/shake/qshakerecognizer.h deleted file mode 100644 index 2be0ced8..00000000 --- a/src/plugins/sensorgestures/shake/qshakerecognizer.h +++ /dev/null @@ -1,62 +0,0 @@ -// 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 - -#ifndef QSHAKERECOGNIZER_H -#define QSHAKERECOGNIZER_H - - -#include <QtSensors/QSensor> -#include <QtSensors/QAccelerometer> -#include <QtSensors/QAccelerometerFilter> -#include <QDebug> -#include <QTimer> - -#include <QtSensors/qsensorgesturerecognizer.h> - - struct AccelData { - qreal x; - qreal y; - qreal z; -}; - -class QShakeSensorGestureRecognizer : public QSensorGestureRecognizer -{ - Q_OBJECT - -public: - - QShakeSensorGestureRecognizer(QObject *parent = 0); - ~QShakeSensorGestureRecognizer(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - - QTimer *timer; - int timerTimeout; - -Q_SIGNALS: - void shake(); - -private slots: - void accelChanged(); - void timeout(); -private: - QAccelerometer *accel; - bool active; - int accelRange; - - AccelData prevData; - AccelData currentData; - - bool checkForShake(AccelData prevSensorData, AccelData currentSensorData, qreal threshold); - bool shaking; - int shakeCount; - int threshold; - -}; - -#endif // QSHAKERECOGNIZER_H diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp deleted file mode 100644 index f1151368..00000000 --- a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// 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 <QtPlugin> -#include <QStringList> -#include <QObject> - -#include "qshakesensorgestureplugin.h" - -#include <QtSensors/qsensorgestureplugininterface.h> - -#include "qshakerecognizer.h" - - -QShakeSensorGesturePlugin::QShakeSensorGesturePlugin() -{ -} - -QShakeSensorGesturePlugin::~QShakeSensorGesturePlugin() -{ -} - -QStringList QShakeSensorGesturePlugin::supportedIds() const -{ - QStringList list; - list << "QtSensors.shake"; - return list; -} - -QList <QSensorGestureRecognizer *> QShakeSensorGesturePlugin::createRecognizers() -{ - QList <QSensorGestureRecognizer *> recognizers; - - QSensorGestureRecognizer *sRec = new QShakeSensorGestureRecognizer(this); - recognizers.append(sRec); - - return recognizers; -} diff --git a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h b/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h deleted file mode 100644 index a76bab57..00000000 --- a/src/plugins/sensorgestures/shake/qshakesensorgestureplugin.h +++ /dev/null @@ -1,29 +0,0 @@ -// 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 - -#ifndef QSHAKESENSORGESTUREPLUGIN_H -#define QSHAKESENSORGESTUREPLUGIN_H - -#include <QObject> -#include <QStringList> - -#include <QtSensors/qsensorgestureplugininterface.h> - -class QShakeSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.QSensorGesturePluginInterface") - Q_INTERFACES(QSensorGesturePluginInterface) - -public: - explicit QShakeSensorGesturePlugin(); - ~QShakeSensorGesturePlugin(); - - QList <QSensorGestureRecognizer *> createRecognizers() override; - - QStringList gestureSignals() const; - QStringList supportedIds() const override; - QString name() const override { return "ShakeGestures"; } -}; - -#endif // QSHAKESENSORGESTUREPLUGIN_H diff --git a/src/plugins/sensors/CMakeLists.txt b/src/plugins/sensors/CMakeLists.txt index cd200922..e7527d8f 100644 --- a/src/plugins/sensors/CMakeLists.txt +++ b/src/plugins/sensors/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause # all get generic sensor add_subdirectory(generic) @@ -25,6 +25,6 @@ if(LINUX AND TARGET Qt::DBus AND NOT SENSORS_PLUGINS OR "iio-sensor-proxy" IN_LI add_subdirectory(iio-sensor-proxy) endif() -if(NOT SENSORS_PLUGINS OR "dummy" IN_LIST SENSORS_PLUGINS) +if("dummy" IN_LIST SENSORS_PLUGINS) add_subdirectory(dummy) endif() diff --git a/src/plugins/sensors/android/CMakeLists.txt b/src/plugins/sensors/android/CMakeLists.txt index 82b1b0bb..9a77a9a5 100644 --- a/src/plugins/sensors/android/CMakeLists.txt +++ b/src/plugins/sensors/android/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## QCounterGesturePlugin Plugin: diff --git a/src/plugins/sensors/android/sensormanager.cpp b/src/plugins/sensors/android/sensormanager.cpp index 96d3cf1c..755b6109 100644 --- a/src/plugins/sensors/android/sensormanager.cpp +++ b/src/plugins/sensors/android/sensormanager.cpp @@ -3,11 +3,12 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "sensormanager.h" #include <QtCore/qcoreapplication.h> +#include <QtCore/qjnitypes.h> #include <dlfcn.h> Q_DECLARE_JNI_CLASS(AndroidContext, "android/content/Context") -Q_DECLARE_JNI_TYPE(Sensor, "Landroid/hardware/Sensor;") +Q_DECLARE_JNI_CLASS(Sensor, "android/hardware/Sensor") SensorManager::SensorManager() { diff --git a/src/plugins/sensors/dummy/CMakeLists.txt b/src/plugins/sensors/dummy/CMakeLists.txt index 5fa1218d..19f93329 100644 --- a/src/plugins/sensors/dummy/CMakeLists.txt +++ b/src/plugins/sensors/dummy/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## dummySensorPlugin Plugin: diff --git a/src/plugins/sensors/dummy/dummycommon.cpp b/src/plugins/sensors/dummy/dummycommon.cpp index 772f0335..f5b63146 100644 --- a/src/plugins/sensors/dummy/dummycommon.cpp +++ b/src/plugins/sensors/dummy/dummycommon.cpp @@ -18,7 +18,7 @@ void dummycommon::start() int dataRate = sensor()->dataRate(); if (dataRate == 0) { - if (sensor()->availableDataRates().count()) + if (sensor()->availableDataRates().size()) // Use the first available rate when -1 is chosen dataRate = sensor()->availableDataRates().first().first; else diff --git a/src/plugins/sensors/generic/CMakeLists.txt b/src/plugins/sensors/generic/CMakeLists.txt index f21dfe9d..449401ab 100644 --- a/src/plugins/sensors/generic/CMakeLists.txt +++ b/src/plugins/sensors/generic/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## genericSensorPlugin Plugin: diff --git a/src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt b/src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt index 4a42902d..83093e11 100644 --- a/src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt +++ b/src/plugins/sensors/iio-sensor-proxy/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## IIOSensorProxySensorPlugin Plugin: @@ -14,6 +14,12 @@ qt_internal_add_plugin(IIOSensorProxySensorPlugin iiosensorproxyorientationsensor.cpp iiosensorproxyorientationsensor.h iiosensorproxysensorbase.cpp iiosensorproxysensorbase.h main.cpp + NO_UNITY_BUILD_SOURCES + # Duplicate symbol definition between, iiosensorproxycompass.cpp, and + # the followings + # TODO: dbusPath() can probably be implemented as a static data member + iiosensorproxylightsensor.cpp + iiosensorproxyorientationsensor.cpp DBUS_INTERFACE_SOURCES org.freedesktop.DBus.Properties.xml net.hadess.SensorProxy.xml diff --git a/src/plugins/sensors/iio-sensor-proxy/org.freedesktop.DBus.Properties.xml b/src/plugins/sensors/iio-sensor-proxy/org.freedesktop.DBus.Properties.xml index 5dc94f5d..c7a43ca7 100644 --- a/src/plugins/sensors/iio-sensor-proxy/org.freedesktop.DBus.Properties.xml +++ b/src/plugins/sensors/iio-sensor-proxy/org.freedesktop.DBus.Properties.xml @@ -20,7 +20,7 @@ <signal name="PropertiesChanged"> <arg name="interface" type="s"/> <arg name="changed_properties" type="a{sv}"/> - <annotation name="org.qtproject.QtDBus.QtTypeName.In1" value="QVariantMap"/> + <annotation name="org.qtproject.QtDBus.QtTypeName.Out1" value="QVariantMap"/> <arg name="invalidated_properties" type="as"/> </signal> </interface> diff --git a/src/plugins/sensors/ios/CMakeLists.txt b/src/plugins/sensors/ios/CMakeLists.txt index aa47c782..44f61427 100644 --- a/src/plugins/sensors/ios/CMakeLists.txt +++ b/src/plugins/sensors/ios/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## IOSSensorPlugin Plugin: diff --git a/src/plugins/sensors/sensorfw/CMakeLists.txt b/src/plugins/sensors/sensorfw/CMakeLists.txt index 086c924a..cc5e9dad 100644 --- a/src/plugins/sensors/sensorfw/CMakeLists.txt +++ b/src/plugins/sensors/sensorfw/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## sensorfwSensorPlugin Plugin: diff --git a/src/plugins/sensors/winrt/CMakeLists.txt b/src/plugins/sensors/winrt/CMakeLists.txt index d504c44b..78baef86 100644 --- a/src/plugins/sensors/winrt/CMakeLists.txt +++ b/src/plugins/sensors/winrt/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## WinRtSensorPlugin Plugin: diff --git a/src/plugins/sensors/winrt/winrtgyroscope.cpp b/src/plugins/sensors/winrt/winrtgyroscope.cpp index 479e9d89..c5fff500 100644 --- a/src/plugins/sensors/winrt/winrtgyroscope.cpp +++ b/src/plugins/sensors/winrt/winrtgyroscope.cpp @@ -14,7 +14,7 @@ using namespace Microsoft::WRL::Wrappers; using namespace ABI::Windows::Foundation; using namespace ABI::Windows::Devices::Sensors; -typedef ITypedEventHandler<Gyrometer *, GyrometerReadingChangedEventArgs *> InclinometerReadingHandler; +typedef ITypedEventHandler<Gyrometer *, GyrometerReadingChangedEventArgs *> GyrometerReadingHandler; QT_USE_NAMESPACE @@ -129,8 +129,8 @@ void WinRtGyroscope::start() if (d->token.value) return; - ComPtr<InclinometerReadingHandler> callback = - Callback<InclinometerReadingHandler>(d, &WinRtGyroscopePrivate::readingChanged); + ComPtr<GyrometerReadingHandler> callback = + Callback<GyrometerReadingHandler>(d, &WinRtGyroscopePrivate::readingChanged); HRESULT hr = d->sensor->add_ReadingChanged(callback.Get(), &d->token); if (FAILED(hr)) { diff --git a/src/sensors/CMakeLists.txt b/src/sensors/CMakeLists.txt index ef1ba85e..6d883696 100644 --- a/src/sensors/CMakeLists.txt +++ b/src/sensors/CMakeLists.txt @@ -1,18 +1,13 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## Sensors Module: ##################################################################### qt_internal_add_module(Sensors - PLUGIN_TYPES sensors # sensorgestures + PLUGIN_TYPES sensors SOURCES - # gestures/qsensorgesture.cpp gestures/qsensorgesture.h gestures/qsensorgesture_p.h - # gestures/qsensorgesturemanager.cpp gestures/qsensorgesturemanager.h - # gestures/qsensorgesturemanagerprivate.cpp gestures/qsensorgesturemanagerprivate_p.h - # gestures/qsensorgestureplugininterface.cpp gestures/qsensorgestureplugininterface.h - # gestures/qsensorgesturerecognizer.cpp gestures/qsensorgesturerecognizer.h qsensorbackend.cpp qsensorbackend.h qsensormanager.cpp qsensormanager.h qsensorplugin.cpp qsensorplugin.h @@ -82,7 +77,7 @@ qt_internal_add_module(Sensors if(ANDROID) set_property(TARGET Sensors APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES - plugins/sensors/libplugins_sensors_qtsensors_android.so + ${INSTALL_PLUGINSDIR}/sensors/libplugins_sensors_qtsensors_android.so ) endif() diff --git a/src/sensors/configure.cmake b/src/sensors/configure.cmake index b05c66e8..04eb0e30 100644 --- a/src/sensors/configure.cmake +++ b/src/sensors/configure.cmake @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause @@ -45,7 +45,10 @@ if (LINUX) # src/plugins/sensors/CMakeLists.txt and fix any potential errors. qt_configure_add_summary_entry(ARGS "sensorfw") qt_configure_add_summary_entry(ARGS "sensorfw_enabled_with_cmake") - qt_configure_add_report(MESSAGE "SensorFW support currently not enabled with cmake") + qt_configure_add_report_entry( + TYPE WARNING + MESSAGE "SensorFW support currently not enabled with cmake" + ) endif() if (WIN32) diff --git a/src/sensors/doc/images/sensorgesture-cover.png b/src/sensors/doc/images/sensorgesture-cover.png Binary files differdeleted file mode 100644 index 7b4fbc5f..00000000 --- a/src/sensors/doc/images/sensorgesture-cover.png +++ /dev/null diff --git a/src/sensors/doc/images/sensorgesture-doubletap.png b/src/sensors/doc/images/sensorgesture-doubletap.png Binary files differdeleted file mode 100644 index 6253d0f8..00000000 --- a/src/sensors/doc/images/sensorgesture-doubletap.png +++ /dev/null diff --git a/src/sensors/doc/images/sensorgesture-facedown.png b/src/sensors/doc/images/sensorgesture-facedown.png Binary files differdeleted file mode 100644 index a85664f1..00000000 --- a/src/sensors/doc/images/sensorgesture-facedown.png +++ /dev/null diff --git a/src/sensors/doc/images/sensorgesture-faceup.png b/src/sensors/doc/images/sensorgesture-faceup.png Binary files differdeleted file mode 100644 index c20ef089..00000000 --- a/src/sensors/doc/images/sensorgesture-faceup.png +++ /dev/null diff --git a/src/sensors/doc/images/sensorgesture-flat.png b/src/sensors/doc/images/sensorgesture-flat.png Binary files differdeleted file mode 100644 index e8eafafb..00000000 --- a/src/sensors/doc/images/sensorgesture-flat.png +++ /dev/null diff --git a/src/sensors/doc/images/sensorgesture-hover.png b/src/sensors/doc/images/sensorgesture-hover.png Binary files differdeleted file mode 100644 index fecf6b3a..00000000 --- a/src/sensors/doc/images/sensorgesture-hover.png +++ /dev/null diff --git a/src/sensors/doc/images/sensorgesture-shake.png b/src/sensors/doc/images/sensorgesture-shake.png Binary files differdeleted file mode 100644 index 06f9eeaf..00000000 --- a/src/sensors/doc/images/sensorgesture-shake.png +++ /dev/null diff --git a/src/sensors/doc/images/sensorgesture-slam_1.png b/src/sensors/doc/images/sensorgesture-slam_1.png Binary files differdeleted file mode 100644 index d56f8892..00000000 --- a/src/sensors/doc/images/sensorgesture-slam_1.png +++ /dev/null diff --git a/src/sensors/doc/images/sensorgesture-slam_2.png b/src/sensors/doc/images/sensorgesture-slam_2.png Binary files differdeleted file mode 100644 index 5fe8ecba..00000000 --- a/src/sensors/doc/images/sensorgesture-slam_2.png +++ /dev/null diff --git a/src/sensors/doc/images/sensorgesture-twist.png b/src/sensors/doc/images/sensorgesture-twist.png Binary files differdeleted file mode 100644 index bec15854..00000000 --- a/src/sensors/doc/images/sensorgesture-twist.png +++ /dev/null diff --git a/src/sensors/doc/images/sensorgesture-whip.png b/src/sensors/doc/images/sensorgesture-whip.png Binary files differdeleted file mode 100644 index aa998bb7..00000000 --- a/src/sensors/doc/images/sensorgesture-whip.png +++ /dev/null diff --git a/src/sensors/doc/qtsensors.qdocconf b/src/sensors/doc/qtsensors.qdocconf index 75dec6f6..b7569927 100644 --- a/src/sensors/doc/qtsensors.qdocconf +++ b/src/sensors/doc/qtsensors.qdocconf @@ -43,22 +43,11 @@ examplesinstallpath = sensors imagedirs += images -# Gestures have been disabled for the time being -excludedirs += ../../../examples/sensors/qmlsensorgestures \ - ../../../examples/sensors/shakeit \ - ../../../examples/sensors/sensorgestures \ - ../../plugins/sensorgestures \ - ../../sensors/gestures - -excludefiles += ../../sensorsquick/qmlsensorgesture.cpp \ - src/qtsensorgestures-cpp.qdoc \ - src/qtsensorgestures-plugins.qdoc - depends += qtcore qtdoc qtgui qtquick qtcmake +# Highlighted examples +manifestmeta.highlighted.names = "QtSensors/Sensors Showcase" + navigation.landingpage = "Qt Sensors" navigation.cppclassespage = "Qt Sensors C++ Classes" navigation.qmltypespage = "Qt Sensors QML Types" - -# Fail the documentation build if there are more warnings than the limit -warninglimit = 0 diff --git a/src/sensors/doc/snippets/sensorgestures/CMakeLists.txt b/src/sensors/doc/snippets/sensorgestures/CMakeLists.txt deleted file mode 100644 index 03c23951..00000000 --- a/src/sensors/doc/snippets/sensorgestures/CMakeLists.txt +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -cmake_minimum_required(VERSION 3.16) -project(sensorgesturessdocsnippet LANGUAGES CXX) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTORCC ON) -set(CMAKE_AUTOUIC ON) - -find_package(Qt6 COMPONENTS Core Sensors) - -qt_add_executable(sensorgesturessdocsnippet - creating.cpp - main.cpp - myplugin.h - plugin.cpp -) - -target_link_libraries(sensorgesturessdocsnippet PUBLIC - Qt::Sensors -) - -if (GCC AND UNIX) - target_link_libraries(sensorgesturessdocsnippet PUBLIC - rdynamic - log - ) -endif() diff --git a/src/sensors/doc/snippets/sensorgestures/creating.cpp b/src/sensors/doc/snippets/sensorgestures/creating.cpp deleted file mode 100644 index d1e08285..00000000 --- a/src/sensors/doc/snippets/sensorgestures/creating.cpp +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (C) 2017 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 <QObject> -#include <QString> -#include <QSensorGestureManager> - -class MyObject : public QObject -{ - void create(); -public slots: - void gestureDetected(const QString &); -}; - -void MyObject::create() -{ -//! [Receiving sensor gesture signals] - -// Create a QSensorGestureManager - QSensorGestureManager gestureManager; - -// Get a list of known recognizers - QStringList recognizersList = gestureManager.gestureIds(); - -// Create a QSensorGeture object for each of those gesture recognizers - QSensorGesture *gesture = new QSensorGesture( gestureManager.gestureIds(), this); -// Connect the known signals up. - connect(gesture, SIGNAL(detected(QString)), this, SLOT(gestureDetected(QString))); -//! [Receiving sensor gesture signals] -} - -void MyObject::gestureDetected(const QString &gesture) -{ - Q_UNUSED(gesture); -} - diff --git a/src/sensors/doc/snippets/sensorgestures/main.cpp b/src/sensors/doc/snippets/sensorgestures/main.cpp deleted file mode 100644 index d53eb039..00000000 --- a/src/sensors/doc/snippets/sensorgestures/main.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (C) 2017 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 - -int main(int /*argc*/, char ** /*argv*/) -{ - return 0; -} - diff --git a/src/sensors/doc/snippets/sensorgestures/myplugin.h b/src/sensors/doc/snippets/sensorgestures/myplugin.h deleted file mode 100644 index 0f03ff47..00000000 --- a/src/sensors/doc/snippets/sensorgestures/myplugin.h +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (C) 2017 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 - -#ifndef MYPLUGIN_H -#define MYPLUGIN_H - -#include <QObject> -#include <qsensorgestureplugininterface.h> -#include <qsensorgesturerecognizer.h> - -class MySensorGestureRecognizer : public QSensorGestureRecognizer -{ - Q_OBJECT - public: - - MySensorGestureRecognizer(QObject *parent = 0); - ~MySensorGestureRecognizer(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - -Q_SIGNALS: -// all signals will get exported to QSensorGesture - void mySignal(); -}; - -class MySensorGesturePlugin : public QObject, public QSensorGesturePluginInterface -{ - Q_OBJECT - //Q_PLUGIN_METADATA(IID "com.Nokia.QSensorGesturePluginInterface" FILE "plugin.json") - Q_INTERFACES(QSensorGesturePluginInterface) -public: - - explicit MySensorGesturePlugin(); - ~MySensorGesturePlugin(); - - QList<QSensorGestureRecognizer *> createRecognizers() override; - QStringList supportedIds() const override; - QString name() const override { return "MyGestures"; } -}; - -#endif diff --git a/src/sensors/doc/snippets/sensorgestures/plugin.cpp b/src/sensors/doc/snippets/sensorgestures/plugin.cpp deleted file mode 100644 index c65d4be4..00000000 --- a/src/sensors/doc/snippets/sensorgestures/plugin.cpp +++ /dev/null @@ -1,63 +0,0 @@ -// Copyright (C) 2017 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 "myplugin.h" - -#include <qsensorgestureplugininterface.h> -#include <qsensorgesturemanager.h> - -//! [Plugin] - -MySensorGestureRecognizer::MySensorGestureRecognizer(QObject *parent) - : QSensorGestureRecognizer(parent) -{ -} - -MySensorGestureRecognizer::~MySensorGestureRecognizer() -{ -} - -bool MySensorGestureRecognizer::start() -{ - Q_EMIT mySignal(); - return true; -} - -bool MySensorGestureRecognizer::stop() -{ - return true; -} - -bool MySensorGestureRecognizer::isActive() -{ - return true; -} - -void MySensorGestureRecognizer::create() -{ -} - -QString MySensorGestureRecognizer::id() const -{ - return QString("QtSensors.mygestures"); -} - - -MySensorGesturePlugin::MySensorGesturePlugin(){} -MySensorGesturePlugin::~MySensorGesturePlugin(){} - -QList <QSensorGestureRecognizer *> MySensorGesturePlugin::createRecognizers() -{ - QList <QSensorGestureRecognizer *> recognizers; - MySensorGestureRecognizer *recognizer = new MySensorGestureRecognizer(this); - recognizers.append(recognizer); - - return recognizers; -} - -QStringList MySensorGesturePlugin::supportedIds() const -{ - return QStringList() << "QtSensors.mygestures"; -} - -//! [Plugin] diff --git a/src/sensors/doc/snippets/sensors/CMakeLists.txt b/src/sensors/doc/snippets/sensors/CMakeLists.txt index 9cc90a27..27480020 100644 --- a/src/sensors/doc/snippets/sensors/CMakeLists.txt +++ b/src/sensors/doc/snippets/sensors/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause cmake_minimum_required(VERSION 3.16) project(sensorsdocsnippet LANGUAGES CXX) @@ -17,6 +17,7 @@ qt_add_executable(sensorsdocsnippet main.cpp mybackend.h plugin.cpp + start.cpp ) target_link_libraries(sensorsdocsnippet PUBLIC diff --git a/src/sensors/doc/snippets/sensors/creating.cpp b/src/sensors/doc/snippets/sensors/creating.cpp index 09ad9555..4c99066f 100644 --- a/src/sensors/doc/snippets/sensors/creating.cpp +++ b/src/sensors/doc/snippets/sensors/creating.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #include <QObject> #include <qaccelerometer.h> diff --git a/src/sensors/doc/snippets/sensors/main.cpp b/src/sensors/doc/snippets/sensors/main.cpp index d53eb039..fb6724d5 100644 --- a/src/sensors/doc/snippets/sensors/main.cpp +++ b/src/sensors/doc/snippets/sensors/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause int main(int /*argc*/, char ** /*argv*/) { diff --git a/src/sensors/doc/snippets/sensors/mybackend.h b/src/sensors/doc/snippets/sensors/mybackend.h index befcbc67..b964e747 100644 --- a/src/sensors/doc/snippets/sensors/mybackend.h +++ b/src/sensors/doc/snippets/sensors/mybackend.h @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #ifndef MYBACKEND_H #define MYBACKEND_H diff --git a/src/sensors/doc/snippets/sensors/plugin.cpp b/src/sensors/doc/snippets/sensors/plugin.cpp index e8611176..27f50d72 100644 --- a/src/sensors/doc/snippets/sensors/plugin.cpp +++ b/src/sensors/doc/snippets/sensors/plugin.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 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 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #include "mybackend.h" #include <qsensorplugin.h> diff --git a/src/sensors/doc/snippets/sensors/start.cpp b/src/sensors/doc/snippets/sensors/start.cpp index 2ff9c89c..18c87d06 100644 --- a/src/sensors/doc/snippets/sensors/start.cpp +++ b/src/sensors/doc/snippets/sensors/start.cpp @@ -1,7 +1,9 @@ // Copyright (C) 2017 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 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -#include <qsensor.h> +#include <QtSensors/qsensor.h> +#include <QtCore/QMetaObject> +#include <QtCore/QMetaproperty> void start() { @@ -19,3 +21,39 @@ qreal y = reading->value(1).value<qreal>(); Q_UNUSED(x); Q_UNUSED(y); } + +class MyObject : public QObject +{ + void findSensors() + { + //! [Find sensors] + QList<QSensor*> mySensorList; + for (const QByteArray &type : QSensor::sensorTypes()) { + qDebug() << "Found a sensor type:" << type; + for (const QByteArray &identifier : QSensor::sensorsForType(type)) { + qDebug() << " " << "Found a sensor of that type:" << identifier; + QSensor* sensor = new QSensor(type, this); + sensor->setIdentifier(identifier); + mySensorList.append(sensor); + } + } + //! [Find sensors] + //! [Print reading properties] + for (QSensor* sensor : mySensorList) { + const int firstProperty = QSensorReading::staticMetaObject.propertyOffset(); + // Connect to backend first in case start() hasn't been called yet + if (!sensor->connectToBackend()) + continue; + qDebug() << "Sensor" << sensor->identifier() << "reading properties:"; + QSensorReading *reading = sensor->reading(); + if (reading) { + const QMetaObject *mo = reading->metaObject(); + for (int i = firstProperty; i < mo->propertyCount(); ++i) { + QByteArray name = mo->property(i).name(); + qDebug() << " " << name << reading->property(name).toByteArray(); + } + } + } + //! [Print reading properties] + } +}; diff --git a/src/sensors/doc/snippets/sensors/tutorial.cpp b/src/sensors/doc/snippets/sensors/tutorial.cpp new file mode 100644 index 00000000..e8714961 --- /dev/null +++ b/src/sensors/doc/snippets/sensors/tutorial.cpp @@ -0,0 +1,25 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +//! [MySensor] +class MyReadingPrivate; + +class MyReading : public QSensorReading + { + Q_OBJECT + Q_PROPERTY(qreal myprop READ myprop) + DECLARE_READING(MyReading) +public: + qreal myprop() const; + void setMyprop(qreal myprop); + }; + +class MySensor : public QSensor +{ + Q_OBJECT +public: + explicit MySensor(QObject *parent = 0); + MyReading *reading() const; + static char const * const sensorType; + }; +//! [MySensor] diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc index 2bf214dd..41f91a73 100644 --- a/src/sensors/doc/src/compatmap.qdoc +++ b/src/sensors/doc/src/compatmap.qdoc @@ -131,10 +131,140 @@ <td bgcolor="gray"></td> <td bgcolor="green"></td> </tr> + </tbody> </table> \endraw + \raw DocBook +<db:informaltable cellpadding="2" cellspacing="1" border="1" width="90%"> + <db:tbody> + <db:tr> + <db:td>Color</db:td> + <db:td>Explanation</db:td> + </db:tr> + <db:tr> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td>The sensor is supported.</db:td> + </db:tr> + <db:tr> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td>The sensor is not supported.</db:td> + </db:tr> + </db:tbody> + </db:informaltable> + + + <db:informaltable cellpadding="2" cellspacing="1" border="1" rules="all" width="90%"> + <db:tbody> + <db:tr> + <db:td><db:emphasis role="bold">Feature</db:emphasis></db:td> + <db:td><db:emphasis role="bold">Android</db:emphasis></db:td> + <db:td><db:emphasis role="bold">Linux</db:emphasis></db:td> + <db:td><db:emphasis role="bold">iOS</db:emphasis></db:td> + <db:td><db:emphasis role="bold">Windows</db:emphasis></db:td> + <db:td><db:emphasis role="bold">Generic</db:emphasis></db:td> + </db:tr> + <db:tr> + <db:td>Accelerometer</db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + </db:tr> + <db:tr> + <db:td>Ambient Light Sensor</db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + </db:tr> + <db:tr> + <db:td>Ambient Temperature Sensor</db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + </db:tr> + <db:tr> + <db:td>Compass</db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + </db:tr> + <db:tr> + <db:td>Gyroscope</db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + </db:tr> + <db:tr> + <db:td>Light Sensor</db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + </db:tr> + <db:tr> + <db:td>Magnetometer</db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + </db:tr> + <db:tr> + <db:td>Orientation Sensor</db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + </db:tr> + <db:tr> + <db:td>Pressure Sensor</db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + </db:tr> + <db:tr> + <db:td>Proximity Sensor</db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + </db:tr> + <db:tr> + <db:td>Rotation Sensor</db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + </db:tr> + <db:tr> + <db:td>Tilt Sensor</db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + <db:td class="bgcolor-gray" ><?dbhtml bgcolor="gray" ?><?dbfo bgcolor="gray" ?></db:td> + <db:td class="bgcolor-green" ><?dbhtml bgcolor="green" ?><?dbfo bgcolor="green" ?></db:td> + </db:tr> + </db:tbody> + </db:informaltable> + \endraw + In addition to the table above, each sensor type might support specific features. For example, a magnetometer might support returning geo values. See QSensor::isFeatureSupported() for additional details. diff --git a/src/sensors/doc/src/qtsensorgestures-cpp.qdoc b/src/sensors/doc/src/qtsensorgestures-cpp.qdoc deleted file mode 100644 index d7c5ebfc..00000000 --- a/src/sensors/doc/src/qtsensorgestures-cpp.qdoc +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! -\page qtsensorgestures-cpp.html -\title Sensor Gestures C++ Overview -\brief Explains how to use the QtSensorGestures C++ API - -\tableofcontents - -\section1 Using QtSensorGestures - -With the Sensor Gestures classes, you are able to easily utilize device gesturing using -sensors, such as the accelerometer and proximity. - -A list of currently supported sensor gestures and their descriptions can be found here: -\l {Qt Sensor Gestures} - -Using \c QtSensorGestures is easy. There are two main classes you will need to use: - -\list - \li QSensorGestureManager: can be used for determining which sensor gestures are available. - \li QSensorGesture : for connecting the sensor gesture signals. -\endlist - -\snippet sensorgestures/creating.cpp Receiving sensor gesture signals - -More information about the sensor gesture recognizers can be found in -\l{QtSensorGestures Plugins}. - -\section1 Main Classes - -The primary classes that make up the QtSensorGestures API: - -\annotatedlist sensorgestures_main - -The primary classes that make up the \c QtSensorGesturesRecognizers API: - -\annotatedlist sensorgestures_recognizer - -Details of the \c QSensorGesturePlugins available - -\annotatedlist sensorgesture_plugins_topics - -*/ - diff --git a/src/sensors/doc/src/qtsensorgestures-plugins.qdoc b/src/sensors/doc/src/qtsensorgestures-plugins.qdoc deleted file mode 100644 index 2baf1a85..00000000 --- a/src/sensors/doc/src/qtsensorgestures-plugins.qdoc +++ /dev/null @@ -1,143 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only - -/*! -\group sensorgesture_plugins_topics -\title QtSensorGestures Plugins -\brief Explains how to develop recognizer plugins with QtSensorGestures - -The QtSensorGestures recognizer plugins are the way to create your own -sensor gestures. - -Creating software to recognize motion gestures using sensors is a huge subject not covered here. - -The QSensorGesture API does not limit usage to any of the common classification methods of gesture -recognition, such as Hidden Markov Models, Neural Networks, Dynamic Time Warping, or even the -ad-hoc heuristic recognizers of Qt's built-in sensor gesture recognizers. It's basically a -signaling system for lower level gesture recogition methods and algorithms to communicate to the -higher level applications. - -\tableofcontents - -\section1 Overview - - The steps for creating a sensor gesture plugin are as follows: -\list -\li Sub-class from QSensorGesturePluginInterface -\li Sub-class from QSensorGestureRecognizer and implement gesture recognizer logic using QtSensors. -\li Create an instance of that recognizer in the derived QSensorGesturePluginInterface class, and call - QSensorGestureManager::registerSensorGestureRecognizer(sRec); in your registerRecognizers() -function. QSensorGestureManager will retain ownership of the recognizer object. - -This is the class in which the gesture recognizer system should be implemented from. - -\endlist - -\snippet sensorgestures/plugin.cpp Plugin - - -\section2 Recognizer Classes - -If you are making sensorgestures available through the QtSensorGestures API, these are the -classes to subclass. - -\annotatedlist sensorgestures_recognizer - -\target Qt Sensor Gestures -\section3 Recognizer Plugins - -The Sensor Gesture Recognizers that come with Qt are made using an ad-hoc heuristic approach. -The user cannot define their own gestures, and must learn how to perform and accommodate the -pre-defined gestures herein. - -A developer may use any method, including computationally- and training-intensive well- -known classifiers, to produce gesture recognizers. There are currently no classes in Qt for -gesture training, nor is it possible for the user to define his own sensor-based motion gestures. - -A procedure for writing ad-hoc recognizers might include: -\list - \li Obtain and gather output from the accelerometer through \c QAccelerometerReading of a gesture being performed. - \li Use various methods and constraints on the accelerometer data to recognize the various states: - \list i - \li Initial "listening" state for a gesture - \li Start of a possible gesture, moving into a "detecting" state - \li End of a possible gesture, moving into a "recognizing" state - \li and finally, if it is recognized, the "recognized" state, or if not recognized, move back to - the "listening" state. - \endlist - \li Test procedure to make sure it is easy to perform, and will not - produce too many false positive recognitions, or collisions if used with other gestures. Meaning -that gestures performed get recognized as another gesture instead. - -\endlist - -Below you will find a list of included plugins and their signals. - -For the ShakeGestures plugin: - \table - \row - \li Recognizer Id - \li Signals - \row - \li QtSensors.shake - \li shake -\endtable - -For the QtSensorGestures plugin: - \table - \row - \li Recognizer Id - \li Signals - \li Description - \li Images - \row - \li QtSensors.cover - \li cover - \li Hand covers up phone display for one second, when it's face up, using the Proximity and Orientation sensors. - \li \image sensorgesture-cover.png - \row - \li QtSensors.doubletap - \li doubletap - \li Double tap of finger on phone, using the DoubleTap sensor. - \li \image sensorgesture-doubletap.png - \row - \li QtSensors.hover - \li hover - \li Hand hovers about 4 cm above the phone for more than 1 second, then is removed when face up, - using the IR Proximity sensor. - \li \image sensorgesture-hover.png - \row - \li QtSensors.pickup - \li pickup - \li Phone is resting face up on a flat curface, and is then picked up and brought up into viewing position. Uses the Accelerometer sensor. - \li \image sensorgesture-faceup.png - \row - \li QtSensors.shake2 - \li shakeLeft, shakeRight, shakeUp, shakeDown - \li Shake phone in a certain direction, using the Accelerometer sensor. - \li \image sensorgesture-shake.png - \row - \li QtSensors.slam - \li slam - \li Phone is held in a top up position with a side facing forward for a moment. Swing it quickly with a downward motion - like it is being used to point at something with the top corner. Uses the Accelerometer and Orientation sensors. - \li \image sensorgesture-slam_1.png - \image sensorgesture-slam_2.png - \row - \li QtSensors.turnover - \li turnover - \li Phone is turned face down and placed on a surface, using Proximity and Orientation sensors. - \li \image sensorgesture-facedown.png - \row - \li QtSensors.twist - \li twistLeft, twistRight - \li Phone is held face up and then twisted left or right (left side up or right side up) and back, using the Accelerometer and Orientation sensors. - \li \image sensorgesture-twist.png - \row - \li QtSensors.whip - \li whip - \li Move phone quickly down and then back up. Uses the Accelerometer and Orientation sensors. - \li \image sensorgesture-whip.png - \endtable - -*/ diff --git a/src/sensors/doc/src/qtsensors-cpp.qdoc b/src/sensors/doc/src/qtsensors-cpp.qdoc index 2251289c..b70f8276 100644 --- a/src/sensors/doc/src/qtsensors-cpp.qdoc +++ b/src/sensors/doc/src/qtsensors-cpp.qdoc @@ -5,6 +5,7 @@ \page qtsensors-cpp.html \title Qt Sensors C++ Overview \brief Explains how to use the Qt Sensors C++ API. +\ingroup explanation \tableofcontents @@ -79,8 +80,18 @@ This code does not require any compile-time links to \l QAccelerometer or \snippet sensors/start.cpp Starting a sensor -You can discover all of this information at runtime too. The sensor_explorer example -shows you information about available sensors. +You can discover all of this information at runtime too. + +\section1 Discovering Sensors And Reading Properties At Runtime + +Sometimes it may be that the available sensors are not known at development time. +It is possible to find out which sensors are available as illustrated below: + +\snippet sensors/start.cpp Find sensors + +Furthermore it is possible to discover the reading details for these sensors, as illustrated below: + +\snippet sensors/start.cpp Print reading properties \section1 Front End, Back End diff --git a/src/sensors/doc/src/qtsensors-tutorial.qdoc b/src/sensors/doc/src/qtsensors-tutorial.qdoc new file mode 100644 index 00000000..147b8504 --- /dev/null +++ b/src/sensors/doc/src/qtsensors-tutorial.qdoc @@ -0,0 +1,36 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +/*! + \page qtsensors-tutorial.html + \title How to create your own Sensor + \brief Steps for creating your own sensors + + The Qt Sensors module provides access to sensor hardware via QML and C++ + interfaces. + + The API is supported on \l{Qt for Android}{Android}, \l{Qt for iOS}{iOS}, and + \l {Qt for Windows}{Windows (MSVC)}. + + \section1 Creating your own sensor using C++ API + + Using a Qt module's C++ API requires linking against the module library, either + directly or through other dependencies. + \section2 Creating a sensor + + To create your own sensor you can use the following steps: + + \list + \li Create your own MySensor and MySensorReading classes + \snippet sensors/tutorial.cpp MySensor + \li Create a MySensorBackend by inheriting from QSensorBackend + \li Create MySensorBackendFactory factory class for instantiating that + backend by inheriting a class QSensorBackendFactory + \li Register the backend factory by calling + QSensorManager::registerBackend ("MySensorType", "MySensorId", &myfactory) + \li Instantiate the new MySensor and start using it + \endlist + + As an another option the sensors are put into a \l {Creating a sensor plugin} + that you can use on demand. +*/ diff --git a/src/sensors/doc/src/qtsensors.qdoc b/src/sensors/doc/src/qtsensors.qdoc index 8ff6c2e0..62959fbd 100644 --- a/src/sensors/doc/src/qtsensors.qdoc +++ b/src/sensors/doc/src/qtsensors.qdoc @@ -38,13 +38,13 @@ \li \l {Generic Backend} {Generic Backend} \li \l {Qt Sensors Backend} \li \l {Compatibility Map} {Compatibility Map} + \li \l {How to create your own Sensor} \endlist \section1 Examples \list \li \l {Qt Sensors Examples} {Examples} - \li \l {Qt Sensors - Grue Sensor Example} \endlist \section1 API Reference diff --git a/src/sensors/doc/src/sensor-examples.qdoc b/src/sensors/doc/src/sensor-examples.qdoc index a3d56ffe..8e8d8d75 100644 --- a/src/sensors/doc/src/sensor-examples.qdoc +++ b/src/sensors/doc/src/sensor-examples.qdoc @@ -5,7 +5,6 @@ \group qtsensors-examples \title Qt Sensors Examples \brief Examples for the Qt Sensors module - \ingroup all-examples These are the Qt Sensors examples. diff --git a/src/sensors/gestures/qsensorgesture.cpp b/src/sensors/gestures/qsensorgesture.cpp deleted file mode 100644 index dd1fdf80..00000000 --- a/src/sensors/gestures/qsensorgesture.cpp +++ /dev/null @@ -1,214 +0,0 @@ -// Copyright (C) 2019 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 <QDir> -#include <QPluginLoader> -#include <QDebug> - -#include "qsensorgesture.h" -#include "qsensorgesture_p.h" -#include "qsensorgesturemanager.h" - -#include <private/qmetaobjectbuilder_p.h> - -/*! - \class QSensorGesture - \ingroup sensorgestures_main - \inmodule QtSensors - \since 5.1 - - \brief The QSensorGesture class represents one or more sensor gesture recognizers. - - In addition to the QSensorGesture::detected() signal, Sensor Gesture Recognizers can - have their own specific signals, and may be discovered through - QSensorGesture::gestureSignals(). - - \b {Note that QSensorGesture uses a custom meta-object in order to provide - recognizer-specific signals. This means it is not possible to sub-class - QSensorGesture and use Q_OBJECT. Also qobject_cast<QSensorGesture*>(ptr) will - not work.} - - \sa QSensorGestureRecognizer - - You may use QSensorGestureManager to obtain the systems known sensor gesture ids. - - \sa QSensorGestureManager - */ - -/*! - \fn void QSensorGesture::detected(QString) - Signals when the gesture has been recognized. - */ - -/*! - Constructs the sensor gesture, and initializes the \a ids list of recognizers, - with parent \a parent - */ -QSensorGesture::QSensorGesture(const QStringList &ids, QObject *parent) : - QObject(parent) -{ - d_ptr = new QSensorGesturePrivate(); - for (const QString &id : ids) { - QSensorGestureRecognizer * rec = QSensorGestureManager::sensorGestureRecognizer(id); - if (rec != 0) { - d_ptr->m_sensorRecognizers.append(rec); - d_ptr->availableIds.append(id); - } else { - d_ptr->invalidIds.append(id); - //add to not available things - } - } - - d_ptr->meta = 0; - - QMetaObjectBuilder builder; - builder.setSuperClass(&QObject::staticMetaObject); - builder.setClassName("QSensorGesture"); - - for (QSensorGestureRecognizer *recognizer : d_ptr->m_sensorRecognizers) { - for (const QString &gesture : recognizer->gestureSignals()) { - QMetaMethodBuilder b = builder.addSignal(gesture.toLatin1()); - if (!d_ptr->localGestureSignals.contains(QLatin1String(b.signature()))) - d_ptr->localGestureSignals.append(QLatin1String(b.signature())); - } - recognizer->createBackend(); - } - d_ptr->meta = builder.toMetaObject(); - - if (d_ptr->m_sensorRecognizers.count() > 0) { - d_ptr->valid = true; - } -} - -/*! - Destroy the QSensorGesture - */ -QSensorGesture::~QSensorGesture() -{ - stopDetection(); - if (d_ptr->meta) - free(d_ptr->meta); - delete d_ptr; -} - -/*! - Returns the gesture recognizer ids that were found. - */ -QStringList QSensorGesture::validIds() const -{ - return d_ptr->availableIds; -} - -/*! - Returns the gesture recognizer ids that were not found. - */ -QStringList QSensorGesture::invalidIds() const -{ - return d_ptr->invalidIds; -} - -/*! - Starts the gesture detection routines in the recognizer. - */ -void QSensorGesture::startDetection() -{ - if (d_ptr->m_sensorRecognizers.count() < 1) - return; - if (d_ptr->isActive) - return; - - for (QSensorGestureRecognizer *recognizer : d_ptr->m_sensorRecognizers) { - - Q_ASSERT(recognizer !=0); - - connect(recognizer,SIGNAL(detected(QString)), - this,SIGNAL(detected(QString)),Qt::UniqueConnection); - - //connect recognizer signals - for (QString method : recognizer->gestureSignals()) { - method.prepend(QLatin1String("2")); - connect(recognizer, method.toLatin1(), - this, method.toLatin1(), Qt::UniqueConnection); - } - - recognizer->startBackend(); - } - d_ptr->isActive = true; -} - -/*! - Stops the gesture detection routines. - */ -void QSensorGesture::stopDetection() -{ - if (d_ptr->m_sensorRecognizers.count() < 1) - return; - - if (!d_ptr->isActive) - return; - - for (QSensorGestureRecognizer *recognizer : d_ptr->m_sensorRecognizers) { - disconnect(recognizer,SIGNAL(detected(QString)), - this,SIGNAL(detected(QString))); - //disconnect recognizer signals - for (QString method : recognizer->gestureSignals()) { - method.prepend(QLatin1String("2")); - disconnect(recognizer, method.toLatin1(), - this, method.toLatin1()); - } - - recognizer->stopBackend(); - } - d_ptr->isActive = false; -} - -/*! - Returns all the possible gestures signals that may be emitted. - */ -QStringList QSensorGesture::gestureSignals() const -{ - if (d_ptr->m_sensorRecognizers.count() > 0) { - return d_ptr->localGestureSignals; - } - return QStringList(); -} - -/*! - Returns whether this gesture is active or not. - */ - -bool QSensorGesture::isActive() -{ - return d_ptr->isActive; -} - -/*! - \internal -*/ -const QMetaObject* QSensorGesture::metaObject() const -{ - return d_ptr->meta; -} -/*! - \internal -*/ -int QSensorGesture::qt_metacall(QMetaObject::Call c, int id, void **a) -{ - id = QObject::qt_metacall(c, id, a); - - if (id < 0 || !d_ptr->meta) - return id; - - QMetaObject::activate(this, d_ptr->meta, id, a); - return id; -} - -QSensorGesturePrivate::QSensorGesturePrivate(QObject *parent) - : QObject(parent),isActive(0), valid(0) -{ -} - -QSensorGesturePrivate::~QSensorGesturePrivate() -{ - -} diff --git a/src/sensors/gestures/qsensorgesture.h b/src/sensors/gestures/qsensorgesture.h deleted file mode 100644 index 93282805..00000000 --- a/src/sensors/gestures/qsensorgesture.h +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (C) 2019 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 - -#ifndef QSENSORGESTURE_H -#define QSENSORGESTURE_H - -#include <QtCore/QObject> -#include <QtCore/QStringList> -#include <QtSensors/qsensorsglobal.h> - -#include <QtCore/QList> -#include <QtCore/QMap> - -#include <QtCore/qmetatype.h> - -QT_BEGIN_NAMESPACE - -class QSensorGesturePrivate; - -class Q_SENSORS_EXPORT QSensorGesture : public QObject -{ - //Do not use Q_OBJECT here -public: - explicit QSensorGesture(const QStringList &ids, QObject *parent = nullptr); - ~QSensorGesture(); - - bool isActive(); - - QStringList validIds() const; - QStringList invalidIds() const; - - QStringList gestureSignals() const; - - void startDetection(); - void stopDetection(); - - // Pretend to be a Q_OBJECT - const QMetaObject *metaObject() const override; - int qt_metacall(QMetaObject::Call, int, void **) override; - -private: - QSensorGesturePrivate * d_ptr; - -Q_SIGNALS: - // these signals are created at runtime, along with - // gesture recognizer specific signals. - void detected(QString); -}; - -QT_END_NAMESPACE - - -#endif // QSENSORGESTURE_H diff --git a/src/sensors/gestures/qsensorgesture_p.h b/src/sensors/gestures/qsensorgesture_p.h deleted file mode 100644 index 9794be66..00000000 --- a/src/sensors/gestures/qsensorgesture_p.h +++ /dev/null @@ -1,49 +0,0 @@ -// 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 - -#ifndef QSENSORGESTURE_P_H -#define QSENSORGESTURE_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of other Qt classes. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// -#include <QtSensors/QSensor> -#include <QtSensors/QAccelerometer> -#include <QtSensors/QAccelerometerFilter> -#include <QTimer> - -#include "qsensorgesture.h" -#include "qsensorgesturemanager.h" -#include <QtCore/private/qmetaobjectbuilder_p.h> - -QT_BEGIN_NAMESPACE - -class QSensorGesturePrivate : public QObject -{ - -public: - QSensorGesturePrivate(QObject *parent = 0); - ~QSensorGesturePrivate(); - - QList<QSensorGestureRecognizer *> m_sensorRecognizers; - - QByteArray metadata; - QMetaObject* meta; - bool isActive; - QStringList localGestureSignals; - QStringList availableIds; - QStringList invalidIds; - bool valid; -}; - - -QT_END_NAMESPACE - -#endif // QSENSORGESTURE_P_H diff --git a/src/sensors/gestures/qsensorgesturemanager.cpp b/src/sensors/gestures/qsensorgesturemanager.cpp deleted file mode 100644 index b754878f..00000000 --- a/src/sensors/gestures/qsensorgesturemanager.cpp +++ /dev/null @@ -1,102 +0,0 @@ -// 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 "qsensorgesturemanager.h" -#include "qsensorgesturemanagerprivate_p.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QSensorGestureManager - \ingroup sensorgestures_main - \inmodule QtSensors - \since 5.1 - - \brief The QSensorGestureManager class manages sensor gestures, registers and creates sensor gesture plugins. - - Sensor Gesture plugins register their recognizers using the registerSensorGestureRecognizer() function. - - \snippet sensorgestures/creating.cpp Receiving sensor gesture signals -*/ - -/*! - \fn QSensorGestureManager::newSensorGestureAvailable() - Signals when a new sensor gesture becomes available for use. - */ - -/*! - Constructs the QSensorGestureManager as a child of \a parent - */ -QSensorGestureManager::QSensorGestureManager(QObject *parent) - : QObject(parent) -{ - QSensorGestureManagerPrivate *d = QSensorGestureManagerPrivate::instance(); - if (!d) return; // hardly likely but just in case... - connect(d,SIGNAL(newSensorGestureAvailable()), - this,SIGNAL(newSensorGestureAvailable())); -} - -/*! - Destroy the QSensorGestureManager -*/ -QSensorGestureManager::~QSensorGestureManager() -{ -} - -/*! - Registers the sensor recognizer \a recognizer for use. - QSensorGestureManager retains ownership of the recognizer object. - Returns true unless the gesture has already been registered, in - which case the object is deleted. - - */ - - bool QSensorGestureManager::registerSensorGestureRecognizer(QSensorGestureRecognizer *recognizer) - { - QSensorGestureManagerPrivate *d = QSensorGestureManagerPrivate::instance(); - if (!d) { // hardly likely but just in case... - delete recognizer; - return false; - } - bool ok = d->registerSensorGestureRecognizer(recognizer); - if (!ok) - delete recognizer; - - return ok; - } - - - /*! - Returns the list of the currently registered gestures. - Includes all the standard built-ins as well as available plugins. - */ - QStringList QSensorGestureManager::gestureIds() const - { - QSensorGestureManagerPrivate *d = QSensorGestureManagerPrivate::instance(); - if (!d) return QStringList(); // hardly likely but just in case... - return d->gestureIds(); - } - - /*! - Returns the list of all the gesture signals for the registered \a gestureId gesture recognizer id. - */ - QStringList QSensorGestureManager::recognizerSignals(const QString &gestureId) const - { - QSensorGestureRecognizer *recognizer = sensorGestureRecognizer(gestureId); - if (recognizer != 0) - return recognizer->gestureSignals(); - else - return QStringList(); - } - -/*! - Returns the sensor gesture object for the recognizer \a id. - */ -QSensorGestureRecognizer *QSensorGestureManager::sensorGestureRecognizer(const QString &id) -{ - QSensorGestureManagerPrivate *d = QSensorGestureManagerPrivate::instance(); - if (!d) return 0; // hardly likely but just in case... - return d->sensorGestureRecognizer(id); -} - -QT_END_NAMESPACE diff --git a/src/sensors/gestures/qsensorgesturemanager.h b/src/sensors/gestures/qsensorgesturemanager.h deleted file mode 100644 index 948a63cb..00000000 --- a/src/sensors/gestures/qsensorgesturemanager.h +++ /dev/null @@ -1,41 +0,0 @@ -// 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 - -#ifndef QSENSORGESTUREMANAGER_P_H -#define QSENSORGESTUREMANAGER_P_H - -#include <QtCore/QObject> -#include <QtCore/QStringList> - -#include <QtSensors/qsensorgesture.h> -#include <QtSensors/qsensorgesturerecognizer.h> - -QT_BEGIN_NAMESPACE - -class QSensorGestureManagerPrivate; -class Q_SENSORS_EXPORT QSensorGestureManager : public QObject -{ - Q_OBJECT - Q_DECLARE_PRIVATE(QSensorGestureManager) - -public: - explicit QSensorGestureManager(QObject *parent = nullptr); - - ~QSensorGestureManager(); - - bool registerSensorGestureRecognizer(QSensorGestureRecognizer *recognizer); - - QStringList gestureIds() const; - QStringList recognizerSignals(const QString &recognizerId) const; - - static QSensorGestureRecognizer *sensorGestureRecognizer(const QString &id); - -Q_SIGNALS: - void newSensorGestureAvailable(); - -}; - - -QT_END_NAMESPACE - -#endif // QSENSORGESTUREMANAGER_P_H diff --git a/src/sensors/gestures/qsensorgesturemanagerprivate.cpp b/src/sensors/gestures/qsensorgesturemanagerprivate.cpp deleted file mode 100644 index d87823e2..00000000 --- a/src/sensors/gestures/qsensorgesturemanagerprivate.cpp +++ /dev/null @@ -1,143 +0,0 @@ -// 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 <QDir> -#include <QLibraryInfo> - -#include <QtCore/private/qfactoryloader_p.h> - -#include "qsensorgesturerecognizer.h" -#include "qsensorgesturemanagerprivate_p.h" -#include "qsensorgestureplugininterface.h" - -Q_GLOBAL_STATIC(QSensorGestureManagerPrivate, sensorGestureManagerPrivate) - -QT_BEGIN_NAMESPACE - -QSensorGestureManagerPrivate::QSensorGestureManagerPrivate(QObject *parent) : - QObject(parent) -{ - loader = new QFactoryLoader("org.qt-project.QSensorGesturePluginInterface", QLatin1String("/sensorgestures")); - loadPlugins(); -} - -QSensorGestureManagerPrivate::~QSensorGestureManagerPrivate() -{ -// qDeleteAll(registeredSensorGestures); -// delete loader; -} - - - void QSensorGestureManagerPrivate::initPlugin(QObject *plugin) -{ - if (QSensorGesturePluginInterface *pInterface - = qobject_cast<QSensorGesturePluginInterface *>(plugin)) { - for (const QString& id : pInterface->supportedIds()) { - if (!knownIds.contains(id)) - knownIds.append(id); - else - qWarning() << id <<"from the plugin" << pInterface->name() << "is already known."; - } - plugins << plugin; - } else { - qWarning() << "Could not load "<< plugin; - } -} - - -/*! - Internal - Loads the sensorgesture plugins. - */ -void QSensorGestureManagerPrivate::loadPlugins() -{ - for (QObject *plugin : QPluginLoader::staticInstances()) - initPlugin(plugin); - - QList<QPluginParsedMetaData> meta = loader->metaData(); - for (int i = 0; i < meta.count(); i++) { - QObject *plugin = loader->instance(i); - initPlugin(plugin); - } -} - - -/*! - Internal - creates the requested recognizer. - */ - -bool QSensorGestureManagerPrivate::loadRecognizer(const QString &recognizerId) -{ - //if no plugin is used return true if this is a registered recognizer - - if (registeredSensorGestures.contains(recognizerId)) - return true; - - for (int i= 0; i < plugins.count(); i++) { - - if (QSensorGesturePluginInterface *pInterface - = qobject_cast<QSensorGesturePluginInterface *>(plugins.at(i))) { - - if (pInterface->supportedIds().contains(recognizerId)) { - - if (!registeredSensorGestures.contains(recognizerId)) { - //create these recognizers - QList <QSensorGestureRecognizer *> recognizers = pInterface->createRecognizers(); - - for (QSensorGestureRecognizer *recognizer : recognizers) { - if (registeredSensorGestures.contains(recognizer->id())) { - qWarning() << "Ignoring recognizer " << recognizer->id() << "from plugin" << pInterface->name() << "because it is already registered"; - delete recognizer; - } else { - registeredSensorGestures.insert(recognizer->id(),recognizer); - } - } - } - return true; - } - } - } - return false; -} - -bool QSensorGestureManagerPrivate::registerSensorGestureRecognizer(QSensorGestureRecognizer *recognizer) -{ - if (!knownIds.contains(recognizer->id())) { - knownIds.append(recognizer->id()); - Q_ASSERT (!registeredSensorGestures.contains(recognizer->id())); - recognizer->setParent(0); - registeredSensorGestures.insert(recognizer->id(),recognizer); - Q_EMIT newSensorGestureAvailable(); - - return true; - } - return false; -} - -QSensorGestureRecognizer *QSensorGestureManagerPrivate::sensorGestureRecognizer(const QString &id) -{ - QSensorGestureRecognizer *recognizer = 0; - - if (loadRecognizer(id)) { - recognizer= registeredSensorGestures.value(id); - } - - return recognizer; -} - -QStringList QSensorGestureManagerPrivate::gestureIds() -{ - return knownIds; -} - -QSensorGestureManagerPrivate * QSensorGestureManagerPrivate::instance() -{ - QSensorGestureManagerPrivate *priv = sensorGestureManagerPrivate(); - // It's safe to return 0 because this is checked when used - //if (!priv) qFatal("Cannot return from QSensorGestureManagerPrivate::instance() because sensorGestureManagerPrivate() returned 0."); - return priv; -} - - -QT_END_NAMESPACE diff --git a/src/sensors/gestures/qsensorgesturemanagerprivate_p.h b/src/sensors/gestures/qsensorgesturemanagerprivate_p.h deleted file mode 100644 index 2a62d5f7..00000000 --- a/src/sensors/gestures/qsensorgesturemanagerprivate_p.h +++ /dev/null @@ -1,62 +0,0 @@ -// 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 - -#ifndef QSENSORGESTUREMANAGERPRIVATE_P_H -#define QSENSORGESTUREMANAGERPRIVATE_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 <QObject> -#include <QMap> -#include <QStringList> -#include <QDebug> -#include <QSharedPointer> -#include <QPluginLoader> - -#include "qsensorgesture.h" -#include "qsensorgesturerecognizer.h" -#include "private/qglobal_p.h" - -QT_BEGIN_NAMESPACE - -class QFactoryLoader; - -class QSensorGestureManagerPrivate : public QObject -{ - Q_OBJECT -public: - explicit QSensorGestureManagerPrivate(QObject *parent = 0); - ~QSensorGestureManagerPrivate(); - - QMap<QString, QSensorGestureRecognizer *> registeredSensorGestures; - - QList <QObject *> plugins; - - QFactoryLoader *loader; - void loadPlugins(); - bool loadRecognizer(const QString &id); - - QSensorGestureRecognizer *sensorGestureRecognizer(const QString &id); - - bool registerSensorGestureRecognizer(QSensorGestureRecognizer *recognizer); - QStringList gestureIds(); - QStringList knownIds; - void initPlugin(QObject *o); - - static QSensorGestureManagerPrivate * instance(); -Q_SIGNALS: - void newSensorGestureAvailable(); -}; - -QT_END_NAMESPACE - -#endif // QSENSORGESTUREMANAGERPRIVATE_P_H diff --git a/src/sensors/gestures/qsensorgestureplugininterface.cpp b/src/sensors/gestures/qsensorgestureplugininterface.cpp deleted file mode 100644 index c9e54f77..00000000 --- a/src/sensors/gestures/qsensorgestureplugininterface.cpp +++ /dev/null @@ -1,61 +0,0 @@ -// 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 "qsensorgestureplugininterface.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QSensorGesturePluginInterface - \ingroup sensorgestures_recognizer - \inmodule QtSensors - - \brief The QSensorGesturePluginInterface class is the pure virtual interface to sensor gesture - plugins. - - \since 5.1 - - The QSensorGesturePluginInterface class is implemented in sensor gesture plugins to register - sensor gesture recognizers with QSensorGestureManager. - - \sa {QtSensorGestures Plugins} -*/ - -/*! - \fn QSensorGesturePluginInterface::createRecognizers() - - Called by the manager to create the recognizers. - Plugins should initialize and register their recognizers using - QSensorGestureManager::registerSensorGestureRecognizer() here. - - \sa QSensorGestureManager -*/ - -/*! - \fn QSensorGesturePluginInterface::supportedIds() const - - Returns a list of the recognizer Id's that this plugin supports. - */ - - -/*! - \fn QSensorGesturePluginInterface::name() const - - Returns this plugins name. - */ - -/*! - Construct the QSensorGesturePluginInterface. -*/ -QSensorGesturePluginInterface::QSensorGesturePluginInterface() -{ -} - -/*! - Destroy the QSensorGesturePluginInterface. -*/ -QSensorGesturePluginInterface::~QSensorGesturePluginInterface() -{ -} - -QT_END_NAMESPACE diff --git a/src/sensors/gestures/qsensorgestureplugininterface.h b/src/sensors/gestures/qsensorgestureplugininterface.h deleted file mode 100644 index fa98385d..00000000 --- a/src/sensors/gestures/qsensorgestureplugininterface.h +++ /dev/null @@ -1,31 +0,0 @@ -// 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 - -#ifndef QSENSORGESTUREPLUGININTERFACE_H -#define QSENSORGESTUREPLUGININTERFACE_H - -#include <QtCore/QObject> -#include <QtCore/QtGlobal> -#include <QtCore/qplugin.h> -#include <QtSensors/qsensorgesture.h> -#include <QtSensors/qsensorgesturerecognizer.h> - -QT_BEGIN_NAMESPACE - -class QSensorGestureRecognizer; - -class Q_SENSORS_EXPORT QSensorGesturePluginInterface -{ -public: - QSensorGesturePluginInterface(); - virtual ~QSensorGesturePluginInterface(); - virtual QList <QSensorGestureRecognizer *> createRecognizers() = 0; - virtual QStringList supportedIds() const = 0; - virtual QString name() const = 0; -}; - -Q_DECLARE_INTERFACE(QSensorGesturePluginInterface, "org.qt-project.QSensorGesturePluginInterface") - -QT_END_NAMESPACE - -#endif // QSENSORGESTUREPLUGININTERFACE_H diff --git a/src/sensors/gestures/qsensorgesturerecognizer.cpp b/src/sensors/gestures/qsensorgesturerecognizer.cpp deleted file mode 100644 index eb5dc32b..00000000 --- a/src/sensors/gestures/qsensorgesturerecognizer.cpp +++ /dev/null @@ -1,171 +0,0 @@ -// Copyright (C) 2019 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 "qsensorgesturerecognizer.h" -#include "qsensorgesture_p.h" -#include "qsensorgesturemanager.h" - -QT_BEGIN_NAMESPACE - -/*! - \class QSensorGestureRecognizer - \ingroup sensorgestures_recognizer - \inmodule QtSensors - \since 5.1 - - \brief The QSensorGestureRecognizer class is the base class for a sensor gesture - recognizer. - - QSensorGesture recognizer developers should sub-class this to implement their own recognizer. - - All sensor gesture recognizers have a detected(QString) signal. Implementors can use this - and send recognizer specific gestures, such as detected("shake_left") or implement custom signals - such as shakeLeft(). - - These custom signals will be available in the QSensorGesture object at runtime. - - \sa QSensorGestureRecognizer::gestureSignals() - - */ - -/*! - \fn void QSensorGestureRecognizer::create() - - Called by QSensorGesture object constructor to create the recognizers backend. - - Implementors would use this to instantiate QSensors and connect signals. - - */ - -/*! - \fn QString QSensorGestureRecognizer::id() const - Returns the identifier for this recognizer. - */ -/*! - \fn bool QSensorGestureRecognizer::start() - - Called by QSensorGesture::startDetection() to start this recognizer. - Implementors should start the sensors. - Returns true if the operation is successful. - - */ -/*! - \fn bool QSensorGestureRecognizer::stop() - - Called by QSensorGesture::stopDetection() to stop this recognizer. - Returns true if the call succeeds, otherwise false. - - Implementors should stop the sensors. - - */ -/*! - \fn bool QSensorGestureRecognizer::isActive() - - Returns true if this recognizer is active, otherwise false. - */ - -/*! - \fn QSensorGestureRecognizer::detected(const QString &) - Signals when a gesture is recognized. Implementors can use this signal to send - recognizer-specific gestures, such as \c detected("shake_left") or implement - custom signals such as \c shakeLeft(). - - The custom signals are available in the QSensorGesture object at runtime. - */ - -class QSensorGestureRecognizerPrivate -{ -public: - bool initialized; - int count; -}; - - -/*! - Constructs the QSensorGestureRecognizer with \a parent as parent. - */ -QSensorGestureRecognizer::QSensorGestureRecognizer(QObject *parent) - :QObject(parent), - d_ptr(new QSensorGestureRecognizerPrivate()) -{ -} - -/*! - Destroy the QSensorGestureRecognizer -*/ -QSensorGestureRecognizer::~QSensorGestureRecognizer() -{ - delete d_ptr; -} - -/*! - Returns a list of signals that this recognizer supports. - - Note that all signals declared will be exported to the QSensorGesture - object. If you need to use signals that are not exported, you should use a private class - to do so. - - */ -QStringList QSensorGestureRecognizer::gestureSignals() const -{ - QStringList list; - bool ok = false; - for (int i = 0; i < this->metaObject()->methodCount(); i++) { - //weed out objectsignals and slots - const QByteArray sig(this->metaObject()->method(i).methodSignature()); - if (this->metaObject()->indexOfSignal(sig) != -1) { - if (sig.contains("detected")) - ok = true; - if (ok) - list.append(QString::fromLatin1(sig)); - } - } - return list; -} - -/*! - Calls QSensorGestureRecognizer::create() if the recognizer is valid. -*/ -void QSensorGestureRecognizer::createBackend() -{ - if (d_ptr->initialized) { - return; - } - d_ptr->initialized = true; - create(); -} - -/*! - Calls QSensorGestureRecognizer::start() if the recognizer isn't already initialized. - This is called by the QSensorGesture object, so please use that instead. - -\sa QSensorGesture::startDetection() - -*/ -void QSensorGestureRecognizer::startBackend() -{ - if (!d_ptr->initialized) { - qWarning() << "Not starting. Gesture Recognizer not initialized"; - return; - } - if (d_ptr->count++ == 0) - start(); -} - -/*! - Calls QSensorGestureRecognizer::stop() if no other clients are using it. - This is called by the QSensorGesture object, so please use that instead. - -\sa QSensorGesture::stopDetection() -*/ -void QSensorGestureRecognizer::stopBackend() -{ - if (!d_ptr->initialized) { - qWarning() << "Not stopping. Gesture Recognizer not initialized"; - return; - } - if (--d_ptr->count == 0) - stop(); -} - -QT_END_NAMESPACE diff --git a/src/sensors/gestures/qsensorgesturerecognizer.h b/src/sensors/gestures/qsensorgesturerecognizer.h deleted file mode 100644 index 1d5a6513..00000000 --- a/src/sensors/gestures/qsensorgesturerecognizer.h +++ /dev/null @@ -1,47 +0,0 @@ -// 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 - -#ifndef QSENSORGESTURERECOGNIZER_H -#define QSENSORGESTURERECOGNIZER_H - -#include <QtCore/QDebug> -#include <QtCore/QTimer> -#include <QtCore/QStringList> - -#include <QtSensors/qsensorgesture.h> - -QT_BEGIN_NAMESPACE - -class QSensorGestureRecognizerPrivate; -class Q_SENSORS_EXPORT QSensorGestureRecognizer : public QObject -{ - Q_OBJECT -public: - explicit QSensorGestureRecognizer(QObject *parent = nullptr); - virtual ~QSensorGestureRecognizer(); - - virtual QString id() const = 0; - - virtual bool isActive() = 0; - - void startBackend(); - void stopBackend(); - void createBackend(); - - QStringList gestureSignals() const; - -Q_SIGNALS: - void detected(const QString &); - -protected: - virtual void create() = 0; - virtual bool start() = 0; - virtual bool stop() = 0; - -private: - QSensorGestureRecognizerPrivate * d_ptr; -}; - -QT_END_NAMESPACE - -#endif // QSENSORGESTURERECOGNIZER_H diff --git a/src/sensors/make_sensor.pl b/src/sensors/make_sensor.pl index c314c1bd..74213f09 100755 --- a/src/sensors/make_sensor.pl +++ b/src/sensors/make_sensor.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # Copyright (C) 2021 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 +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 # About this script # @@ -82,7 +82,7 @@ QT_BEGIN_NAMESPACE class '.$sensor.'; -class Q_SENSORSQUICK_PRIVATE_EXPORT '.$qmlsensor.' : public QmlSensor +class Q_SENSORSQUICK_EXPORT '.$qmlsensor.' : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT('.$no_q_sensor.') @@ -99,7 +99,7 @@ private: '.$sensor.' *m_sensor; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT '.$qmlreading.' : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT '.$qmlreading.' : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal myprop READ myprop NOTIFY mypropChanged BINDABLE bindableMyprop) diff --git a/src/sensors/qsensor.cpp b/src/sensors/qsensor.cpp index 839f7959..72c58fe8 100644 --- a/src/sensors/qsensor.cpp +++ b/src/sensors/qsensor.cpp @@ -244,7 +244,7 @@ void QSensorPrivate::init(const QByteArray &sensorType) Only use this constructor if there is no derived sensor class available. Note that all built-in sensors have a derived class, so using this constructor should only be necessary - when implementing custom sensors, like in the \l {Qt Sensors - Grue Sensor Example}{Grue sensor example}. + when implementing custom sensors. */ QSensor::QSensor(const QByteArray &type, QObject *parent) : QObject(*new QSensorPrivate, parent) @@ -527,9 +527,6 @@ void QSensor::setSkipDuplicates(bool skipDuplicates) continuous range of rates. A discrete rate is noted by having both values the same. - See the sensor_explorer example for an example of how to interpret and use - this information. - Note that this information is not mandatory as not all sensors have a rate at which they run. In such cases, the list will be empty. @@ -814,7 +811,7 @@ void QSensor::setOutputRange(int index) return; } bool warn = true; - if (index >= 0 && index < d->outputRanges.count()) { + if (index >= 0 && index < d->outputRanges.size()) { warn = false; d->outputRange = index; } diff --git a/src/sensors/qsensormanager.cpp b/src/sensors/qsensormanager.cpp index 7cdc1b24..8ce509f4 100644 --- a/src/sensors/qsensormanager.cpp +++ b/src/sensors/qsensormanager.cpp @@ -89,7 +89,7 @@ public: //read out setting line line.remove(QLatin1String(" ")); QStringList pair = line.split(QStringLiteral("=")); - if (pair.count() == 2) + if (pair.size() == 2) defaultIdentifierForType.insert(pair[0].toLatin1(), pair[1].toLatin1()); } } @@ -183,7 +183,7 @@ void QSensorManagerPrivate::loadPlugins() if (d->loadExternalPlugins) { SENSORLOG() << "initializing plugins"; QList<QPluginParsedMetaData> meta = d->loader->metaData(); - for (int i = 0; i < meta.count(); i++) { + for (qsizetype i = 0; i < meta.size(); i++) { QObject *plugin = d->loader->instance(i); initPlugin(plugin); } @@ -271,7 +271,7 @@ void QSensorManager::unregisterBackend(const QByteArray &type, const QByteArray (void)factoryByIdentifier.take(identifier); // we don't own this pointer anyway if (d->firstIdentifierForType[type] == identifier) { - if (factoryByIdentifier.count()) { + if (factoryByIdentifier.size()) { d->firstIdentifierForType[type] = factoryByIdentifier.begin().key(); if (d->firstIdentifierForType[type].startsWith("generic.")) { // Don't let a generic backend be the default when some other backend exists! @@ -287,7 +287,7 @@ void QSensorManager::unregisterBackend(const QByteArray &type, const QByteArray (void)d->firstIdentifierForType.take(type); } } - if (!factoryByIdentifier.count()) + if (!factoryByIdentifier.size()) (void)d->backendsByType.take(type); // Notify the app that the available sensor list has changed. diff --git a/src/sensorsquick/CMakeLists.txt b/src/sensorsquick/CMakeLists.txt index d9a6fb5e..b8ae9f57 100644 --- a/src/sensorsquick/CMakeLists.txt +++ b/src/sensorsquick/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause qt_internal_add_qml_module(SensorsQuick URI "QtSensors" @@ -20,7 +20,6 @@ qt_internal_add_qml_module(SensorsQuick qmlproximitysensor.cpp qmlproximitysensor_p.h qmlrotationsensor.cpp qmlrotationsensor_p.h qmlsensor.cpp qmlsensor_p.h - # qmlsensorgesture.cpp qmlsensorgesture_p.h qmlsensorglobal.cpp qmlsensorglobal_p.h qmlsensorrange.cpp qmlsensorrange_p.h qmltapsensor.cpp qmltapsensor_p.h @@ -37,5 +36,4 @@ qt_internal_add_qml_module(SensorsQuick LIBRARIES Qt::CorePrivate GENERATE_CPP_EXPORTS - GENERATE_PRIVATE_CPP_EXPORTS ) diff --git a/src/sensorsquick/qmlaccelerometer_p.h b/src/sensorsquick/qmlaccelerometer_p.h index 862aadde..aae90879 100644 --- a/src/sensorsquick/qmlaccelerometer_p.h +++ b/src/sensorsquick/qmlaccelerometer_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE class QAccelerometer; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAccelerometer : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlAccelerometer : public QmlSensor { Q_OBJECT Q_PROPERTY(AccelerationMode accelerationMode READ accelerationMode WRITE setAccelerationMode @@ -53,7 +53,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAccelerometerReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlAccelerometerReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal x READ x NOTIFY xChanged BINDABLE bindableX) diff --git a/src/sensorsquick/qmlambientlightsensor_p.h b/src/sensorsquick/qmlambientlightsensor_p.h index 5c41f56b..83bcd60c 100644 --- a/src/sensorsquick/qmlambientlightsensor_p.h +++ b/src/sensorsquick/qmlambientlightsensor_p.h @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE class QAmbientLightSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAmbientLightSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlAmbientLightSensor : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(AmbientLightSensor) @@ -39,7 +39,7 @@ private: }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAmbientLightSensorReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlAmbientLightSensorReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(QAmbientLightReading::LightLevel lightLevel READ lightLevel diff --git a/src/sensorsquick/qmlambienttemperaturesensor_p.h b/src/sensorsquick/qmlambienttemperaturesensor_p.h index 9d17983a..898c0617 100644 --- a/src/sensorsquick/qmlambienttemperaturesensor_p.h +++ b/src/sensorsquick/qmlambienttemperaturesensor_p.h @@ -20,7 +20,7 @@ QT_BEGIN_NAMESPACE class QAmbientTemperatureSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAmbientTemperatureSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlAmbientTemperatureSensor : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(AmbientTemperatureSensor) @@ -37,7 +37,7 @@ private: QAmbientTemperatureSensor *m_sensor; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAmbientTemperatureReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlAmbientTemperatureReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal temperature READ temperature diff --git a/src/sensorsquick/qmlcompass_p.h b/src/sensorsquick/qmlcompass_p.h index 77f401ef..312bf13c 100644 --- a/src/sensorsquick/qmlcompass_p.h +++ b/src/sensorsquick/qmlcompass_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE class QCompass; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlCompass : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlCompass : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(Compass) @@ -37,7 +37,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlCompassReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlCompassReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal azimuth READ azimuth NOTIFY azimuthChanged BINDABLE bindableAzimuth) diff --git a/src/sensorsquick/qmlgyroscope_p.h b/src/sensorsquick/qmlgyroscope_p.h index b4e508cf..02697718 100644 --- a/src/sensorsquick/qmlgyroscope_p.h +++ b/src/sensorsquick/qmlgyroscope_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE class QGyroscope; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlGyroscope : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlGyroscope : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(Gyroscope) @@ -37,7 +37,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlGyroscopeReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlGyroscopeReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal x READ x NOTIFY xChanged BINDABLE bindableX) diff --git a/src/sensorsquick/qmlhumiditysensor_p.h b/src/sensorsquick/qmlhumiditysensor_p.h index c4f57152..e01b0dc3 100644 --- a/src/sensorsquick/qmlhumiditysensor_p.h +++ b/src/sensorsquick/qmlhumiditysensor_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE class QHumiditySensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlHumiditySensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlHumiditySensor : public QmlSensor { Q_OBJECT @@ -39,7 +39,7 @@ private: QHumiditySensor *m_sensor; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlHumidityReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlHumidityReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal relativeHumidity READ relativeHumidity diff --git a/src/sensorsquick/qmlirproximitysensor_p.h b/src/sensorsquick/qmlirproximitysensor_p.h index 5684641e..b1f97d5d 100644 --- a/src/sensorsquick/qmlirproximitysensor_p.h +++ b/src/sensorsquick/qmlirproximitysensor_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE class QIRProximitySensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlIRProximitySensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlIRProximitySensor : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(IRProximitySensor) @@ -37,7 +37,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlIRProximitySensorReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlIRProximitySensorReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal reflectance READ reflectance diff --git a/src/sensorsquick/qmllidsensor_p.h b/src/sensorsquick/qmllidsensor_p.h index 2453ac43..1ddf60a9 100644 --- a/src/sensorsquick/qmllidsensor_p.h +++ b/src/sensorsquick/qmllidsensor_p.h @@ -20,7 +20,7 @@ QT_BEGIN_NAMESPACE class QLidSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlLidSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlLidSensor : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(LidSensor) @@ -37,7 +37,7 @@ private: QLidSensor *m_sensor; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlLidReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlLidReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(bool backLidClosed READ backLidClosed diff --git a/src/sensorsquick/qmllightsensor_p.h b/src/sensorsquick/qmllightsensor_p.h index b9c27fb6..6758ffba 100644 --- a/src/sensorsquick/qmllightsensor_p.h +++ b/src/sensorsquick/qmllightsensor_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE class QLightSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlLightSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlLightSensor : public QmlSensor { Q_OBJECT Q_PROPERTY(qreal fieldOfView READ fieldOfView NOTIFY fieldOfViewChanged) @@ -42,7 +42,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlLightSensorReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlLightSensorReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal illuminance READ illuminance diff --git a/src/sensorsquick/qmlmagnetometer_p.h b/src/sensorsquick/qmlmagnetometer_p.h index ffd65825..9080f3e7 100644 --- a/src/sensorsquick/qmlmagnetometer_p.h +++ b/src/sensorsquick/qmlmagnetometer_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE class QMagnetometer; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlMagnetometer : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlMagnetometer : public QmlSensor { Q_OBJECT Q_PROPERTY(bool returnGeoValues READ returnGeoValues WRITE setReturnGeoValues NOTIFY returnGeoValuesChanged) @@ -44,7 +44,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlMagnetometerReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlMagnetometerReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal x READ x NOTIFY xChanged BINDABLE bindableX) diff --git a/src/sensorsquick/qmlorientationsensor_p.h b/src/sensorsquick/qmlorientationsensor_p.h index 3097c448..9be7b7e5 100644 --- a/src/sensorsquick/qmlorientationsensor_p.h +++ b/src/sensorsquick/qmlorientationsensor_p.h @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE class QOrientationSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlOrientationSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlOrientationSensor : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(OrientationSensor) @@ -38,7 +38,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlOrientationSensorReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlOrientationSensorReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(QOrientationReading::Orientation orientation READ orientation diff --git a/src/sensorsquick/qmlpressuresensor_p.h b/src/sensorsquick/qmlpressuresensor_p.h index 5c94cf47..8b531fba 100644 --- a/src/sensorsquick/qmlpressuresensor_p.h +++ b/src/sensorsquick/qmlpressuresensor_p.h @@ -20,7 +20,7 @@ QT_BEGIN_NAMESPACE class QPressureSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlPressureSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlPressureSensor : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(PressureSensor) @@ -37,7 +37,7 @@ private: QPressureSensor *m_sensor; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlPressureReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlPressureReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal pressure READ pressure NOTIFY pressureChanged BINDABLE bindablePressure) diff --git a/src/sensorsquick/qmlproximitysensor_p.h b/src/sensorsquick/qmlproximitysensor_p.h index 570d24c5..8ce4fdb8 100644 --- a/src/sensorsquick/qmlproximitysensor_p.h +++ b/src/sensorsquick/qmlproximitysensor_p.h @@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE class QProximitySensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlProximitySensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlProximitySensor : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(ProximitySensor) @@ -39,7 +39,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlProximitySensorReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlProximitySensorReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(bool near READ near NOTIFY nearChanged BINDABLE bindableNear) diff --git a/src/sensorsquick/qmlrotationsensor_p.h b/src/sensorsquick/qmlrotationsensor_p.h index 6699ec17..1ef008b8 100644 --- a/src/sensorsquick/qmlrotationsensor_p.h +++ b/src/sensorsquick/qmlrotationsensor_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE class QRotationSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlRotationSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlRotationSensor : public QmlSensor { Q_OBJECT Q_PROPERTY(bool hasZ READ hasZ NOTIFY hasZChanged) @@ -42,7 +42,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlRotationSensorReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlRotationSensorReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal x READ x NOTIFY xChanged BINDABLE bindableX) diff --git a/src/sensorsquick/qmlsensor.cpp b/src/sensorsquick/qmlsensor.cpp index eb64f2ec..d507e919 100644 --- a/src/sensorsquick/qmlsensor.cpp +++ b/src/sensorsquick/qmlsensor.cpp @@ -20,7 +20,7 @@ public: template<typename Item> qsizetype readonlyListCount(QQmlListProperty<Item> *p) { - return static_cast<const QList<Item *> *>(p->data)->count(); + return static_cast<const QList<Item *> *>(p->data)->size(); } template<typename Item> @@ -277,6 +277,21 @@ QBindable<QmlSensorReading*> QmlSensor::bindableReading() const } /*! + \qmlmethod bool Sensor::isFeatureSupported(feature) + \since QtSensors 6.7 + Checks if a specific feature is supported by the backend. + Returns \c true if the \a feature is supported, and \c false otherwise. + For feature descriptions see \l {QSensor::Feature}. + + Please see QSensor::isFeatureSupported for information. +*/ + +bool QmlSensor::isFeatureSupported(Feature feature) const +{ + return sensor()->isFeatureSupported(static_cast<QSensor::Feature>(feature)); +} + +/*! \qmlproperty Sensor::AxesOrientationMode Sensor::axesOrientationMode \since QtSensors 5.1 This property holds the mode that affects how the screen orientation changes reading values. @@ -453,9 +468,9 @@ void QmlSensor::componentComplete() // meta-data should become non-empty if (!description().isEmpty()) Q_EMIT descriptionChanged(); - if (available.count()) + if (available.size()) Q_EMIT availableDataRatesChanged(); - if (output.count()) + if (output.size()) Q_EMIT outputRangesChanged(); connect(sensor(), SIGNAL(readingChanged()), this, SLOT(updateReading())); diff --git a/src/sensorsquick/qmlsensor_p.h b/src/sensorsquick/qmlsensor_p.h index 6e1460a4..d08d797f 100644 --- a/src/sensorsquick/qmlsensor_p.h +++ b/src/sensorsquick/qmlsensor_p.h @@ -22,6 +22,8 @@ #include <QQmlParserStatus> #include <QtQml/qqml.h> #include <QQmlListProperty> +#include <QtSensors/QSensor> + #include "qmlsensorrange_p.h" QT_BEGIN_NAMESPACE @@ -32,7 +34,7 @@ class QSensorReading; class QmlSensorReading; class QmlSensorPrivate; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensor : public QObject, public QQmlParserStatus +class Q_SENSORSQUICK_EXPORT QmlSensor : public QObject, public QQmlParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QmlSensor) @@ -62,6 +64,19 @@ class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensor : public QObject, public QQmlParse QML_UNCREATABLE("Cannot create Sensor") QML_ADDED_IN_VERSION(5,0) public: + // Keep in sync with QSensor::Feature + enum Feature : int { + Buffering = QSensor::Buffering, + AlwaysOn = QSensor::AlwaysOn, + GeoValues = QSensor::GeoValues, + FieldOfView = QSensor::FieldOfView, + AccelerationMode = QSensor::AccelerationMode, + SkipDuplicates = QSensor::SkipDuplicates, + AxesOrientation = QSensor::AxesOrientation, + PressureSensorTemperature = QSensor::PressureSensorTemperature + }; + Q_ENUM(Feature) + // Keep in sync with QSensor::AxesOrientationMode enum AxesOrientationMode { FixedOrientation, @@ -105,6 +120,8 @@ public: QmlSensorReading *reading() const; QBindable<QmlSensorReading*> bindableReading() const; + Q_INVOKABLE Q_REVISION(6, 7) bool isFeatureSupported(Feature feature) const; + AxesOrientationMode axesOrientationMode() const; void setAxesOrientationMode(AxesOrientationMode axesOrientationMode); @@ -163,7 +180,7 @@ private: m_reading, nullptr) }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensorReading : public QObject +class Q_SENSORSQUICK_EXPORT QmlSensorReading : public QObject { Q_OBJECT Q_PROPERTY(quint64 timestamp READ timestamp NOTIFY timestampChanged BINDABLE bindableTimestamp) diff --git a/src/sensorsquick/qmlsensorgesture.cpp b/src/sensorsquick/qmlsensorgesture.cpp deleted file mode 100644 index 518280f9..00000000 --- a/src/sensorsquick/qmlsensorgesture.cpp +++ /dev/null @@ -1,226 +0,0 @@ -// 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 "qmlsensorgesture_p.h" -#include <QtSensors/qsensorgesture.h> -#include <QtSensors/qsensorgesturemanager.h> - -QT_BEGIN_NAMESPACE - -/*! - \qmltype SensorGesture - \instantiates QmlSensorGesture - \inqmlmodule QtSensors - \since QtSensors 5.0 - \brief Provides notifications when sensor-based gestures are detected. - - This type provides notification when sensor gestures are triggered. - - The following QML code creates a "shake" and "SecondCounter" SensorGesture QML type, and - displays the detected gesture in a text type. - - QtSensors.shake gesture is available with the Qt Sensors API, but the QtSensors.SecondCounter - sensor gesture is provided as example code for the \l {Qt Sensors - SensorGesture QML Type Example} - - \qml - Item { - SensorGesture { - id: sensorGesture - enabled: false - gestures : ["QtSensors.shake", "QtSensors.SecondCounter"] - onDetected:{ - detectedText.text = gesture - } - } - Text { - id: detectedText - x:5 - y:160 - } - } - \endqml - - \l {Qt Sensor Gestures} contains a list of currently supported sensor gestures and their - descriptions. - - -*/ -QmlSensorGesture::QmlSensorGesture(QObject* parent) - : QObject(parent) - , isEnabled(false) - , initDone(false) - , sensorGesture(0) - , sensorGestureManager(new QSensorGestureManager(this)) -{ - connect(sensorGestureManager, SIGNAL(newSensorGestureAvailable()), SIGNAL(availableGesturesChanged())); -} - -QmlSensorGesture::~QmlSensorGesture() -{ -} - -/* - QQmlParserStatus interface implementation -*/ -void QmlSensorGesture::classBegin() -{ -} - -void QmlSensorGesture::componentComplete() -{ - /* - this is needed in the case the customer defines the type(s) and set it enabled = true - */ - initDone = true; - setEnabled(isEnabled); -} -/* - End of QQmlParserStatus interface implementation -*/ - -/*! - \qmlproperty stringlist SensorGesture::availableGestures - This property can be used to determine all available gestures on the system. -*/ -QStringList QmlSensorGesture::availableGestures() -{ - return sensorGestureManager->gestureIds(); -} - -/*! - \qmlproperty stringlist SensorGesture::gestures - Set this property to a list of the gestures that the application is interested in detecting. - This property cannot be changed while the type is enabled. - - The properties validGestures and invalidGestures will be set as appropriate immediately. - To determine all available getures on the system please use the - \l {SensorGesture::availableGestures} {availableGestures} property. - - \sa {QtSensorGestures Plugins} -*/ -QStringList QmlSensorGesture::gestures() const -{ - return gestureList; -} - -void QmlSensorGesture::setGestures(const QStringList& value) -{ - if (gestureList == value) - return; - - if (initDone && enabled()) { - qWarning() << "Cannot change gestures while running."; - return; - } - gestureList = value; - createGesture(); - Q_EMIT gesturesChanged(); -} - - -/*! - \qmlproperty stringlist SensorGesture::validGestures - This property holds the requested gestures that were found on the system. -*/ -QStringList QmlSensorGesture::validGestures() const -{ - if (sensorGesture) - return sensorGesture->validIds(); - return QStringList(); -} - -/*! - \qmlproperty stringlist SensorGesture::invalidGestures - This property holds the requested gestures that were not found on the system. -*/ -QStringList QmlSensorGesture::invalidGestures() const -{ - if (sensorGesture) - return sensorGesture->invalidIds(); - return QStringList(); -} - -/*! - \qmlproperty bool SensorGesture::enabled - This property can be used to activate or deactivate the sensor gesture. - Default value is false; - \sa {SensorGesture::detected}, {detected} -*/ -bool QmlSensorGesture::enabled() const -{ - return isEnabled; -} - -void QmlSensorGesture::setEnabled(bool value) -{ - bool hasChanged = false; - if (isEnabled != value) { - isEnabled = value; - hasChanged = true; - } - if (!initDone) - return; - - if (sensorGesture) { - if (value) { - sensorGesture->startDetection(); - } else { - sensorGesture->stopDetection(); - } - } - if (hasChanged) - Q_EMIT enabledChanged(); -} - -/*! - \qmlsignal SensorGesture::detected(string gesture) - This signal is emitted whenever a gesture is detected. - The \a gesture parameter contains the gesture that was detected. - - The corresponding handler is \c onDetected. -*/ - -/* - private function implementation -*/ -void QmlSensorGesture::deleteGesture() -{ - if (sensorGesture) { - bool emitInvalidChange = !invalidGestures().isEmpty(); - bool emitValidChange = !validGestures().isEmpty(); - - if (sensorGesture->isActive()) { - sensorGesture->stopDetection(); - } - delete sensorGesture; - sensorGesture = 0; - - if (emitInvalidChange) { - Q_EMIT invalidGesturesChanged(); - } - if (emitValidChange) { - Q_EMIT validGesturesChanged(); - } - } -} - -void QmlSensorGesture::createGesture() -{ - deleteGesture(); - sensorGesture = new QSensorGesture(gestureList, this); - if (!validGestures().isEmpty()) { - QObject::connect(sensorGesture - , SIGNAL(detected(QString)) - , this - , SIGNAL(detected(QString))); - Q_EMIT validGesturesChanged(); - } - if (!invalidGestures().isEmpty()) - Q_EMIT invalidGesturesChanged(); -} - -/* - End of private function implementation -*/ - -QT_END_NAMESPACE diff --git a/src/sensorsquick/qmlsensorgesture_p.h b/src/sensorsquick/qmlsensorgesture_p.h deleted file mode 100644 index f87beff7..00000000 --- a/src/sensorsquick/qmlsensorgesture_p.h +++ /dev/null @@ -1,80 +0,0 @@ -// 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 - -#ifndef QMLSENSORGESTURE_P_H -#define QMLSENSORGESTURE_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 <QQmlParserStatus> -#include <QtQml/qqml.h> -#include <QStringList> - -#include "qsensorsquickglobal_p.h" - -QT_BEGIN_NAMESPACE - -class QSensorGesture; -class QSensorGestureManager; - -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensorGesture : public QObject, public QQmlParserStatus -{ - Q_OBJECT - Q_PROPERTY(QStringList availableGestures READ availableGestures NOTIFY availableGesturesChanged) - Q_PROPERTY(QStringList gestures READ gestures WRITE setGestures NOTIFY gesturesChanged) - Q_PROPERTY(QStringList validGestures READ validGestures NOTIFY validGesturesChanged) - Q_PROPERTY(QStringList invalidGestures READ invalidGestures NOTIFY invalidGesturesChanged) - Q_PROPERTY(bool enabled READ enabled WRITE setEnabled NOTIFY enabledChanged) - Q_INTERFACES(QQmlParserStatus) - QML_NAMED_ELEMENT(SensorGesture) - QML_ADDED_IN_VERSION(5,0) - -public: - explicit QmlSensorGesture(QObject* parent = 0); - ~QmlSensorGesture(); - void classBegin() override; - void componentComplete() override; - -Q_SIGNALS: - void detected(const QString &gesture); - void availableGesturesChanged(); - void gesturesChanged(); - void validGesturesChanged(); - void invalidGesturesChanged(); - void enabledChanged(); - -public: - QStringList availableGestures(); - QStringList gestures() const; - void setGestures(const QStringList& value); - bool enabled() const; - void setEnabled(bool value); - QStringList validGestures() const; - QStringList invalidGestures() const; - -private: - void deleteGesture(); - void createGesture(); - -private: - QStringList gestureIds; - bool isEnabled; - bool initDone; - QStringList gestureList; - - QSensorGesture* sensorGesture; - QSensorGestureManager* sensorGestureManager; -}; - -QT_END_NAMESPACE - -#endif diff --git a/src/sensorsquick/qmlsensorglobal.cpp b/src/sensorsquick/qmlsensorglobal.cpp index efc86de4..73f865c4 100644 --- a/src/sensorsquick/qmlsensorglobal.cpp +++ b/src/sensorsquick/qmlsensorglobal.cpp @@ -50,7 +50,7 @@ QStringList QmlSensorGlobal::sensorTypes() const { QStringList ret; const QList<QByteArray> sensorTypes = QSensor::sensorTypes(); - ret.reserve(sensorTypes.count()); + ret.reserve(sensorTypes.size()); for (const QByteArray &type : sensorTypes) ret << QString::fromLocal8Bit(type); return ret; @@ -66,7 +66,7 @@ QStringList QmlSensorGlobal::sensorsForType(const QString &type) const { QStringList ret; const QList<QByteArray> sensors = QSensor::sensorsForType(type.toLocal8Bit()); - ret.reserve(sensors.count()); + ret.reserve(sensors.size()); for (const QByteArray &identifier : sensors) ret << QString::fromLocal8Bit(identifier); return ret; diff --git a/src/sensorsquick/qmlsensorglobal_p.h b/src/sensorsquick/qmlsensorglobal_p.h index 007a8f2a..8b5214a2 100644 --- a/src/sensorsquick/qmlsensorglobal_p.h +++ b/src/sensorsquick/qmlsensorglobal_p.h @@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE class QSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensorGlobal : public QObject +class Q_SENSORSQUICK_EXPORT QmlSensorGlobal : public QObject { Q_OBJECT public: diff --git a/src/sensorsquick/qmlsensorrange_p.h b/src/sensorsquick/qmlsensorrange_p.h index e03f9f67..324c24db 100644 --- a/src/sensorsquick/qmlsensorrange_p.h +++ b/src/sensorsquick/qmlsensorrange_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensorRange : public QObject +class Q_SENSORSQUICK_EXPORT QmlSensorRange : public QObject { Q_OBJECT Q_PROPERTY(int minimum READ minimum) @@ -45,7 +45,7 @@ private: int max; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensorOutputRange : public QObject +class Q_SENSORSQUICK_EXPORT QmlSensorOutputRange : public QObject { Q_OBJECT Q_PROPERTY(qreal minimum READ minimum) diff --git a/src/sensorsquick/qmltapsensor_p.h b/src/sensorsquick/qmltapsensor_p.h index 3bb25812..7537c5db 100644 --- a/src/sensorsquick/qmltapsensor_p.h +++ b/src/sensorsquick/qmltapsensor_p.h @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE class QTapSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlTapSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlTapSensor : public QmlSensor { Q_OBJECT Q_PROPERTY(bool returnDoubleTapEvents READ returnDoubleTapEvents WRITE setReturnDoubleTapEvents NOTIFY returnDoubleTapEventsChanged) @@ -45,7 +45,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlTapSensorReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlTapSensorReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(QTapReading::TapDirection tapDirection READ tapDirection diff --git a/src/sensorsquick/qmltiltsensor_p.h b/src/sensorsquick/qmltiltsensor_p.h index c86866a3..d660229d 100644 --- a/src/sensorsquick/qmltiltsensor_p.h +++ b/src/sensorsquick/qmltiltsensor_p.h @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE class QTiltSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlTiltSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlTiltSensor : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(TiltSensor) @@ -40,7 +40,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlTiltSensorReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlTiltSensorReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal yRotation READ yRotation NOTIFY yRotationChanged BINDABLE bindableYRotation) diff --git a/src/sensorsquick/qsensorsquickglobal_p.h b/src/sensorsquick/qsensorsquickglobal_p.h index 91c41c54..4826ed82 100644 --- a/src/sensorsquick/qsensorsquickglobal_p.h +++ b/src/sensorsquick/qsensorsquickglobal_p.h @@ -16,8 +16,8 @@ // #include <QtCore/qglobal.h> -#include <QtSensorsQuick/private/qtsensorsquickexports_p.h> +#include <QtSensorsQuick/qtsensorsquickexports.h> -void Q_SENSORSQUICK_PRIVATE_EXPORT qml_register_types_QtSensors(); +void Q_SENSORSQUICK_EXPORT qml_register_types_QtSensors(); #endif // QSENSORSQUICKGLOBALS_P_H diff --git a/sync.profile b/sync.profile deleted file mode 100644 index 2839a357..00000000 --- a/sync.profile +++ /dev/null @@ -1,6 +0,0 @@ -%modules = ( # path to module name map - "QtSensors" => "$basedir/src/sensors", - "QtSensorsQuick" => "$basedir/src/sensorsquick", -); -%moduleheaders = ( # restrict the module headers to those found in relative path -); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f6bc330b..c82db085 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause if(QT_BUILD_STANDALONE_TESTS) diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 42f6ada5..248e6566 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -1,13 +1,8 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause add_subdirectory(qsensor) add_subdirectory(cmake) if(TARGET Qt::Quick) add_subdirectory(qml) endif() -# add_subdirectory(qsensorgestures) -# add_subdirectory(qsensorgestureplugins) -# if(UNIX AND NOT APPLE) -# add_subdirectory(qsensorgestures_gestures) -# endif() diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index f3ec24de..9b4b9c83 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause # This is an automatic test for the CMake configuration files. # To run it manually, diff --git a/tests/auto/common/test_backends.cpp b/tests/auto/common/test_backends.cpp index ca8be3d8..92e69bb3 100644 --- a/tests/auto/common/test_backends.cpp +++ b/tests/auto/common/test_backends.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtCore/QList> #include <QtCore/QMap> diff --git a/tests/auto/common/test_backends.h b/tests/auto/common/test_backends.h index 1aff64e5..06d827b7 100644 --- a/tests/auto/common/test_backends.h +++ b/tests/auto/common/test_backends.h @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef TEST_BACKENDS_H #define TEST_BACKENDS_H @@ -36,6 +36,7 @@ void set_test_backend_busy(QSensor* sensor, bool busy); SensorClass ## _impl(QSensor *sensor);\ void start() override;\ void stop() override;\ + bool isFeatureSupported(QSensor::Feature feature) const override;\ };\ class SensorClass ## _testfilter : public FilterClass { bool filter(ReadingClass *) override; }; @@ -47,6 +48,11 @@ void set_test_backend_busy(QSensor* sensor, bool busy); newReadingAvailable();\ }\ void SensorClass ##_impl::stop() {}\ + bool SensorClass ##_impl::isFeatureSupported(QSensor::Feature feature) const { \ + if (feature == QSensor::Feature::SkipDuplicates) \ + return true; \ + return false; \ + } \ bool SensorClass ## _testfilter::filter(ReadingClass *) { return true; }\ static QSensorBackend *create_ ## SensorClass ## _impl(QSensor *sensor) { return new SensorClass ## _impl(sensor); }\ static bool registered_ ## SensorClass = registerTestBackend(#SensorClass, create_ ## SensorClass ## _impl); diff --git a/tests/auto/qml/qml_cpp/CMakeLists.txt b/tests/auto/qml/qml_cpp/CMakeLists.txt index dca702bc..917dcc49 100644 --- a/tests/auto/qml/qml_cpp/CMakeLists.txt +++ b/tests/auto/qml/qml_cpp/CMakeLists.txt @@ -1,11 +1,9 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause qt_internal_add_test(tst_sensors_qmlcpp SOURCES ../../common/test_backends.cpp ../../common/test_backends.h - # qtemplategestureplugin.cpp qtemplategestureplugin.h - # qtemplaterecognizer.cpp qtemplaterecognizer.h tst_sensors_qmlcpp.cpp LIBRARIES Qt::Qml diff --git a/tests/auto/qml/qml_cpp/qtemplategestureplugin.cpp b/tests/auto/qml/qml_cpp/qtemplategestureplugin.cpp deleted file mode 100644 index c03fc14b..00000000 --- a/tests/auto/qml/qml_cpp/qtemplategestureplugin.cpp +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include <QtPlugin> -#include <QStringList> -#include <QObject> - -#include "qtemplategestureplugin.h" -#include <qsensorgestureplugininterface.h> -#include <qsensorgesturemanager.h> -#include "qtemplaterecognizer.h" - - -QTemplateGesturePlugin::QTemplateGesturePlugin() -{ -} - -QTemplateGesturePlugin::~QTemplateGesturePlugin() -{ -} - -QStringList QTemplateGesturePlugin::supportedIds() const -{ - QStringList list; - list << "QtSensors.template" << "QtSensors.template1"; - return list; -} - - -QList <QSensorGestureRecognizer *> QTemplateGesturePlugin::createRecognizers() -{ - QList <QSensorGestureRecognizer *> recognizers; - - QSensorGestureRecognizer *sRec = new QTemplateGestureRecognizer(this); - recognizers.append(sRec); - sRec = new QTemplateGestureRecognizer1(this); - recognizers.append(sRec); - - return recognizers; -} diff --git a/tests/auto/qml/qml_cpp/qtemplategestureplugin.h b/tests/auto/qml/qml_cpp/qtemplategestureplugin.h deleted file mode 100644 index dd0c252a..00000000 --- a/tests/auto/qml/qml_cpp/qtemplategestureplugin.h +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#ifndef QTEMPLATEGESTUREPLUGIN_H -#define QTEMPLATEGESTUREPLUGIN_H - -#include <QObject> -#include <QStringList> - -#include <qsensorgestureplugininterface.h> - -class QTemplateGesturePlugin : public QObject, public QSensorGesturePluginInterface -{ - Q_OBJECT - //Q_PLUGIN_METADATA(IID "org.qt-project.QSensorGesturePluginInterface" FILE "plugin.json") - Q_INTERFACES(QSensorGesturePluginInterface) -public: - explicit QTemplateGesturePlugin(); - ~QTemplateGesturePlugin(); - - QList<QSensorGestureRecognizer *> createRecognizers() override; - - QStringList gestureSignals() const; - QStringList supportedIds() const override; - QString name() const override { return "TemplateGestures"; } -}; - -#endif // QTEMPLATEGESTUREPLUGIN_H diff --git a/tests/auto/qml/qml_cpp/qtemplaterecognizer.cpp b/tests/auto/qml/qml_cpp/qtemplaterecognizer.cpp deleted file mode 100644 index 6cf36914..00000000 --- a/tests/auto/qml/qml_cpp/qtemplaterecognizer.cpp +++ /dev/null @@ -1,98 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include <QDebug> -#include <QTimer> - -#include "qtemplaterecognizer.h" - -QTemplateGestureRecognizer::QTemplateGestureRecognizer(QObject *parent) - : QSensorGestureRecognizer(parent) -{ -} - -QTemplateGestureRecognizer::~QTemplateGestureRecognizer() -{ - -} - -void QTemplateGestureRecognizer::create() -{ - connect(&_timer,SIGNAL(timeout()),this,SLOT(timeout())); - _timer.setInterval(1000); -} - -bool QTemplateGestureRecognizer::start() -{ - Q_EMIT detected(id()); - _timer.start(); - return _timer.isActive(); -} - -bool QTemplateGestureRecognizer::stop() -{ - _timer.stop(); - return true; -} - - -bool QTemplateGestureRecognizer::isActive() -{ - return _timer.isActive(); -} - -QString QTemplateGestureRecognizer::id() const -{ - return QString("QtSensors.template"); -} - -void QTemplateGestureRecognizer::timeout() -{ - Q_EMIT detected(id()); -} - - -QTemplateGestureRecognizer1::QTemplateGestureRecognizer1(QObject *parent) - : QSensorGestureRecognizer(parent) -{ -} - -QTemplateGestureRecognizer1::~QTemplateGestureRecognizer1() -{ - -} - -void QTemplateGestureRecognizer1::create() -{ - connect(&_timer,SIGNAL(timeout()),this,SLOT(timeout())); - _timer.setInterval(500); -} - -bool QTemplateGestureRecognizer1::start() -{ - Q_EMIT detected(id()); - _timer.start(); - return _timer.isActive(); -} - -bool QTemplateGestureRecognizer1::stop() -{ - _timer.stop(); - return true; -} - - -bool QTemplateGestureRecognizer1::isActive() -{ - return _timer.isActive(); -} - -QString QTemplateGestureRecognizer1::id() const -{ - return QString("QtSensors.template1"); -} - -void QTemplateGestureRecognizer1::timeout() -{ - Q_EMIT detected(id()); -} diff --git a/tests/auto/qml/qml_cpp/qtemplaterecognizer.h b/tests/auto/qml/qml_cpp/qtemplaterecognizer.h deleted file mode 100644 index 36f2e359..00000000 --- a/tests/auto/qml/qml_cpp/qtemplaterecognizer.h +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#ifndef QTEMPLATERECOGNIZER_H -#define QTEMPLATERECOGNIZER_H - -#include <QDebug> -#include <QtCore/QTimer> -#include <qsensorgesturerecognizer.h> - -class QTemplateGestureRecognizer : public QSensorGestureRecognizer -{ - Q_OBJECT -public: - - QTemplateGestureRecognizer(QObject *parent = 0); - ~QTemplateGestureRecognizer(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - -private slots: - void timeout(); - -private: - QTimer _timer; -}; - -class QTemplateGestureRecognizer1 : public QSensorGestureRecognizer -{ - Q_OBJECT -public: - - QTemplateGestureRecognizer1(QObject *parent = 0); - ~QTemplateGestureRecognizer1(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - -private slots: - void timeout(); - -private: - QTimer _timer; -}; - -#endif // QTEMPLATERECOGNIZER_H diff --git a/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp b/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp index bd32f340..32d82348 100644 --- a/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp +++ b/tests/auto/qml/qml_cpp/tst_sensors_qmlcpp.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtTest/QtTest> #include <QtTest/QSignalSpy> @@ -7,11 +7,6 @@ #include <QtTest/private/qpropertytesthelper_p.h> #include <QtSensorsQuick/private/qmlsensor_p.h> -// #include <QtSensorsQuick/private/qmlsensorgesture_p.h> - -#include "qtemplategestureplugin.h" -#include "qtemplaterecognizer.h" -#include <qsensorgesturemanager.h> #include <qsensorbackend.h> #include "qsensormanager.h" @@ -170,125 +165,6 @@ void tst_sensors_qmlcpp::testReadingBindings() unregister_test_backends(); } -/* -void tst_sensors_qmlcpp::testGesture() -{ - QTemplateGesturePlugin* plugin = new QTemplateGesturePlugin(); - QList <QSensorGestureRecognizer *> recognizers = plugin->createRecognizers(); - QSensorGestureManager manager; - - QmlSensorGesture* gs = new QmlSensorGesture(this); - gs->componentComplete(); - QSignalSpy spy_availableGesturesChanged(gs, SIGNAL(availableGesturesChanged())); - QSignalSpy spy_detected(gs, SIGNAL(detected(QString))); - QSignalSpy spy_gesturesChanged(gs, SIGNAL(gesturesChanged())); - QSignalSpy spy_validGesturesChanged(gs, SIGNAL(validGesturesChanged())); - QSignalSpy spy_invalidGesturesChanged(gs, SIGNAL(invalidGesturesChanged())); - QSignalSpy spy_enabledChanged(gs, SIGNAL(enabledChanged())); - - //This flag is needed if you run this unit test with an alread installed template plugin - bool registered = false; - for (int i = 0; i < recognizers.count(); i++){ - registered = manager.registerSensorGestureRecognizer(recognizers[i]); - } - if (registered) { - QCOMPARE(spy_availableGesturesChanged.count(), 2); - } - - //check creation of a not known plugin - QCOMPARE(spy_invalidGesturesChanged.count(), 0); - QCOMPARE(spy_gesturesChanged.count(), 0); - gs->setGestures(QStringList() << "lollipop"); - QCOMPARE(spy_gesturesChanged.count(), 1); - QCOMPARE(spy_invalidGesturesChanged.count(), 1); - - //check creation of a known plugin - QCOMPARE(spy_validGesturesChanged.count(), 0); - QCOMPARE(spy_gesturesChanged.count(), 1); - spy_invalidGesturesChanged.clear(); - spy_validGesturesChanged.clear(); - gs->setGestures(QStringList() << "QtSensors.template"); - QCOMPARE(spy_gesturesChanged.count(), 2); - QCOMPARE(spy_invalidGesturesChanged.count(), 1); - QCOMPARE(spy_validGesturesChanged.count(), 1); - - //enable "QtSensors.template" - QCOMPARE(spy_enabledChanged.count(), 0); - QCOMPARE(spy_detected.count(), 0); - gs->setEnabled(true); - QCOMPARE(spy_enabledChanged.count(), 1); - QCOMPARE(spy_detected.count(), 1); - - //set gesture during running sensor should not emit gesture changed - spy_gesturesChanged.clear(); - gs->setGestures(QStringList() << "QtSensors.template2"); - QCOMPARE(spy_gesturesChanged.count(), 0); - - gs->setEnabled(false); - - QmlSensorGesture* gs1 = new QmlSensorGesture(this); - QSignalSpy spy1_detected(gs1, SIGNAL(detected(QString))); - QSignalSpy spy1_gesturesChanged(gs1, SIGNAL(gesturesChanged())); - QSignalSpy spy1_validGesturesChanged(gs1, SIGNAL(validGesturesChanged())); - QSignalSpy spy1_invalidGesturesChanged(gs1, SIGNAL(invalidGesturesChanged())); - QSignalSpy spy1_enabledChanged(gs1, SIGNAL(enabledChanged())); - gs1->componentComplete(); - - //set enable = true without gesture should - gs1->setEnabled(true); - QCOMPARE(spy1_enabledChanged.count(), 1); - gs1->setEnabled(false); - spy1_enabledChanged.clear(); - - //reding gestures check if we get back an empty string list - QStringList gestures = gs1->gestures(); - QCOMPARE(gestures.count(), 0); - QStringList validgestures = gs1->validGestures(); - QCOMPARE(validgestures.count(), 0); - QStringList invalidgestures = gs1->invalidGestures(); - QCOMPARE(invalidgestures.count(), 0); - - //check types "QtSensors.template" "QtSensors.template1" "lollipop" - //expect valid 2 not available 1 - gestures << "QtSensors.template" << "QtSensors.template1" << "lollipop"; - gs1->setGestures(gestures); - gestures = gs1->gestures(); - QCOMPARE(gestures.count(), 3); - QCOMPARE(spy1_validGesturesChanged.count(), 1); - QCOMPARE(spy1_invalidGesturesChanged.count(), 1); - QCOMPARE(spy1_gesturesChanged.count(), 1); - //set same gesture again should not emit gesture changed - gs1->setGestures(gestures); - QCOMPARE(spy1_gesturesChanged.count(), 1); - - spy1_gesturesChanged.clear(); - gestures.clear(); - gs1->setGestures(gestures); - QCOMPARE(spy1_gesturesChanged.count(), 1); - - //enable "QtSensors.template" and "QtSensors.template1" - gestures << "QtSensors.template" << "QtSensors.template1"; - gs1->setEnabled(false); - gs1->setGestures(gestures); - spy1_enabledChanged.clear(); - spy1_detected.clear(); - gs1->setEnabled(true); - QCOMPARE(spy1_enabledChanged.count(), 1); - QCOMPARE(spy1_detected.count(), 2); - gs1->setEnabled(false); - - //check sensor shouldn't run until the componentComplete gets called - QmlSensorGesture* gs2 = new QmlSensorGesture(this); - QSignalSpy spy2_detected(gs2, SIGNAL(detected(QString))); - gs2->setGestures(QStringList() << "QtSensors.template"); - gs2->setEnabled(true); - QCOMPARE(spy2_detected.count(), 0); - gs2->componentComplete(); - QCOMPARE(spy2_detected.count(), 1); -} - -*/ - class QDummySensorBackend : public QSensorBackend { Q_OBJECT @@ -389,11 +265,11 @@ void tst_sensors_qmlcpp::testSensorRanges() QSignalSpy output2Spy(output2, SIGNAL(destroyed())); qmlSensor.reset(); - QCOMPARE(range0Spy.count(), 1); - QCOMPARE(range1Spy.count(), 1); - QCOMPARE(output0Spy.count(), 1); - QCOMPARE(output1Spy.count(), 1); - QCOMPARE(output2Spy.count(), 1); + QCOMPARE(range0Spy.size(), 1); + QCOMPARE(range1Spy.size(), 1); + QCOMPARE(output0Spy.size(), 1); + QCOMPARE(output1Spy.size(), 1); + QCOMPARE(output2Spy.size(), 1); } QT_END_NAMESPACE diff --git a/tests/auto/qml/qml_quick/CMakeLists.txt b/tests/auto/qml/qml_quick/CMakeLists.txt index 1d61124a..8472a278 100644 --- a/tests/auto/qml/qml_quick/CMakeLists.txt +++ b/tests/auto/qml/qml_quick/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause # Collect test data file(GLOB_RECURSE test_data_glob diff --git a/tests/auto/qml/qml_quick/tst_sensors_basic.qml b/tests/auto/qml/qml_quick/tst_sensors_basic.qml index 687382ee..bcb21232 100644 --- a/tests/auto/qml/qml_quick/tst_sensors_basic.qml +++ b/tests/auto/qml/qml_quick/tst_sensors_basic.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtTest import QtSensors @@ -201,4 +201,26 @@ TestCase { {tag: "IRProximitySensor", initialReading: {reflectance: 0.5}, newReading: {reflectance: 0.6}} ]; } + + function test_SupportedFeatures() + { + var sensor = Qt.createQmlObject("import QtSensors; Accelerometer \ + {identifier: \"QAccelerometer\"}", + testCase); + verify(sensor.start()) + verify(sensor.connectedToBackend) + + // According to isFeatureSupported() override implementation in test_backends.h, + // only SkipDuplicates should be supported afterwards + verify(!sensor.isFeatureSupported(Sensor.Buffering)) + verify(!sensor.isFeatureSupported(Sensor.AlwaysOn)) + verify(!sensor.isFeatureSupported(Sensor.GeoValues)) + verify(!sensor.isFeatureSupported(Sensor.FieldOfView)) + verify(!sensor.isFeatureSupported(Sensor.AccelerationMode)) + verify(sensor.isFeatureSupported(Sensor.SkipDuplicates)) + verify(!sensor.isFeatureSupported(Sensor.AxesOrientation)) + verify(!sensor.isFeatureSupported(Sensor.PressureSensorTemperature)) + + sensor.destroy() + } } diff --git a/tests/auto/qml/qml_quick/tst_sensors_qmlquick.cpp b/tests/auto/qml/qml_quick/tst_sensors_qmlquick.cpp index 302843fb..08bba9a5 100644 --- a/tests/auto/qml/qml_quick/tst_sensors_qmlquick.cpp +++ b/tests/auto/qml/qml_quick/tst_sensors_qmlquick.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQuickTest> #include <QtQml/QQmlEngine> diff --git a/tests/auto/qsensor/CMakeLists.txt b/tests/auto/qsensor/CMakeLists.txt index 16a3123c..43f0d054 100644 --- a/tests/auto/qsensor/CMakeLists.txt +++ b/tests/auto/qsensor/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## tst_qsensor Test: diff --git a/tests/auto/qsensor/test_sensor.cpp b/tests/auto/qsensor/test_sensor.cpp index 30e390f6..3c36b595 100644 --- a/tests/auto/qsensor/test_sensor.cpp +++ b/tests/auto/qsensor/test_sensor.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "test_sensor.h" #include "test_sensor_p.h" diff --git a/tests/auto/qsensor/test_sensor.h b/tests/auto/qsensor/test_sensor.h index ed5a7482..f75db083 100644 --- a/tests/auto/qsensor/test_sensor.h +++ b/tests/auto/qsensor/test_sensor.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef TEST_SENSOR_H #define TEST_SENSOR_H diff --git a/tests/auto/qsensor/test_sensor2.cpp b/tests/auto/qsensor/test_sensor2.cpp index 6c1b2e0a..e72c62d2 100644 --- a/tests/auto/qsensor/test_sensor2.cpp +++ b/tests/auto/qsensor/test_sensor2.cpp @@ -1,31 +1,9 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "test_sensor2.h" #include "test_sensor2_p.h" -#undef IMPLEMENT_READING -#undef IMPLEMENT_READING_D - -#define IMPLEMENT_READING(classname)\ - IMPLEMENT_READING_D(classname, classname ## Private) - -#define IMPLEMENT_READING_D(classname, pclassname)\ - classname::classname(QObject *parent)\ - : QSensorReading(parent, new pclassname)\ - , d(d_ptr())\ - {}\ - classname::~classname() {}\ - void classname::copyValuesFrom(QSensorReading *_other)\ - {\ - /* No need to verify types, only called by QSensorBackend */\ - classname *other = static_cast<classname *>(_other);\ - pclassname *my_ptr = static_cast<pclassname*>(d_ptr()->data());\ - pclassname *other_ptr = static_cast<pclassname*>(other->d_ptr()->data());\ - /* Do a direct copy of the private class */\ - *(my_ptr) = *(other_ptr);\ - } - IMPLEMENT_READING(TestSensor2Reading) int TestSensor2Reading::test() const diff --git a/tests/auto/qsensor/test_sensor2.h b/tests/auto/qsensor/test_sensor2.h index 83d1926f..c5716001 100644 --- a/tests/auto/qsensor/test_sensor2.h +++ b/tests/auto/qsensor/test_sensor2.h @@ -1,43 +1,11 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef TEST_SENSOR2_H #define TEST_SENSOR2_H #include "qsensor.h" -#undef DECLARE_READING -#undef DECLARE_READING_D - -template <typename T> -class qTypedWrapper -{ -public: - qTypedWrapper(QScopedPointer<QSensorReadingPrivate> *_ptr) - : ptr(_ptr) - { - } - - T *operator->() const - { - return static_cast<T*>(ptr->data()); - } - -private: - QScopedPointer<QSensorReadingPrivate> *ptr; -}; - -#define DECLARE_READING(classname)\ - DECLARE_READING_D(classname, classname ## Private) - -#define DECLARE_READING_D(classname, pclassname)\ - public:\ - classname(QObject *parent = 0);\ - virtual ~classname();\ - void copyValuesFrom(QSensorReading *other) override;\ - private:\ - qTypedWrapper<pclassname> d; - class TestSensor2ReadingPrivate; class TestSensor2Reading : public QSensorReading diff --git a/tests/auto/qsensor/test_sensor2_p.h b/tests/auto/qsensor/test_sensor2_p.h index 31f10eb3..8ad4e495 100644 --- a/tests/auto/qsensor/test_sensor2_p.h +++ b/tests/auto/qsensor/test_sensor2_p.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef TEST_SENSOR2_P_H #define TEST_SENSOR2_P_H diff --git a/tests/auto/qsensor/test_sensor2impl.cpp b/tests/auto/qsensor/test_sensor2impl.cpp index 10b0a04b..795b1a00 100644 --- a/tests/auto/qsensor/test_sensor2impl.cpp +++ b/tests/auto/qsensor/test_sensor2impl.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "test_sensor2impl.h" #include <qaccelerometer.h> diff --git a/tests/auto/qsensor/test_sensor2impl.h b/tests/auto/qsensor/test_sensor2impl.h index 80711470..269d1184 100644 --- a/tests/auto/qsensor/test_sensor2impl.h +++ b/tests/auto/qsensor/test_sensor2impl.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef TEST_SENSOR2IMPL_H #define TEST_SENSOR2IMPL_H diff --git a/tests/auto/qsensor/test_sensor_p.h b/tests/auto/qsensor/test_sensor_p.h index 0ab4268a..9737e292 100644 --- a/tests/auto/qsensor/test_sensor_p.h +++ b/tests/auto/qsensor/test_sensor_p.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef TEST_SENSOR_P_H #define TEST_SENSOR_P_H diff --git a/tests/auto/qsensor/test_sensorimpl.cpp b/tests/auto/qsensor/test_sensorimpl.cpp index 8e8e33f9..206b1786 100644 --- a/tests/auto/qsensor/test_sensorimpl.cpp +++ b/tests/auto/qsensor/test_sensorimpl.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "test_sensorimpl.h" #include <QDebug> diff --git a/tests/auto/qsensor/test_sensorimpl.h b/tests/auto/qsensor/test_sensorimpl.h index ed353e7d..9d52e33f 100644 --- a/tests/auto/qsensor/test_sensorimpl.h +++ b/tests/auto/qsensor/test_sensorimpl.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef TEST_SENSORIMPL_H #define TEST_SENSORIMPL_H diff --git a/tests/auto/qsensor/test_sensorplugin.cpp b/tests/auto/qsensor/test_sensorplugin.cpp index dd5a4466..1734d3a9 100644 --- a/tests/auto/qsensor/test_sensorplugin.cpp +++ b/tests/auto/qsensor/test_sensorplugin.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "test_sensorimpl.h" #include "test_sensor2impl.h" diff --git a/tests/auto/qsensor/tst_qsensor.cpp b/tests/auto/qsensor/tst_qsensor.cpp index 38251c5e..261f81f9 100644 --- a/tests/auto/qsensor/tst_qsensor.cpp +++ b/tests/auto/qsensor/tst_qsensor.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only //TESTED_COMPONENT=src/sensors @@ -423,20 +423,20 @@ private slots: sensor.setProperty("doThis", "setOne"); QSignalSpy spy(&sensor, SIGNAL(readingChanged())); sensor.start(); - QCOMPARE(spy.count(), 1); // reading changes + QCOMPARE(spy.size(), 1); // reading changes sensor.stop(); TestSensorFilter *filter2 = new MyFilter; sensor.addFilter(filter2); sensor.start(); - QCOMPARE(spy.count(), 1); // filter suppresses reading so it does not change + QCOMPARE(spy.size(), 1); // filter suppresses reading so it does not change sensor.stop(); delete filter2; TestSensorFilter *filter1 = new ModFilter; sensor.addFilter(filter1); sensor.start(); - QCOMPARE(spy.count(), 2); // filter does not suppress reading + QCOMPARE(spy.size(), 2); // filter does not suppress reading sensor.stop(); delete filter1; } @@ -895,7 +895,7 @@ private slots: // Stopping the first instance causes the busyChanged signal to be emitted from the second instance QSignalSpy spy(&sensor2, SIGNAL(busyChanged())); sensor1.stop(); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Now we can start the second instance sensor2.start(); @@ -908,14 +908,14 @@ private slots: QSignalSpy busySpy(&accelerometer, SIGNAL(busyChanged())); QVERIFY(accelerometer.connectToBackend()); QVERIFY(!accelerometer.isBusy()); - QCOMPARE(busySpy.count(), 0); + QCOMPARE(busySpy.size(), 0); set_test_backend_busy(&accelerometer, true); - QCOMPARE(busySpy.count(), 1); + QCOMPARE(busySpy.size(), 1); QVERIFY(accelerometer.isBusy()); set_test_backend_busy(&accelerometer, false); - QCOMPARE(busySpy.count(), 2); + QCOMPARE(busySpy.size(), 2); QVERIFY(!accelerometer.isBusy()); unregister_test_backends(); } @@ -929,23 +929,23 @@ private slots: // Change id and verify change sensor.setIdentifier("a"); QCOMPARE(sensor.identifier(), "a"); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Set same id and verify that no changes sensor.setIdentifier("a"); QCOMPARE(sensor.identifier(), "a"); - QCOMPARE(spy.count(), 1); + QCOMPARE(spy.size(), 1); // Change id and verify change sensor.setIdentifier(testsensorimpl::id); QCOMPARE(sensor.identifier(), testsensorimpl::id); - QCOMPARE(spy.count(), 2); + QCOMPARE(spy.size(), 2); // Identifier cant be changed after connected to backend QVERIFY(sensor.connectToBackend()); sensor.setIdentifier("c"); QCOMPARE(sensor.identifier(), testsensorimpl::id); - QCOMPARE(spy.count(), 2); + QCOMPARE(spy.size(), 2); } void testSupportedFeatures() diff --git a/tests/auto/qsensorgestureplugins/CMakeLists.txt b/tests/auto/qsensorgestureplugins/CMakeLists.txt deleted file mode 100644 index b1bdd6bb..00000000 --- a/tests/auto/qsensorgestureplugins/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -##################################################################### -## tst_qsensorgesturepluginstest Binary: -##################################################################### - -qt_internal_add_test(tst_qsensorgesturepluginstest - SOURCES - ../common/test_backends.cpp ../common/test_backends.h - tst_qsensorgesturepluginstest.cpp - INCLUDE_DIRECTORIES - ../qsensor - LIBRARIES - Qt::Sensors - Qt::Test -) diff --git a/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp b/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp deleted file mode 100644 index 5c9a3dda..00000000 --- a/tests/auto/qsensorgestureplugins/tst_qsensorgesturepluginstest.cpp +++ /dev/null @@ -1,177 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include <QtCore/QString> -#include <QtTest/QtTest> - -#include <QVariant> -#include <QSignalSpy> - -#include <qsensorgesture.h> -#include <qsensorgesturemanager.h> - -#include <qsensorgesturerecognizer.h> -#include <qsensorgestureplugininterface.h> - -#include "../common/test_backends.h" - -class Tst_qsensorgesturePluginsTest : public QObject -{ - Q_OBJECT - -public: - Tst_qsensorgesturePluginsTest(); - -private Q_SLOTS: - - void tst_sensor_plugins_shake(); - void tst_sensor_plugins_qtsensors_data(); - void tst_sensor_plugins_qtsensors(); - void tst_sensor_plugins_qtsensors_all(); - -}; - -Tst_qsensorgesturePluginsTest::Tst_qsensorgesturePluginsTest() -{ - qputenv("QT_SENSORS_LOAD_PLUGINS", "0"); // Do not load plugins - register_test_backends(); -} - -void Tst_qsensorgesturePluginsTest::tst_sensor_plugins_shake() -{ - - QSensorGestureManager manager; - QVERIFY(manager.gestureIds().contains("QtSensors.shake")); - - QSensorGestureRecognizer *recognizer = manager.sensorGestureRecognizer("QtSensors.shake"); - - QCOMPARE(recognizer->isActive(), false); - - QTest::ignoreMessage(QtWarningMsg, "Not starting. Gesture Recognizer not initialized"); - recognizer->startBackend(); - QCOMPARE(recognizer->isActive(), false); - - QTest::ignoreMessage(QtWarningMsg, "Not stopping. Gesture Recognizer not initialized"); - recognizer->stopBackend(); - QCOMPARE(recognizer->isActive(), false); - - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(QStringList() << "QtSensors.shake")); - - QCOMPARE(gesture->isActive(),false); - QCOMPARE(gesture->validIds(), QStringList() << "QtSensors.shake"); - - QCOMPARE(QStringList() << recognizer->id(), gesture->validIds()); - - gesture->startDetection(); - QCOMPARE(gesture->isActive(),true); - QCOMPARE(recognizer->isActive(), true); - - gesture->stopDetection(); - QCOMPARE(recognizer->isActive(), false); -} - -void Tst_qsensorgesturePluginsTest::tst_sensor_plugins_qtsensors_data() -{ - QTest::addColumn<QString>("gestureId"); - - QTest::newRow("QtSensors.cover") << "QtSensors.cover"; - - QTest::newRow("QtSensors.doubletap") << "QtSensors.doubletap"; - - QTest::newRow("QtSensors.freefall") << "QtSensors.freefall"; - QTest::newRow("QtSensors.hover") << "QtSensors.hover"; - QTest::newRow("QtSensors.shake2") << "QtSensors.shake2"; - QTest::newRow("QtSensors.slam") << "QtSensors.slam"; - QTest::newRow("QtSensors.turnover") << "QtSensors.turnover"; - QTest::newRow("QtSensors.twist") << "QtSensors.twist"; - QTest::newRow("QtSensors.whip") << "QtSensors.whip"; -} - -void Tst_qsensorgesturePluginsTest::tst_sensor_plugins_qtsensors() -{ - QFETCH(QString, gestureId); - QSensorGestureManager manager; - - QVERIFY(manager.gestureIds().contains(gestureId)); - - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(QStringList() << gestureId)); - QScopedPointer<QSensorGesture> gesture2(new QSensorGesture(QStringList() << gestureId)); - - QCOMPARE(gesture->isActive(),false); - QCOMPARE(gesture->validIds(), QStringList() << gestureId); - - QSensorGestureRecognizer *recognizer = manager.sensorGestureRecognizer(gestureId); - - QCOMPARE(QStringList() << recognizer->id(), gesture->validIds()); - - QCOMPARE(QStringList() << QStringList(), gesture->invalidIds()); - - QVERIFY(recognizer->isActive() == false); - QVERIFY(gesture->isActive() == false); - QVERIFY(gesture2->isActive() == false); - - gesture->startDetection(); - - QVERIFY(gesture->isActive() == true); - QVERIFY(gesture2->isActive() == false); - - QVERIFY(recognizer->isActive() == true); - - gesture2->startDetection(); - - QVERIFY(gesture->isActive() == true); - QVERIFY(gesture2->isActive() == true); - QVERIFY(recognizer->isActive() == true); - - gesture2->stopDetection(); - - QVERIFY(gesture->isActive() == true); - QVERIFY(gesture2->isActive() == false); - QVERIFY(recognizer->isActive() == true); - - gesture->stopDetection(); - - QVERIFY(gesture->isActive() == false); - QVERIFY(gesture2->isActive() == false); - QVERIFY(recognizer->isActive() == false); - - - QVERIFY(recognizer->gestureSignals().count() > 1); - QVERIFY(recognizer->gestureSignals().contains("detected(QString)")); - -} - -void Tst_qsensorgesturePluginsTest::tst_sensor_plugins_qtsensors_all() -{ - QStringList list; - list << "QtSensors.cover"; - list << "QtSensors.doubletap"; - list << "QtSensors.hover"; - list << "QtSensors.pickup"; - list << "QtSensors.shake2"; - list << "QtSensors.slam"; - list << "QtSensors.turnover"; - list << "QtSensors.twist"; - list << "QtSensors.whip"; - - QSensorGestureManager manager; - - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(list)); - QVERIFY(gesture->invalidIds().count() == 0); - QVERIFY(gesture->validIds().count() == 9); - QVERIFY(gesture->gestureSignals().count() == 14); - - gesture->startDetection(); - QVERIFY(gesture->isActive()); - - QSensorGestureRecognizer *recognizer = manager.sensorGestureRecognizer("QtSensors.turnover"); - recognizer->stopBackend(); - QVERIFY(!recognizer->isActive()); - QVERIFY(gesture->isActive()); - -} - - -QTEST_MAIN(Tst_qsensorgesturePluginsTest); - -#include "tst_qsensorgesturepluginstest.moc" diff --git a/tests/auto/qsensorgestures/CMakeLists.txt b/tests/auto/qsensorgestures/CMakeLists.txt deleted file mode 100644 index c369457a..00000000 --- a/tests/auto/qsensorgestures/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -##################################################################### -## tst_qsensorgesturetest Test: -##################################################################### - -qt_internal_add_test(tst_qsensorgesturetest - SOURCES - plugins/test/qtest2recognizer.cpp plugins/test/qtest2recognizer.h - plugins/test/qtestrecognizer.cpp plugins/test/qtestrecognizer.h - plugins/test/qtestsensorgestureplugin.cpp plugins/test/qtestsensorgestureplugin_p.h - plugins/test1/qtest2recognizerdup.cpp plugins/test1/qtest2recognizerdup.h - plugins/test1/qtestrecognizerdup.cpp plugins/test1/qtestrecognizerdup.h - plugins/test1/qtestsensorgestureplugindup.cpp plugins/test1/qtestsensorgestureplugindup.h - tst_qsensorgesturetest.cpp - DEFINES - QT_STATICPLUGIN - LIBRARIES - Qt::Sensors -) diff --git a/tests/auto/qsensorgestures/plugins/test/qtest2recognizer.cpp b/tests/auto/qsensorgestures/plugins/test/qtest2recognizer.cpp deleted file mode 100644 index 469946f8..00000000 --- a/tests/auto/qsensorgestures/plugins/test/qtest2recognizer.cpp +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include "qtest2recognizer.h" - -#include "qtestsensorgestureplugin_p.h" - -QTest2Recognizer::QTest2Recognizer(QObject *parent) - : QSensorGestureRecognizer(parent), - active(0) -{ -} - -QTest2Recognizer::~QTest2Recognizer() -{ -} - -bool QTest2Recognizer::start() -{ - Q_EMIT test2(); - - Q_EMIT detected("test2"); - - Q_EMIT test3(true); - active = true; - - return true; -} - -bool QTest2Recognizer::stop() -{ - active = false; - return true; -} - -bool QTest2Recognizer::isActive() -{ - return active; -} - - -void QTest2Recognizer::create() -{ - active = false; -} - -QString QTest2Recognizer::id() const -{ - return QString("QtSensors.test2"); -} - -int QTest2Recognizer::thresholdTime() const -{ - return timerTimeout; -} - -void QTest2Recognizer::setThresholdTime(int msec) -{ - timer->setInterval(msec); -} - diff --git a/tests/auto/qsensorgestures/plugins/test/qtest2recognizer.h b/tests/auto/qsensorgestures/plugins/test/qtest2recognizer.h deleted file mode 100644 index 9ad2e9db..00000000 --- a/tests/auto/qsensorgestures/plugins/test/qtest2recognizer.h +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#ifndef QTEST2RECOGNIZER_H -#define QTEST2RECOGNIZER_H - -#include <qsensorgesturerecognizer.h> - -class QTest2Recognizer : public QSensorGestureRecognizer -{ - Q_OBJECT - -public: - QTest2Recognizer(QObject *parent = 0); - ~QTest2Recognizer(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - - int thresholdTime() const; - void setThresholdTime(int msec); - -Q_SIGNALS: - void test2(); - void test3(bool); - -private: - int timerTimeout; - QTimer *timer; - bool active; -}; - - -#endif // QTEST2RECOGNIZER_H diff --git a/tests/auto/qsensorgestures/plugins/test/qtestrecognizer.cpp b/tests/auto/qsensorgestures/plugins/test/qtestrecognizer.cpp deleted file mode 100644 index d99cc4bb..00000000 --- a/tests/auto/qsensorgestures/plugins/test/qtestrecognizer.cpp +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include <QStringList> -#include <QTimer> - -#include "qtestrecognizer.h" -#include "qtestsensorgestureplugin_p.h" - - -QTestRecognizer::QTestRecognizer(QObject *parent) - : QSensorGestureRecognizer(parent), - active(0) -{ - timeout(); -} - -QTestRecognizer::~QTestRecognizer() -{ -} - -void QTestRecognizer::timeout() -{ - Q_EMIT detected("tested"); - Q_EMIT tested(); - QTimer::singleShot(100, this, SLOT(timeout())); -} - - -bool QTestRecognizer::start() -{ - Q_EMIT detected("tested"); - Q_EMIT tested(); - active = true; - return true; -} - -bool QTestRecognizer::stop() -{ - active = false; - return true; -} - -bool QTestRecognizer::isActive() -{ - return active; -} - -void QTestRecognizer::create() -{ - active = false; -} - -QString QTestRecognizer::id() const -{ - return QString("QtSensors.test"); -} - - -int QTestRecognizer::thresholdTime() const -{ - return timerTimeout; -} - -void QTestRecognizer::setThresholdTime(int msec) -{ - timer->setInterval(msec); -} diff --git a/tests/auto/qsensorgestures/plugins/test/qtestrecognizer.h b/tests/auto/qsensorgestures/plugins/test/qtestrecognizer.h deleted file mode 100644 index 117d465f..00000000 --- a/tests/auto/qsensorgestures/plugins/test/qtestrecognizer.h +++ /dev/null @@ -1,41 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#ifndef QTESTRECOGNIZER_H -#define QTESTRECOGNIZER_H - -#include <qsensorgesturerecognizer.h> - -class QTestRecognizer : public QSensorGestureRecognizer -{ - Q_OBJECT - Q_PROPERTY(int thresholdTime READ thresholdTime WRITE setThresholdTime) - -public: - - QTestRecognizer(QObject *parent = 0); - ~QTestRecognizer(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - - int thresholdTime() const; - void setThresholdTime(int msec); - -Q_SIGNALS: - void tested(); - -private: - int timerTimeout; - QTimer *timer; - bool active; - -public slots: - void timeout(); -}; - -#endif // QTESTRECOGNIZER_H diff --git a/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin.cpp b/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin.cpp deleted file mode 100644 index f920ca07..00000000 --- a/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include <QObject> -#include <QtPlugin> -#include <QStringList> -#include <QTimer> -#include <QTest> - -#include "qtestrecognizer.h" -#include "qtest2recognizer.h" - -#include "qtestsensorgestureplugin_p.h" - -#include <qsensorgestureplugininterface.h> -#include <qsensorgesturerecognizer.h> -#include <qsensorgesturemanager.h> - - -QTestSensorGesturePlugin::QTestSensorGesturePlugin() -{ -} - -QTestSensorGesturePlugin::~QTestSensorGesturePlugin() -{ -} - - -///*! -// Describes this gesture's possible gesture signals. -//handled through the detected(const QString &) signal. -// */ -//QStringList QTestSensorGesturePlugin::gestureSignals() const -//{ -// QStringList list; -// Q_FOREACH (const QSensorGestureRecognizer* rec, recognizersList) { -// list.append(rec->gestureSignals()); -// } -// return list; -//} - -QList <QSensorGestureRecognizer *> QTestSensorGesturePlugin::createRecognizers() -{ - QSensorGestureRecognizer *sRec = new QTestRecognizer(this); - recognizersList.append(sRec); - - QSensorGestureRecognizer *sRec2 = new QTest2Recognizer(this); - recognizersList.append(sRec2); - - return recognizersList; -} - -QStringList QTestSensorGesturePlugin::supportedIds() const -{ - QStringList list; - list << "QtSensors.test"; - list <<"QtSensors.test2"; - - return list; -} - -QList<QSensorGestureRecognizer*> QTestSensorGesturePlugin::recognizers() const -{ - return recognizersList; -} - -QString QTestSensorGesturePlugin::name() const -{ - return "TestGestures"; -} diff --git a/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h b/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h deleted file mode 100644 index a445a1a8..00000000 --- a/tests/auto/qsensorgestures/plugins/test/qtestsensorgestureplugin_p.h +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#ifndef QTESTSENSORGESTUREPLUGIN_P_H -#define QTESTSENSORGESTUREPLUGIN_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 <QObject> -#include <qsensorgestureplugininterface.h> - -class QTestSensorGesturePlugin : public QObject, public QSensorGesturePluginInterface -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.QSensorGesturePluginInterface") - Q_INTERFACES(QSensorGesturePluginInterface) - -public: - explicit QTestSensorGesturePlugin(); - ~QTestSensorGesturePlugin(); - - QList<QSensorGestureRecognizer *> createRecognizers() override; - -// QStringList gestureSignals() const; - QStringList supportedIds() const override; - QString name() const override; - - QList<QSensorGestureRecognizer*> recognizers() const; - - QList<QSensorGestureRecognizer*> recognizersList; - -}; - - - -#endif // QTESTSENSORGESTUREPLUGIN_H diff --git a/tests/auto/qsensorgestures/plugins/test1/CMakeLists.txt b/tests/auto/qsensorgestures/plugins/test1/CMakeLists.txt deleted file mode 100644 index 17ac92b8..00000000 --- a/tests/auto/qsensorgestures/plugins/test1/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -##################################################################### -## QTestSensorGestureDupPlugin Plugin: -##################################################################### - -qt_internal_add_plugin(QTestSensorGestureDupPlugin - OUTPUT_NAME qtsensorgestures_testplugin1 - PLUGIN_TYPE sensorgestures - DEFAULT_IF FALSE - SOURCES - qtest2recognizerduo.cpp - qtest2recognizerdup.h - qtestrecognizerdup.cpp qtestrecognizerdup.h - qtestsensorgestureplugindup.cpp qtestsensorgestureplugindup_p.h - DEFINES - QT_DISABLE_DEPRECATED_BEFORE=0 - LIBRARIES - Qt::Core - Qt::Gui - Qt::Sensors - Qt::SensorGestures -) diff --git a/tests/auto/qsensorgestures/plugins/test1/qtest2recognizerdup.cpp b/tests/auto/qsensorgestures/plugins/test1/qtest2recognizerdup.cpp deleted file mode 100644 index 96c35c98..00000000 --- a/tests/auto/qsensorgestures/plugins/test1/qtest2recognizerdup.cpp +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include "qtest2recognizerdup.h" - -#include "qtestsensorgestureplugindup.h" - -QTest2RecognizerDup::QTest2RecognizerDup(QObject *parent) - : QSensorGestureRecognizer(parent), - active(0) -{ -} - -QTest2RecognizerDup::~QTest2RecognizerDup() -{ -} - -bool QTest2RecognizerDup::start() -{ - Q_EMIT test2_dup(); - - active = true; - - return true; -} - -bool QTest2RecognizerDup::stop() -{ - active = false; - return true; -} - -bool QTest2RecognizerDup::isActive() -{ - return active; -} - - -void QTest2RecognizerDup::create() -{ - active = false; -} - -QString QTest2RecognizerDup::id() const -{ - return QString("QtSensors.test.dup"); -} - -int QTest2RecognizerDup::thresholdTime() const -{ - return timerTimeout; -} - -void QTest2RecognizerDup::setThresholdTime(int msec) -{ - timer->setInterval(msec); -} - diff --git a/tests/auto/qsensorgestures/plugins/test1/qtest2recognizerdup.h b/tests/auto/qsensorgestures/plugins/test1/qtest2recognizerdup.h deleted file mode 100644 index a32bc181..00000000 --- a/tests/auto/qsensorgestures/plugins/test1/qtest2recognizerdup.h +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#ifndef QTEST2RECOGNIZERDUP_H -#define QTEST2RECOGNIZERDUP_H - -#include <qsensorgesturerecognizer.h> - -class QTest2RecognizerDup : public QSensorGestureRecognizer -{ - Q_OBJECT - -public: - QTest2RecognizerDup(QObject *parent = 0); - ~QTest2RecognizerDup(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - - int thresholdTime() const; - void setThresholdTime(int msec); - -Q_SIGNALS: - void test2_dup(); - -private: - int timerTimeout; - QTimer *timer; - bool active; -}; - - -#endif // QTEST2RECOGNIZERDUP_H diff --git a/tests/auto/qsensorgestures/plugins/test1/qtestrecognizerdup.cpp b/tests/auto/qsensorgestures/plugins/test1/qtestrecognizerdup.cpp deleted file mode 100644 index bdd0155f..00000000 --- a/tests/auto/qsensorgestures/plugins/test1/qtestrecognizerdup.cpp +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include <QStringList> - -#include "qtestrecognizerdup.h" -#include "qtestsensorgestureplugindup.h" - -QTestRecognizerDup::QTestRecognizerDup(QObject *parent) - : QSensorGestureRecognizer(parent), - active(0) -{ -} - -QTestRecognizerDup::~QTestRecognizerDup() -{ -} - -bool QTestRecognizerDup::start() -{ - active = true; - Q_EMIT detected("test2_dup"); - Q_EMIT test2_dup(); - return true; -} - -bool QTestRecognizerDup::stop() -{ - active = false; - return true; -} - -bool QTestRecognizerDup::isActive() -{ - return active; -} - -void QTestRecognizerDup::create() -{ - active = false; -} - -QString QTestRecognizerDup::id() const -{ - return QString("QtSensors.test.dup"); -} - - -int QTestRecognizerDup::thresholdTime() const -{ - return timerTimeout; -} - -void QTestRecognizerDup::setThresholdTime(int msec) -{ - timer->setInterval(msec); -} diff --git a/tests/auto/qsensorgestures/plugins/test1/qtestrecognizerdup.h b/tests/auto/qsensorgestures/plugins/test1/qtestrecognizerdup.h deleted file mode 100644 index dcaa13c8..00000000 --- a/tests/auto/qsensorgestures/plugins/test1/qtestrecognizerdup.h +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#ifndef QTESTRECOGNIZERDUP_H -#define QTESTRECOGNIZERDUP_H - -#include <qsensorgesturerecognizer.h> - -class QTestRecognizerDup : public QSensorGestureRecognizer -{ - Q_OBJECT - Q_PROPERTY(int thresholdTime READ thresholdTime WRITE setThresholdTime) - -public: - - QTestRecognizerDup(QObject *parent = 0); - ~QTestRecognizerDup(); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - - int thresholdTime() const; - void setThresholdTime(int msec); - -Q_SIGNALS: - void test2_dup(); - -private: - int timerTimeout; - QTimer *timer; - bool active; - -}; - -#endif // QTESTRECOGNIZERDUP_H diff --git a/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.cpp b/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.cpp deleted file mode 100644 index 20c8a702..00000000 --- a/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.cpp +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include <QObject> -#include <QtPlugin> -#include <QStringList> -#include <QTimer> - -#include "qtestrecognizerdup.h" -#include "qtest2recognizerdup.h" - -#include "qtestsensorgestureplugindup.h" - -#include <qsensorgestureplugininterface.h> -#include <qsensorgesturerecognizer.h> -#include <qsensorgesturemanager.h> - - -QTestSensorGestureDupPlugin::QTestSensorGestureDupPlugin() -{ -} - -QTestSensorGestureDupPlugin::~QTestSensorGestureDupPlugin() -{ -} - -/*! - Describes this gesture's possible gesture signals. -handled through the detected(const QString &) signal. - */ -QStringList QTestSensorGestureDupPlugin::gestureSignals() const -{ - QStringList list; - for (const QSensorGestureRecognizer* rec : recognizersList) - list.append(rec->gestureSignals()); - return list; -} - -QList <QSensorGestureRecognizer *> QTestSensorGestureDupPlugin::createRecognizers() -{ - QSensorGestureRecognizer *sRec = new QTestRecognizerDup(this); - recognizersList.append(sRec); - - QSensorGestureRecognizer *sRec2 = new QTest2RecognizerDup(this); - recognizersList.append(sRec2); - - return recognizersList; -} - -QStringList QTestSensorGestureDupPlugin::supportedIds() const -{ - QStringList list; - list << "QtSensors.test.dup"; - list << "QtSensors.test.dup"; - - return list; -} - -QList<QSensorGestureRecognizer*> QTestSensorGestureDupPlugin::recognizers() const -{ - return recognizersList; -} - -QString QTestSensorGestureDupPlugin::name() const -{ - return "TestGesturesDup"; -} diff --git a/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.h b/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.h deleted file mode 100644 index 880f5c03..00000000 --- a/tests/auto/qsensorgestures/plugins/test1/qtestsensorgestureplugindup.h +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#ifndef QTESTSENSORGESTUREDUPPLUGIN_H -#define QTESTSENSORGESTUREDUPPLUGIN_H - -#include <QObject> -#include <qsensorgestureplugininterface.h> - -class QTestSensorGestureDupPlugin : public QObject, public QSensorGesturePluginInterface -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.QSensorGesturePluginInterface") - Q_INTERFACES(QSensorGesturePluginInterface) - -public: - explicit QTestSensorGestureDupPlugin(); - ~QTestSensorGestureDupPlugin(); - - - QList<QSensorGestureRecognizer *> createRecognizers() override; - - QStringList gestureSignals() const; - QStringList supportedIds() const override; - QString name() const override; - - QList<QSensorGestureRecognizer*> recognizers() const; - - QList<QSensorGestureRecognizer*> recognizersList; - -}; - - - -#endif // QTESTSENSORGESTUREDUPPLUGIN_H diff --git a/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp b/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp deleted file mode 100644 index 7b8283bf..00000000 --- a/tests/auto/qsensorgestures/tst_qsensorgesturetest.cpp +++ /dev/null @@ -1,590 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include <QtCore/QString> -#include <QtTest/QtTest> -#include <QDebug> -#include <QVariant> -#include <QSignalSpy> - -#include <qsensorgesture.h> -#include <qsensorgesturemanager.h> - -#include <qsensorgesturerecognizer.h> -#include <qsensorgestureplugininterface.h> - -Q_IMPORT_PLUGIN(QTestSensorGesturePlugin) -Q_IMPORT_PLUGIN(QTestSensorGestureDupPlugin) - -static QString removeParens(const QString &arg) -{ - return arg.left(arg.indexOf("(")); -} - -class QSensorGestureWithSlots : public QObject -{ - Q_OBJECT -public: - QSensorGestureWithSlots(const QStringList &ids) - : gesture(new QSensorGesture(ids, this)) - { - } - - QSensorGesture *gesture; - -public slots: - void startDetection() - { - gesture->startDetection(); - } - - void stopDetection() - { - gesture->stopDetection(); - } -}; - -class QTest3Recognizer : public QSensorGestureRecognizer -{ - Q_OBJECT - -public: - - QTest3Recognizer(QObject *parent = 0); - - void create() override; - - QString id() const override; - bool start() override; - bool stop() override; - bool isActive() override; - void changeId(const QString &); - - QString recognizerId; -}; - -QTest3Recognizer::QTest3Recognizer(QObject *parent) : QSensorGestureRecognizer(parent), - recognizerId("QtSensors/test3"){} - -void QTest3Recognizer::create(){} - -QString QTest3Recognizer::id() const{ return recognizerId; } -bool QTest3Recognizer::start(){return true;} -bool QTest3Recognizer::stop() { return true;} -bool QTest3Recognizer::isActive() { return true; } -void QTest3Recognizer::changeId(const QString &id) -{ - recognizerId = id; -} - - -class Tst_qsensorgestureTest : public QObject -{ - Q_OBJECT - -public: - Tst_qsensorgestureTest(); - -private Q_SLOTS: - void tst_sensor_gesture_notinitialized(); - - void tst_recognizer_dup(); //comes first to weed out messages - - void tst_manager(); - void tst_manager_gestureids(); - void tst_manager_recognizerSignals(); - void tst_manager_registerSensorGestureRecognizer(); - void tst_manager__newSensorAvailable(); - - void tst_sensor_gesture_signals(); - void tst_sensor_gesture_threaded(); - - void tst_sensor_gesture(); - - void tst_recognizer(); - - void tst_sensorgesture_noid(); - - void tst_sensor_gesture_multi(); - - void shakeDetected(const QString &); - - -private: - QString currentSignal; -}; - -Tst_qsensorgestureTest::Tst_qsensorgestureTest() -{ -} - -void Tst_qsensorgestureTest::tst_recognizer_dup() -{ - QStringList idList; - { -// QTest::ignoreMessage(QtWarningMsg, "\"QtSensors.test.dup\" from the plugin \"TestGesturesDup\" is already known."); - QSensorGestureManager manager; - idList = manager.gestureIds(); - - for (int i = 0; i < idList.count(); i++) { - if (idList.at(i) == "QtSensors.test.dup") - QTest::ignoreMessage(QtWarningMsg, "Ignoring recognizer \"QtSensors.test.dup\" from plugin \"TestGesturesDup\" because it is already registered"); - QStringList recognizerSignalsList = manager.recognizerSignals(idList.at(i)); - - QVERIFY(!recognizerSignalsList.contains("QtSensors.test2")); - } - - QScopedPointer<QSensorGesture> sensorGesture(new QSensorGesture(idList)); - QVERIFY(sensorGesture->validIds().contains("QtSensors.test2")); - QVERIFY(sensorGesture->validIds().contains("QtSensors.test")); - QVERIFY(sensorGesture->validIds().contains("QtSensors.test.dup")); - } - - QScopedPointer<QSensorGesture> thisGesture; - QString plugin; - plugin = "QtSensors.test2"; - thisGesture.reset(new QSensorGesture(QStringList() << plugin)); - QVERIFY(thisGesture->validIds().contains("QtSensors.test2")); - - plugin = "QtSensors.test.dup"; - thisGesture.reset(new QSensorGesture(QStringList() << plugin)); - QVERIFY(!thisGesture->validIds().contains("QtSensors.test2")); -} - -void Tst_qsensorgestureTest::tst_manager() -{ - QSensorGestureManager *manager2; - manager2 = new QSensorGestureManager(this); - QVERIFY(manager2 != 0); - delete manager2; -} - -void Tst_qsensorgestureTest::tst_manager_gestureids() -{ - QStringList idList; - QSensorGestureManager manager; - idList = manager.gestureIds(); - - QVERIFY(idList.count() > 0); - - QVERIFY(idList.contains("QtSensors.test")); - QVERIFY(idList.contains("QtSensors.test2")); - QVERIFY(idList.contains("QtSensors.test.dup")); -} - -void Tst_qsensorgestureTest::tst_manager_recognizerSignals() -{ - QStringList idList; - - QSensorGestureManager manager; - idList = manager.gestureIds(); - - idList.removeOne("QtSensors.test.dup"); - - for (int i = 0; i < idList.count(); i++) { - - QStringList recognizerSignalsList = manager.recognizerSignals(idList.at(i)); - - if (idList.at(i) == "QtSensors.test") { - QStringList signalList; - signalList << "detected(QString)"; - signalList << "tested()"; - QCOMPARE(recognizerSignalsList.count(), 2); - - QCOMPARE(recognizerSignalsList, signalList); - - } else if (idList.at(i) == "QtSensors.test2") { - QStringList signalList; - signalList << "detected(QString)"; - signalList << "test2()"; - signalList << "test3(bool)"; - - QCOMPARE(recognizerSignalsList.count(), 3); - QCOMPARE(recognizerSignalsList, signalList); - } - } -} - -void Tst_qsensorgestureTest::tst_manager_registerSensorGestureRecognizer() -{ - QSensorGestureManager manager; - int num = manager.gestureIds().count(); - QSensorGestureRecognizer *recognizer = new QTest3Recognizer; - bool ok = manager.registerSensorGestureRecognizer(recognizer); - QCOMPARE(ok, true); - QCOMPARE(num+1, manager.gestureIds().count()); - - recognizer = new QTest3Recognizer; -// QTest::ignoreMessage(QtWarningMsg, "\"QtSensors/test3\" is already known"); - ok = manager.registerSensorGestureRecognizer(recognizer); - QCOMPARE(ok, false); - QCOMPARE(num+1, manager.gestureIds().count()); -} - -void Tst_qsensorgestureTest::tst_manager__newSensorAvailable() -{ - QSensorGestureManager manager; - QSensorGestureManager manager2; - - QSignalSpy spy_manager_available(&manager, SIGNAL(newSensorGestureAvailable())); - QSignalSpy spy_manager2_available(&manager2, SIGNAL(newSensorGestureAvailable())); - - manager.gestureIds(); - QCOMPARE(spy_manager_available.count(),0); - QCOMPARE(spy_manager2_available.count(),0); - - QTest3Recognizer *recognizer = new QTest3Recognizer; - recognizer->changeId("QtSensors.test4"); - - bool ok = manager.registerSensorGestureRecognizer(recognizer); - QCOMPARE(ok, true); - QCOMPARE(spy_manager_available.count(),1); - - recognizer = new QTest3Recognizer; - recognizer->changeId("QtSensors.test4"); -// QTest::ignoreMessage(QtWarningMsg, "\"QtSensors.test4\" is already known"); - ok = manager.registerSensorGestureRecognizer(recognizer); - QCOMPARE(ok, false); - QCOMPARE(spy_manager_available.count(),1); - QCOMPARE(spy_manager2_available.count(),1); - - QScopedPointer<QSensorGesture> test4sg; - test4sg.reset(new QSensorGesture(QStringList() << "QtSensors.test4")); - QVERIFY(!test4sg->validIds().isEmpty()); - QVERIFY(test4sg->invalidIds().isEmpty()); -} - - -void Tst_qsensorgestureTest::tst_sensor_gesture_signals() -{ - QStringList testidList; - testidList << "QtSensors.test"; - testidList << "QtSensors.test2"; - - for (const QString &plugin : testidList) { - - QScopedPointer<QSensorGesture> thisGesture(new QSensorGesture(QStringList() << plugin)); - - QSignalSpy spy_gesture_detected(thisGesture.data(), SIGNAL(detected(QString))); - QScopedPointer<QSignalSpy> spy_gesture_tested(0); - - if (plugin == "QtSensors.test") { - QStringList signalList; - signalList << "detected(QString)"; - signalList << "tested()"; - - QCOMPARE(thisGesture->gestureSignals().count(), 2); - QCOMPARE(thisGesture->gestureSignals(), signalList); - - QCOMPARE(thisGesture->gestureSignals().at(1), QString("tested()")); - - spy_gesture_tested.reset(new QSignalSpy(thisGesture.data(), SIGNAL(tested()))); - } else if (plugin == "QtSensors.test2") { - QStringList signalList; - signalList << "detected(QString)"; - signalList << "test2()"; - signalList << "test3(bool)"; - QCOMPARE(thisGesture->gestureSignals().count(), 3); - QCOMPARE(thisGesture->gestureSignals(), signalList); - - QCOMPARE(thisGesture->gestureSignals().at(1), QString("test2()")); - spy_gesture_tested.reset(new QSignalSpy(thisGesture.data(), SIGNAL(test2()))); - } - - QVERIFY(!thisGesture->validIds().isEmpty()); - thisGesture->startDetection(); - - QCOMPARE(spy_gesture_detected.count(),1); - - if (plugin == "QtSensors.test") { - QCOMPARE(spy_gesture_tested->count(),1); - QList<QVariant> arguments ; - arguments = spy_gesture_detected.takeFirst(); // take the first signal - QCOMPARE(arguments.at(0).toString(), QString("tested")); - } else if (plugin == "QtSensors.test2") { - QCOMPARE(spy_gesture_tested->count(),1); - } - } - -} - - -void Tst_qsensorgestureTest::tst_sensor_gesture_threaded() -{ - - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(QStringList() << "QtSensors.test")); - - QScopedPointer<QThread> thread(new QThread); - QScopedPointer<QSensorGestureWithSlots> t_gesture(new QSensorGestureWithSlots(QStringList() << "QtSensors.test")); - t_gesture->moveToThread(thread.data()); - - currentSignal = removeParens(gesture->gestureSignals().at(0)); - - QSignalSpy thread_gesture(t_gesture->gesture, SIGNAL(detected(QString))); - QSignalSpy spy_gesture2(gesture.data(), SIGNAL(detected(QString))); - - QCOMPARE(gesture->isActive(),false); - gesture->startDetection(); - - QCOMPARE(thread_gesture.count(),0); - QCOMPARE(spy_gesture2.count(),1); - - QCOMPARE(gesture->isActive(),true); - - thread->start(); - QTimer::singleShot(0, t_gesture.data(), SLOT(startDetection())); // Delivered on the thread - - QTRY_COMPARE(t_gesture->gesture->isActive(),true); - - QTRY_VERIFY(thread_gesture.count() > 0); - spy_gesture2.clear(); - QTRY_VERIFY(spy_gesture2.count() > 0); - - QTimer::singleShot(0, t_gesture.data(), SLOT(stopDetection())); // Delivered on the thread - - QTRY_COMPARE(t_gesture->gesture->isActive(),false); - QCOMPARE(gesture->isActive(),true); - - thread->quit(); - thread->wait(); -} - -void Tst_qsensorgestureTest::tst_sensor_gesture() -{ - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(QStringList() << "QtSensors.test")); - - QScopedPointer<QSensorGesture> gesture2(new QSensorGesture(QStringList() << "QtSensors.test2")); - QScopedPointer<QSensorGesture> gesture3(new QSensorGesture(QStringList() << "QtSensors.test2")); - - QCOMPARE(gesture->validIds(),QStringList() << "QtSensors.test"); - - QCOMPARE(gesture->gestureSignals().at(1), QString("tested()")); - - QVERIFY(gesture->invalidIds().isEmpty()); - QVERIFY(gesture2->invalidIds().isEmpty()); - QVERIFY(gesture3->invalidIds().isEmpty()); - - currentSignal = removeParens(gesture->gestureSignals().at(1)); - - QSignalSpy spy_gesture(gesture.data(), SIGNAL(detected(QString))); - - QSignalSpy spy_gesture2(gesture2.data(), SIGNAL(detected(QString))); - - QSignalSpy spy_gesture3_detected(gesture3.data(), SIGNAL(detected(QString))); - - QSignalSpy spy_gesture4_test2(gesture3.data(), SIGNAL(test2())); - QSignalSpy spy_gesture5_test3(gesture3.data(), SIGNAL(test3(bool))); - - - QCOMPARE(gesture->isActive(),false); - gesture->startDetection(); - - QCOMPARE(spy_gesture.count(),1); - - QCOMPARE(gesture->isActive(),true); - QCOMPARE(gesture2->validIds(),QStringList() <<"QtSensors.test2"); - QCOMPARE(gesture2->gestureSignals().at(1), QString("test2()")); - currentSignal = removeParens(gesture2->gestureSignals().at(1)); - - connect(gesture2.data(),SIGNAL(detected(QString)), - this,SLOT(shakeDetected(QString))); - - QCOMPARE(gesture2->isActive(),false); - - gesture2->startDetection(); - - QCOMPARE(gesture2->isActive(),true); - - QCOMPARE(spy_gesture2.count(),1); - - QCOMPARE(spy_gesture3_detected.count(),0); - - gesture2->stopDetection(); - - QCOMPARE(gesture2->isActive(),false); - QCOMPARE(gesture3->isActive(),false); - - gesture3->startDetection(); - - QCOMPARE(gesture3->isActive(),true); - QCOMPARE(gesture2->isActive(),false); - - QCOMPARE(spy_gesture.count(),1); - - QCOMPARE(spy_gesture2.count(),1); - - - QCOMPARE(spy_gesture3_detected.count(),1); - - QCOMPARE(spy_gesture4_test2.count(),1); - - QCOMPARE(spy_gesture5_test3.count(),1); - - QList<QVariant> arguments2 = spy_gesture5_test3.takeFirst(); - QCOMPARE(arguments2.at(0).toBool(), true); -} - -void Tst_qsensorgestureTest::tst_recognizer() -{ - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(QStringList() << "QtSensors.test")); - QScopedPointer<QSensorGesture> gesture2(new QSensorGesture(QStringList() << "QtSensors.test")); - - QSignalSpy spy_gesture(gesture.data(), SIGNAL(detected(QString))); - QSignalSpy spy_gesture2(gesture2.data(), SIGNAL(detected(QString))); - - QCOMPARE(gesture->isActive(),false); - QCOMPARE(gesture2->isActive(),false); - - currentSignal = removeParens(gesture2->gestureSignals().at(0)); - - gesture2->startDetection();//activate 2 - - QCOMPARE(gesture->isActive(),false); - QCOMPARE(gesture2->isActive(),true); - - QCOMPARE(spy_gesture.count(),0); - - QCOMPARE(spy_gesture2.count(),1); - - QList<QVariant> arguments = spy_gesture2.takeFirst(); - QCOMPARE(arguments.at(0).toString(), QString("tested")); - - QCOMPARE(spy_gesture2.count(),0); - - gesture->startDetection(); //activate 1 - - QCOMPARE(gesture->isActive(),true); - QCOMPARE(gesture2->isActive(),true); - - QTRY_COMPARE(spy_gesture.count(),1); - - QCOMPARE(spy_gesture2.count(),1); - - arguments = spy_gesture.takeFirst(); // take the first signal - QCOMPARE(arguments.at(0).toString(), QString("tested")); - spy_gesture2.removeFirst(); - - gesture->stopDetection(); //stop 1 gesture object - - QCOMPARE(gesture->isActive(),false); - QCOMPARE(gesture2->isActive(),true); - - spy_gesture2.clear(); - gesture2->startDetection(); - - QCOMPARE(gesture->isActive(),false); - QCOMPARE(spy_gesture.count(),0); - - QCOMPARE(gesture2->isActive(),true); - - QTRY_COMPARE(spy_gesture2.count(), 1); -} - - -void Tst_qsensorgestureTest::tst_sensorgesture_noid() -{ - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(QStringList() << "QtSensors.noid")); - QVERIFY(gesture->validIds().isEmpty()); - QCOMPARE(gesture->invalidIds(), QStringList() << "QtSensors.noid"); - - QTest::ignoreMessage(QtWarningMsg, "QSignalSpy: No such signal: 'detected(QString)'"); - QSignalSpy spy_gesture(gesture.data(), SIGNAL(detected(QString))); - - QCOMPARE(spy_gesture.count(),0); - - gesture->startDetection(); - QCOMPARE(gesture->isActive(),false); - QCOMPARE(spy_gesture.count(),0); - - gesture->stopDetection(); - QCOMPARE(gesture->isActive(),false); - QCOMPARE(spy_gesture.count(),0); - - QVERIFY(gesture->gestureSignals().isEmpty()); - - QCOMPARE(gesture->invalidIds() ,QStringList() << "QtSensors.noid"); - - QSensorGestureManager manager; - QStringList recognizerSignalsList = manager.recognizerSignals( "QtSensors.noid"); - QVERIFY(recognizerSignalsList.isEmpty()); - - QVERIFY(!recognizerSignalsList.contains("QtSensors.noid")); - - QSensorGestureRecognizer *fakeRecognizer = manager.sensorGestureRecognizer("QtSensors.noid"); - QVERIFY(!fakeRecognizer); -} - -void Tst_qsensorgestureTest::tst_sensor_gesture_multi() -{ - - QStringList ids; - ids << "QtSensors.test"; - ids <<"QtSensors.test2"; - ids << "QtSensors.bogus"; - - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(ids)); - QStringList gestureSignals = gesture->gestureSignals(); - - gestureSignals.removeDuplicates() ; - QCOMPARE(gestureSignals, gesture->gestureSignals()); - - QCOMPARE(gesture->gestureSignals().count(), 4); - QCOMPARE(gesture->invalidIds(), QStringList() << "QtSensors.bogus"); - - QCOMPARE(gesture->isActive(),false); - - QSignalSpy spy_gesture_detected(gesture.data(), SIGNAL(detected(QString))); - gesture->startDetection(); - QCOMPARE(gesture->isActive(),true); - QCOMPARE(spy_gesture_detected.count(),2); - - QList<QVariant> arguments ; - arguments = spy_gesture_detected.takeAt(0); - QCOMPARE(arguments.at(0).toString(), QString("tested")); - - arguments = spy_gesture_detected.takeAt(0); - QCOMPARE(arguments.at(0).toString(), QString("test2")); - - QTRY_COMPARE(spy_gesture_detected.count(),1); - - gesture->stopDetection(); - - QCOMPARE(gesture->isActive(),false); - - { - QSensorGestureManager manager; - QVERIFY(!manager.gestureIds().contains("QtSensors.bogus")); - QSensorGestureRecognizer *recognizer = manager.sensorGestureRecognizer("QtSensors.bogus"); - QVERIFY(recognizer == 0); - } - -} - -void Tst_qsensorgestureTest::shakeDetected(const QString &type) -{ - QCOMPARE(type,currentSignal); -} - -void Tst_qsensorgestureTest::tst_sensor_gesture_notinitialized() -{ - QTest::ignoreMessage(QtWarningMsg, "\"QtSensors.test.dup\" from the plugin \"TestGesturesDup\" is already known."); - QSensorGestureManager manager; - QSensorGestureRecognizer *recognizer = manager.sensorGestureRecognizer("QtSensors.test"); - - QTest::ignoreMessage(QtWarningMsg, "Not starting. Gesture Recognizer not initialized"); - recognizer->startBackend(); - QVERIFY(recognizer->isActive() == false); - - QTest::ignoreMessage(QtWarningMsg, "Not stopping. Gesture Recognizer not initialized"); - recognizer->stopBackend(); - QVERIFY(recognizer->isActive() == false); - - recognizer->createBackend(); - QVERIFY(recognizer->isActive() == false); - -} - - -QTEST_MAIN(Tst_qsensorgestureTest); - -#include "tst_qsensorgesturetest.moc" diff --git a/tests/auto/qsensorgestures_gestures/CMakeLists.txt b/tests/auto/qsensorgestures_gestures/CMakeLists.txt deleted file mode 100644 index ff79dd5b..00000000 --- a/tests/auto/qsensorgestures_gestures/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -##################################################################### -## tst_sensorgestures_gestures Test: -##################################################################### - -# Collect test data -file(GLOB_RECURSE test_data_glob - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - mock_data/* - dataset2_mock_data/*) -list(APPEND test_data ${test_data_glob}) - -qt_internal_add_test(tst_sensorgestures_gestures - SOURCES - mockbackends.h - mockcommon.cpp mockcommon.h - tst_sensorgestures_gestures.cpp - LIBRARIES - Qt::SensorsPrivate -) - -qt_internal_add_resource(tst_sensorgestures_gestures - "tst_sensorgestures_gestures_testdata" - PREFIX "/" - FILES ${test_data}) diff --git a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_cover.dat b/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_cover.dat deleted file mode 100644 index abbaf6e8..00000000 --- a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_cover.dat +++ /dev/null @@ -1,249 +0,0 @@ -accelerometer: 9710710777,-0.210793,0,9.58148 -accelerometer: 9710731162,-0.19163,0,9.56232 -orientation:9701320823,5 -proximity:9710737980,0 -irProximity:9710740238,0 -accelerometer: 9710750663,0.0574889,0.153304,9.94558 -accelerometer: 9710770805,-0.172467,0.0958148,9.65814 -accelerometer: 9710792014,-0.134141,0.0766519,9.65814 -accelerometer: 9710810844,-0.0766519,0.153304,9.84977 -accelerometer: 9710830680,-0.153304,0.0574889,9.60065 -irProximity:9710841251,0.152941 -accelerometer: 9710850852,0.0958148,0.0766519,9.94558 -accelerometer: 9710870872,-0.172467,0.0383259,9.6773 -accelerometer: 9710890830,0.0383259,0.0766519,9.84977 -accelerometer: 9710910850,-0.0574889,0.0958148,9.73479 -accelerometer: 9710930656,-0.114978,0.0766519,9.71563 -irProximity:9710941898,0 -accelerometer: 9710950858,0.0383259,0.0958148,9.86893 -accelerometer: 9710970847,-0.134141,0.114978,9.69646 -accelerometer: 9710990684,-0.019163,0.114978,9.86893 -accelerometer: 9711010825,-0.0574889,0.114978,9.77311 -accelerometer: 9711030845,-0.114978,0.0766519,9.71563 -accelerometer: 9711050803,-0.0383259,0.134141,9.81144 -accelerometer: 9711070884,-0.0766519,0.0958148,9.73479 -accelerometer: 9711090843,-0.0766519,0.114978,9.75395 -accelerometer: 9711110648,-0.019163,0.0766519,9.79228 -accelerometer: 9711130821,-0.0574889,0.0574889,9.71563 -irProximity:9711143253,0.0941176 -accelerometer: 9711150993,0.0383259,0.114978,9.69646 -accelerometer: 9711170646,-0.0574889,0.0766519,9.69646 -accelerometer: 9711190818,-0.0766519,0.114978,9.77311 -accelerometer: 9711210716,-0.0766519,0.0958148,9.77311 -accelerometer: 9711230827,-0.0574889,0.0766519,9.69646 -irProximity:9711243931,0.341176 -accelerometer: 9711250877,-0.0383259,0.153304,9.6773 -accelerometer: 9711270896,-0.019163,0.134141,9.69646 -proximity:9711272178,1 -accelerometer: 9711290855,-0.0574889,0.0574889,9.65814 -accelerometer: 9711310844,-0.0574889,0.0958148,9.77311 -accelerometer: 9711330833,-0.019163,0.134141,9.71563 -irProximity:9711344639,0.478431 -accelerometer: 9711350669,-0.0766519,0.0574889,9.71563 -accelerometer: 9711370994,-0.0383259,0.0958148,9.71563 -accelerometer: 9711390830,-0.0958148,0.0766519,9.73479 -accelerometer: 9711410850,-0.0766519,0.0574889,9.77311 -accelerometer: 9711430839,-0.0574889,0.0766519,9.75395 -accelerometer: 9711450675,-0.0766519,0.114978,9.77311 -accelerometer: 9711470878,-0.019163,0.0958148,9.73479 -accelerometer: 9711490836,-0.0383259,0.134141,9.6773 -accelerometer: 9711510825,-0.0383259,0.114978,9.73479 -accelerometer: 9711530662,-0.019163,0.0958148,9.75395 -accelerometer: 9711550834,-0.0574889,0.0574889,9.77311 -accelerometer: 9711570792,-0.019163,0.0574889,9.77311 -accelerometer: 9711590659,-0.0574889,0.0766519,9.71563 -accelerometer: 9711610526,-0.114978,0.0958148,9.77311 -accelerometer: 9711630576,-0.0958148,0.0574889,9.69646 -accelerometer: 9711650626,-0.0383259,0.0766519,9.79228 -accelerometer: 9711670585,-0.0574889,0.0383259,9.81144 -accelerometer: 9711690604,0,0.134141,9.75395 -accelerometer: 9711710594,-0.0574889,0.0766519,9.73479 -accelerometer: 9711730552,0,0.0574889,9.75395 -accelerometer: 9711750541,-0.0574889,0.0766519,9.73479 -accelerometer: 9711770469,-0.019163,0.153304,9.71563 -accelerometer: 9711791923,0.019163,0.0958148,9.86893 -accelerometer: 9711810661,-0.0383259,0.0958148,9.88809 -accelerometer: 9711830619,-0.172467,0.114978,9.6773 -accelerometer: 9711850761,-0.268282,0.0383259,9.58148 -accelerometer: 9711870506,-0.172467,0.0766519,9.79228 -accelerometer: 9711890647,-0.19163,0.0574889,9.77311 -accelerometer: 9711910697,-0.249119,0.0574889,9.73479 -accelerometer: 9711930686,-0.153304,0.019163,9.79228 -accelerometer: 9711950614,-0.249119,0.0958148,9.61981 -accelerometer: 9711970634,-0.210793,0.153304,9.77311 -accelerometer: 9711990684,-0.229956,0.0383259,9.75395 -accelerometer: 9712010642,-0.210793,0.019163,9.65814 -accelerometer: 9712030814,-0.268282,0.114978,9.77311 -accelerometer: 9712050834,-0.210793,0.0766519,9.75395 -accelerometer: 9712070854,-0.153304,0.0766519,9.77311 -accelerometer: 9712090843,-0.19163,0.0958148,9.77311 -accelerometer: 9712110832,-0.210793,0.0958148,9.75395 -accelerometer: 9712130882,-0.172467,0.0766519,9.71563 -accelerometer: 9712150810,-0.153304,0.0383259,9.73479 -accelerometer: 9712170799,-0.249119,0.0766519,9.6773 -accelerometer: 9712190666,-0.172467,0.0766519,9.73479 -accelerometer: 9712210777,-0.172467,0.0766519,9.71563 -accelerometer: 9712230827,-0.153304,0.0574889,9.75395 -accelerometer: 9712250846,-0.172467,0.0383259,9.77311 -accelerometer: 9712270835,-0.249119,0.0958148,9.75395 -accelerometer: 9712290824,-0.19163,0.0383259,9.6773 -accelerometer: 9712310844,-0.153304,0.114978,9.79228 -accelerometer: 9712330833,-0.134141,0.0958148,9.77311 -accelerometer: 9712350822,-0.210793,0.0574889,9.73479 -accelerometer: 9712370597,-0.153304,0.0958148,9.77311 -accelerometer: 9712390769,-0.287445,0.0958148,9.77311 -accelerometer: 9712410850,-0.172467,0.0766519,9.75395 -accelerometer: 9712430656,-0.153304,0.0766519,9.71563 -accelerometer: 9712450645,-0.172467,0.0958148,9.77311 -accelerometer: 9712470847,-0.153304,0.0958148,9.65814 -accelerometer: 9712490836,-0.134141,0.0574889,9.79228 -accelerometer: 9712510825,-0.153304,0.0766519,9.73479 -accelerometer: 9712530845,-0.210793,0.0574889,9.6773 -accelerometer: 9712550803,-0.210793,0.0958148,9.77311 -accelerometer: 9712570792,-0.19163,0.0383259,9.75395 -accelerometer: 9712590659,-0.19163,0.0958148,9.69646 -accelerometer: 9712610648,-0.229956,0.0958148,9.6773 -accelerometer: 9712630851,-0.172467,0.0766519,9.79228 -accelerometer: 9712650840,-0.229956,0.114978,9.71563 -accelerometer: 9712670829,-0.19163,0.0958148,9.69646 -accelerometer: 9712690849,-0.19163,0.114978,9.77311 -accelerometer: 9712710838,-0.172467,0.019163,9.77311 -accelerometer: 9712730827,-0.134141,0.114978,9.79228 -accelerometer: 9712750816,-0.19163,0.0383259,9.75395 -accelerometer: 9712770805,-0.249119,0.0766519,9.73479 -accelerometer: 9712792320,-0.153304,0.0383259,9.6773 -accelerometer: 9712810874,-0.153304,0.0574889,9.84977 -accelerometer: 9712830833,-0.172467,0.0574889,9.75395 -accelerometer: 9712850669,-0.172467,0.0766519,9.73479 -accelerometer: 9712870811,-0.210793,0.0958148,9.73479 -accelerometer: 9712890830,-0.210793,0.114978,9.75395 -accelerometer: 9712910850,-0.210793,0.0766519,9.6773 -accelerometer: 9712930839,-0.249119,0.0766519,9.6773 -accelerometer: 9712950797,-0.134141,0.0958148,9.96474 -accelerometer: 9712970817,-0.019163,0.19163,10.1947 -accelerometer: 9712990684,-0.287445,0.0383259,9.58148 -accelerometer: 9713010825,-0.249119,0.0958148,9.84977 -accelerometer: 9713030662,-0.19163,0.0383259,9.73479 -accelerometer: 9713050803,-0.287445,0.0766519,9.71563 -accelerometer: 9713070854,-0.249119,0.0383259,9.71563 -accelerometer: 9713090843,-0.229956,0.0383259,9.77311 -accelerometer: 9713110832,-0.210793,0.0383259,9.73479 -accelerometer: 9713130851,-0.268282,0.0958148,9.65814 -accelerometer: 9713150779,-0.210793,0.0574889,9.71563 -accelerometer: 9713170799,-0.19163,0.114978,9.77311 -accelerometer: 9713190879,-0.249119,0,9.75395 -accelerometer: 9713210655,-0.249119,0.0574889,9.73479 -accelerometer: 9713230827,-0.249119,0.0766519,9.71563 -accelerometer: 9713250877,-0.249119,0.114978,9.75395 -accelerometer: 9713270652,-0.249119,0.0958148,9.71563 -accelerometer: 9713290794,-0.249119,0.0574889,9.75395 -accelerometer: 9713310844,-0.19163,0.0958148,9.8306 -accelerometer: 9713330833,-0.249119,0.0383259,9.73479 -accelerometer: 9713350791,-0.229956,0.0766519,9.69646 -accelerometer: 9713370841,-0.249119,0.0766519,9.79228 -accelerometer: 9713390830,-0.249119,0.0383259,9.73479 -accelerometer: 9713410850,-0.287445,0.0766519,9.73479 -accelerometer: 9713430839,-0.229956,0.0574889,9.77311 -accelerometer: 9713450614,-0.249119,0.0383259,9.65814 -accelerometer: 9713470878,-0.229956,0.0958148,9.71563 -accelerometer: 9713490836,-0.306608,0.0958148,9.75395 -accelerometer: 9713510795,-0.249119,0.0766519,9.8306 -accelerometer: 9713530845,-0.249119,0.0574889,9.6773 -accelerometer: 9713551017,-0.268282,0.019163,9.73479 -accelerometer: 9713570884,-0.306608,0.0574889,9.77311 -accelerometer: 9713590659,-0.268282,0.0766519,9.61981 -accelerometer: 9713610832,-0.229956,0.0383259,9.8306 -accelerometer: 9713630668,-0.229956,0,9.71563 -accelerometer: 9713650810,-0.249119,0.0383259,9.65814 -accelerometer: 9713670829,-0.210793,0.0383259,9.71563 -accelerometer: 9713690666,-0.229956,0.0574889,9.79228 -accelerometer: 9713710807,-0.268282,0.153304,9.40902 -accelerometer: 9713730827,-0.287445,0.134141,9.56232 -accelerometer: 9713750511,0.594052,0.114978,10.233 -accelerometer: 9713770835,-0.210793,0.153304,9.63897 -accelerometer: 9713791343,-0.0766519,0.134141,9.56232 -accelerometer: 9713810874,-0.114978,0.114978,9.6773 -accelerometer: 9713830863,-0.153304,0.172467,9.60065 -accelerometer: 9713850883,0.153304,0.0766519,10.0797 -accelerometer: 9713870689,-0.229956,0.0958148,9.60065 -accelerometer: 9713890769,0.114978,0.0383259,9.94558 -accelerometer: 9713910850,-0.19163,0.0574889,9.63897 -accelerometer: 9713930839,-0.0574889,0.0958148,9.71563 -accelerometer: 9713950675,-0.019163,0.153304,9.75395 -irProximity:9713954380,0.0588235 -accelerometer: 9713970878,-0.19163,0.0574889,9.61981 -accelerometer: 9713990806,0.0958148,0.114978,10.0031 -proximity:9713991142,0 -accelerometer: 9714010642,-0.19163,0.0574889,9.60065 -accelerometer: 9714030845,-0.019163,0.0958148,9.77311 -accelerometer: 9714050651,0.0383259,0.153304,9.75395 -accelerometer: 9714070792,-0.134141,0.0766519,9.75395 -accelerometer: 9714090843,0.019163,0.0766519,9.81144 -accelerometer: 9714110648,-0.0574889,0.114978,9.6773 -accelerometer: 9714130851,-0.114978,0.0766519,9.73479 -accelerometer: 9714150535,-0.019163,0.0958148,9.81144 -irProximity:9714155857,0.141176 -accelerometer: 9714170829,-0.114978,0.0766519,9.71563 -accelerometer: 9714190849,-0.0766519,0.0958148,9.75395 -accelerometer: 9714210838,0.0383259,0.114978,9.86893 -accelerometer: 9714230827,-0.134141,0.0766519,9.65814 -accelerometer: 9714250694,-0.0574889,0.0958148,9.81144 -irProximity:9714256717,0.14902 -accelerometer: 9714270835,-0.019163,0.0958148,9.75395 -accelerometer: 9714290641,-0.0383259,0.0574889,9.69646 -accelerometer: 9714310813,0.019163,0.0574889,9.79228 -accelerometer: 9714330833,-0.0766519,0.114978,9.75395 -accelerometer: 9714350700,-0.0383259,0.114978,9.65814 -irProximity:9714357578,0.0196078 -accelerometer: 9714370872,-0.019163,0.0766519,9.77311 -accelerometer: 9714390830,-0.0383259,0.0958148,9.81144 -accelerometer: 9714410850,-0.0574889,0.0766519,9.71563 -accelerometer: 9714430656,-0.0383259,0.0766519,9.79228 -accelerometer: 9714450645,-0.0574889,0.114978,9.73479 -irProximity:9714458164,0.0117647 -accelerometer: 9714470664,-0.019163,0.134141,9.73479 -accelerometer: 9714490806,-0.0766519,0.134141,9.73479 -accelerometer: 9714510856,-0.0958148,0.114978,9.79228 -accelerometer: 9714530662,-0.0958148,0.0958148,9.77311 -accelerometer: 9714550620,-0.0958148,0.114978,9.81144 -irProximity:9714559055,0.101961 -accelerometer: 9714570854,-0.114978,0.0766519,9.79228 -accelerometer: 9714590659,-0.0958148,0.0766519,9.75395 -accelerometer: 9714610801,-0.0766519,0.0958148,9.73479 -accelerometer: 9714630851,-0.019163,0.0766519,9.73479 -accelerometer: 9714650688,-4.90572,0.114978,9.71563 -irProximity:9714659977,0 -accelerometer: 9714670829,-0.0383259,0.114978,9.73479 -accelerometer: 9714690849,-0.0383259,0.0958148,9.77311 -accelerometer: 9714710655,-0.0766519,0.114978,9.75395 -accelerometer: 9714730766,-0.0958148,0.0958148,9.73479 -accelerometer: 9714750694,-0.0958148,0.114978,9.81144 -irProximity:9714760837,0.12549 -accelerometer: 9714770866,-0.134141,0.0766519,9.71563 -accelerometer: 9714790550,-0.0766519,0.0383259,9.75395 -accelerometer: 9714810844,-0.0383259,0.114978,9.75395 -accelerometer: 9714830833,-0.0574889,0.114978,9.71563 -accelerometer: 9714850700,-0.0574889,0.0766519,9.73479 -irProximity:9714861515,0.0823529 -accelerometer: 9714870841,-0.0383259,0.0574889,9.69646 -accelerometer: 9714890647,-0.0766519,0.0958148,9.77311 -accelerometer: 9714910850,-0.0383259,0.0766519,9.75395 -accelerometer: 9714930839,-0.0383259,0.0574889,9.71563 -accelerometer: 9714950645,-0.0574889,0.114978,9.75395 -irProximity:9714962162,0.168627 -accelerometer: 9714970878,-0.0383259,0.172467,9.75395 -accelerometer: 9714991721,-0.459911,-0.172467,9.65814 -accelerometer: 9715010520,0.498237,0.0766519,10.3672 -accelerometer: 9715030662,-0.249119,0.0383259,9.54316 -accelerometer: 9715050651,-0.594052,0.019163,8.98743 -irProximity:9715062900,0.0352941 -accelerometer: 9715070670,-0.574889,0.0383259,9.06409 -accelerometer: 9715090659,-0.459911,0.0766519,9.25571 -accelerometer: 9715110679,-0.32577,0.019163,9.37069 -accelerometer: 9715130668,-0.210793,0.0383259,9.524 -accelerometer: 9715150901,-0.19163,0.0766519,9.61981 -irProximity:9715163547,0.184314 -accelerometer: 9715170554,-0.210793,0.153304,9.73479 -accelerometer: 9715190604,0.134141,0.0383259,10.5396 -accelerometer: 9715210655,-0.306608,0.0766519,9.77311 - diff --git a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_doubletap.dat b/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_doubletap.dat deleted file mode 100644 index 981d38ef..00000000 --- a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_doubletap.dat +++ /dev/null @@ -1,161 +0,0 @@ -accelerometer: 925170646,-0.5174,0.919823,8.39338 -accelerometer: 925190666,0.306608,0.344933,9.1599 -accelerometer: 925210685,0.421585,0.402422,10.1947 -orientation:910530601,5 -accelerometer: 925230552,-0.229956,0.114978,9.63897 -proximity:925232120,0 -accelerometer: 925250724,-0.0958148,0.0766519,9.58148 -accelerometer: 925270835,0.210793,0.440748,9.77311 -accelerometer: 925290824,0.0383259,0.5174,9.75395 -accelerometer: 925310844,-0.0766519,0.651541,9.71563 -accelerometer: 925330650,0.249119,0.498237,9.61981 -accelerometer: 925350852,0,0.689867,9.61981 -accelerometer: 925370841,0.0766519,0.70903,9.56232 -accelerometer: 925390861,0.153304,0.766519,9.84977 -accelerometer: 925410880,-0.114978,0.728193,9.92642 -accelerometer: 925430686,0.153304,0.766519,9.94558 -accelerometer: 925450858,-0.0766519,0.689867,9.6773 -accelerometer: 925470878,-0.287445,0.804845,9.65814 -accelerometer: 925490836,-0.153304,0.881497,10.0031 -accelerometer: 925510825,0.134141,0.747356,10.0031 -accelerometer: 925530692,0,0.689867,9.84977 -tap:926297152,1 -accelerometer: 925550864,-0.134141,0.594052,9.79228 -accelerometer: 925570701,-0.019163,0.824008,9.88809 -accelerometer: 925590934,0.153304,0.555726,9.8306 -accelerometer: 925610679,0.0958148,0.613215,9.84977 -accelerometer: 925630668,0.153304,0.804845,9.44734 -irProximity:925638583,0.027451 -accelerometer: 925650871,0.555726,0.594052,9.46651 -accelerometer: 925670860,0.574889,0.306608,9.37069 -accelerometer: 925690879,0.249119,0.958148,9.88809 -accelerometer: 925710868,0.613215,0.383259,9.98391 -accelerometer: 925730674,0.383259,0.651541,9.60065 -irProximity:925739444,0.109804 -accelerometer: 925750694,0.479074,0.498237,9.60065 -accelerometer: 925770774,0.594052,0.5174,9.8306 -accelerometer: 925790824,0.364096,0.594052,9.8306 -accelerometer: 925810844,0.364096,0.498237,9.81144 -accelerometer: 925830680,0.287445,0.555726,9.79228 -irProximity:925840304,0 -accelerometer: 925850883,0.364096,0.651541,9.65814 -accelerometer: 925870872,0.287445,0.613215,9.77311 -accelerometer: 925890830,0.383259,0.651541,9.94558 -accelerometer: 925910697,0.421585,0.555726,9.77311 -accelerometer: 925930686,0.210793,0.594052,9.6773 -irProximity:925941165,0.0666667 -accelerometer: 925950828,0.613215,0.498237,9.81144 -accelerometer: 925970878,0.613215,0.536563,9.81144 -accelerometer: 925990653,0.5174,0.536563,9.73479 -accelerometer: 926010673,-30.3158,7.87598,7.93347 -accelerometer: 926030662,3.37268,3.67929,11.0762 -irProximity:926041659,0.180392 -accelerometer: 926050865,0.996474,0.134141,10.2139 -accelerometer: 926070854,4.17753,0.555726,8.18259 -accelerometer: 926090690,-1.37973,-0.364096,9.08325 -accelerometer: 926110832,-0.344933,-0.0958148,10.9229 -accelerometer: 926130882,1.51387,0.364096,10.3097 -irProximity:926142459,0.105882 -accelerometer: 926150871,0.402422,0.134141,9.23655 -accelerometer: 926170677,1.07313,0.364096,9.1599 -accelerometer: 926190788,0.90066,0.459911,9.524 -accelerometer: 926210868,8.83413,-6.22797,9.25571 -accelerometer: 926230857,2.33788,1.45639,11.7469 -irProximity:926243167,0.137255 -accelerometer: 926250724,2.39537,0.689867,8.85329 -accelerometer: 926270927,3.43017,0.383259,6.74537 -accelerometer: 926290824,-1.93546,-0.689867,8.39338 -accelerometer: 926310874,-0.651541,0.555726,11.4595 -accelerometer: 926330833,1.13062,1.0348,10.7121 -irProximity:926343875,0.0941176 -accelerometer: 926350913,0.651541,0.670704,8.62334 -accelerometer: 926370841,0.938986,0.459911,8.69999 -accelerometer: 926390830,0.574889,0.555726,9.65814 -accelerometer: 926410697,-0.0383259,0.536563,10.118 -accelerometer: 926430839,0.0574889,0.5174,10.0031 -irProximity:926444522,0.0313726 -accelerometer: 926450675,0.0383259,0.402422,9.86893 -accelerometer: 926470847,0.114978,0.536563,9.81144 -accelerometer: 926490867,0.0766519,0.613215,9.8306 -accelerometer: 926510825,-0.019163,0.689867,9.6773 -accelerometer: 926530723,0.0958148,0.670704,9.75395 -irProximity:926545199,0.109804 -accelerometer: 926550681,0.134141,0.824008,9.81144 -accelerometer: 926571281,0.268282,0.70903,9.71563 -accelerometer: 926590720,0.19163,0.689867,9.63897 -accelerometer: 926610832,0.172467,0.613215,9.79228 -accelerometer: 926630973,-0.0958148,0.70903,9.86893 -irProximity:926645877,0 -accelerometer: 926650626,0,0.728193,10.2139 -accelerometer: 926670585,0.019163,0.632378,9.65814 -accelerometer: 926690879,0.0383259,0.689867,9.61981 -accelerometer: 926710868,-0.019163,0.785682,9.79228 -accelerometer: 926730857,-0.134141,0.824008,9.86893 -irProximity:926746554,0.0784314 -accelerometer: 926750877,-0.210793,0.843171,9.84977 -accelerometer: 926770835,-0.0766519,0.843171,9.71563 -accelerometer: 926790855,-0.172467,0.785682,9.44734 -accelerometer: 926810844,-0.19163,0.843171,9.48567 -accelerometer: 926830680,-0.383259,0.977311,9.81144 -irProximity:926847201,0.0980392 -accelerometer: 926850883,-0.287445,0.958148,9.77311 -accelerometer: 926870689,-0.306608,1.0348,9.6773 -accelerometer: 926890800,-0.32577,0.90066,9.6773 -accelerometer: 926910697,-0.287445,1.01564,9.81144 -accelerometer: 926930900,-0.344933,0.977311,9.65814 -irProximity:926947909,0.109804 -accelerometer: 926950889,-0.344933,0.977311,9.60065 -accelerometer: 926970878,-0.210793,0.958148,9.61981 -accelerometer: 926990684,-0.19163,0.919823,9.77311 -accelerometer: 927010642,-0.19163,0.90066,9.81144 -accelerometer: 927030814,-0.172467,0.881497,9.77311 -irProximity:927048617,0 -accelerometer: 927050834,-0.268282,0.804845,9.73479 -accelerometer: 927070854,-0.210793,0.824008,9.65814 -accelerometer: 927090843,-0.19163,0.804845,9.77311 -accelerometer: 927110832,-0.249119,0.881497,9.73479 -accelerometer: 927130882,-0.440748,0.728193,9.6773 -irProximity:927149356,0.0470588 -accelerometer: 927150840,-0.32577,0.804845,9.86893 -accelerometer: 927170829,-0.402422,0.862334,9.71563 -accelerometer: 927190696,-0.364096,0.804845,9.73479 -accelerometer: 927210777,-0.402422,0.804845,9.88809 -accelerometer: 927230827,-0.364096,0.804845,9.73479 -irProximity:927250369,0.0823529 -accelerometer: 927250541,-0.32577,0.70903,9.71563 -accelerometer: 927270805,-0.306608,0.728193,9.8306 -accelerometer: 927290672,-0.153304,0.785682,9.71563 -accelerometer: 927310813,-0.306608,0.766519,9.63897 -accelerometer: 927330863,-0.306608,0.728193,9.69646 -irProximity:927351077,0.0862745 -accelerometer: 927350883,-0.229956,0.804845,14.6597 -accelerometer: 927370872,-0.249119,0.843171,9.65814 -accelerometer: 927390830,-0.249119,0.881497,9.61981 -accelerometer: 927410850,-0.32577,0.843171,9.86893 -accelerometer: 927430686,-0.364096,0.824008,9.79228 -irProximity:927451632,0 -accelerometer: 927450492,-0.32577,0.804845,9.69646 -accelerometer: 927470847,-0.344933,0.785682,9.69646 -accelerometer: 927490836,-0.32577,0.766519,9.69646 -accelerometer: 927510825,-0.249119,0.804845,9.88809 -accelerometer: 927530875,-0.383259,0.766519,9.81144 -accelerometer: 927550987,-0.32577,0.728193,9.86893 -accelerometer: 927570884,-0.383259,0.785682,9.96474 -accelerometer: 927590904,-0.459911,0.728193,10.0606 -accelerometer: 927610862,-0.5174,0.728193,8.98743 -accelerometer: 927630851,-0.172467,0.958148,7.83765 -accelerometer: 927650657,-0.919823,1.01564,9.29404 -accelerometer: 927670677,-1.0348,1.09229,10.3288 -accelerometer: 927690696,-0.440748,0.919823,9.75395 -accelerometer: 927710594,-0.402422,0.843171,9.65814 -accelerometer: 927730521,-0.32577,1.20727,9.92642 -accelerometer: 927750633,-0.421585,1.34141,10.0222 -irProximity:927753695,0.054902 -accelerometer: 927770683,-0.5174,1.43722,9.86893 -accelerometer: 927790672,-0.459911,1.47555,10.118 -accelerometer: 927810691,-0.498237,1.20727,10.4821 -accelerometer: 927830680,-0.689867,0.862334,11.9385 -accelerometer: 927850669,-0.785682,0.938986,10.4247 -irProximity:927854373,0 -accelerometer: 927870689,-0.459911,0.996474,9.23655 - diff --git a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_hover.dat b/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_hover.dat deleted file mode 100644 index 3b82d472..00000000 --- a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_hover.dat +++ /dev/null @@ -1,256 +0,0 @@ -accelerometer: 932390769,0.287445,0.019163,10.0606 -accelerometer: 932410850,-0.479074,0.0766519,9.25571 -orientation:910530601,5 -accelerometer: 932430564,0.229956,0.019163,10.0414 -proximity:932435793,0 -irProximity:932439852,0.184314 -accelerometer: 932450858,-0.306608,0.114978,9.77311 -accelerometer: 932470664,0.0383259,-0.0383259,9.75395 -accelerometer: 932490806,0.114978,0,9.94558 -accelerometer: 932510825,-0.268282,0.153304,9.6773 -accelerometer: 932530692,0.134141,0.134141,10.0989 -irProximity:932540865,0 -accelerometer: 932550834,-0.229956,0.0574889,9.61981 -accelerometer: 932570701,-0.019163,0,9.73479 -accelerometer: 932590995,-0.0958148,0.0574889,9.88809 -accelerometer: 932610832,-0.172467,0.114978,9.6773 -accelerometer: 932630698,-0.019163,0.019163,14.6788 -irProximity:932641726,0.0313726 -accelerometer: 932650871,-0.114978,0.0383259,9.73479 -accelerometer: 932670860,-0.0766519,0.019163,9.71563 -accelerometer: 932690879,-0.019163,0.0766519,9.73479 -accelerometer: 932710655,-0.0766519,0.114978,9.75395 -accelerometer: 932730766,-0.0383259,0.0574889,9.8306 -irProximity:932742434,0.0745098 -accelerometer: 932750663,-0.0383259,0.0574889,9.79228 -accelerometer: 932770805,0.019163,0.0958148,9.75395 -accelerometer: 932790824,-0.114978,0.0574889,9.8306 -accelerometer: 932810844,-0.0766519,0.0958148,9.69646 -accelerometer: 932830833,-0.134141,0.0958148,9.75395 -irProximity:932843112,0 -accelerometer: 932850883,-0.114978,0.0766519,9.73479 -accelerometer: 932870841,-0.0574889,0.0766519,9.75395 -accelerometer: 932890647,-0.0958148,0.0766519,9.77311 -accelerometer: 932910667,0,0.0958148,9.77311 -accelerometer: 932930991,-0.019163,0.0958148,9.81144 -irProximity:932943789,0.160784 -accelerometer: 932950858,-0.0383259,0.0766519,9.81144 -accelerometer: 932970847,-0.0958148,0.114978,9.77311 -accelerometer: 932990684,-0.0766519,0.114978,9.77311 -accelerometer: 933010825,-0.0766519,0.0574889,9.81144 -accelerometer: 933030845,-0.0766519,0.114978,9.79228 -irProximity:933044497,0 -accelerometer: 933050865,-0.0958148,0.0574889,9.79228 -accelerometer: 933070854,-0.0383259,0.114978,9.77311 -accelerometer: 933090843,-0.0766519,0.114978,9.79228 -accelerometer: 933110832,-0.0574889,0.0574889,9.73479 -accelerometer: 933130668,-0.0766519,0.0574889,9.77311 -irProximity:933145144,0.176471 -accelerometer: 933150871,-0.0958148,0.0574889,9.77311 -accelerometer: 933170646,-0.0766519,0.0958148,9.8306 -accelerometer: 933190788,-0.0766519,0.0766519,9.75395 -accelerometer: 933210838,-0.0574889,0.0574889,9.84977 -accelerometer: 933230827,-0.114978,0.0766519,9.81144 -irProximity:933245852,0.211765 -accelerometer: 933250602,-0.0766519,0.0766519,9.79228 -accelerometer: 933270866,-0.0574889,0.0574889,9.79228 -accelerometer: 933290824,-0.114978,0.0574889,9.79228 -accelerometer: 933310661,-0.0766519,0.114978,9.81144 -accelerometer: 933330772,-0.0383259,0.0766519,9.73479 -irProximity:933346529,0.27451 -accelerometer: 933350883,-0.0958148,0.134141,9.75395 -accelerometer: 933370872,-0.0766519,0.0766519,9.73479 -accelerometer: 933390830,-0.114978,0.0574889,9.73479 -accelerometer: 933410850,-0.0574889,0.0766519,9.75395 -accelerometer: 933430839,-0.0958148,0.0574889,9.77311 -irProximity:933447146,0.278431 -accelerometer: 933450858,-0.0574889,0.114978,9.75395 -accelerometer: 933470878,-0.0383259,0.0383259,9.79228 -accelerometer: 933490867,-0.114978,0.0766519,9.81144 -accelerometer: 933510856,-0.134141,0.0958148,9.79228 -accelerometer: 933530875,-0.0574889,0.0766519,9.73479 -irProximity:933547854,0.290196 -accelerometer: 933550651,-0.0574889,0.0574889,9.73479 -accelerometer: 933570640,-0.0383259,0.114978,9.73479 -accelerometer: 933590720,-0.0574889,0.0574889,9.77311 -accelerometer: 933610801,-0.0958148,0.0383259,9.81144 -accelerometer: 933630851,-0.019163,0.0766519,9.86893 -irProximity:933648562,0.282353 -accelerometer: 933650871,-0.0766519,0,9.79228 -accelerometer: 933670829,-0.114978,0.0766519,9.73479 -accelerometer: 933690666,-0.0766519,0.0766519,9.73479 -accelerometer: 933710777,-0.0766519,0.0383259,9.75395 -accelerometer: 933730644,-0.019163,0.114978,9.81144 -irProximity:933749178,0.301961 -accelerometer: 933750877,-0.0958148,0.0766519,9.77311 -accelerometer: 933770835,-0.0958148,0.0766519,9.75395 -accelerometer: 933790824,-0.114978,0.019163,9.8306 -accelerometer: 933810844,-0.019163,0.0383259,9.6773 -accelerometer: 933830833,-0.0766519,0.0766519,9.77311 -irProximity:933849886,0.286275 -accelerometer: 933850852,-0.0958148,0.114978,9.75395 -accelerometer: 933870841,-0.0574889,0.0958148,9.77311 -accelerometer: 933890830,-0.0574889,0.114978,9.73479 -accelerometer: 933911582,-0.0958148,0.0766519,9.75395 -accelerometer: 933930808,-0.019163,0.0766519,9.77311 -accelerometer: 933950858,-0.0574889,0.0766519,9.71563 -accelerometer: 933970664,-0.0766519,0.0958148,9.75395 -accelerometer: 933990653,-0.0574889,0.0574889,9.73479 -accelerometer: 934010642,-0.0766519,0.0958148,9.77311 -accelerometer: 934030845,-0.019163,0.0574889,9.77311 -irProximity:934051241,0.282353 -accelerometer: 934050834,-0.153304,0.0383259,9.79228 -accelerometer: 934070854,-0.0383259,0.0574889,9.73479 -accelerometer: 934090659,-0.0574889,0.0958148,9.77311 -accelerometer: 934110801,-0.0383259,0.0574889,9.71563 -accelerometer: 934130851,-0.172467,0.0574889,9.77311 -irProximity:934151888,0.290196 -accelerometer: 934150596,-0.0383259,0.0958148,9.73479 -accelerometer: 934170799,-0.0574889,0.0383259,9.81144 -accelerometer: 934190849,-0.0574889,0.019163,9.77311 -accelerometer: 934210838,-0.114978,0.0766519,9.81144 -accelerometer: 934230827,-0.0383259,0.0766519,9.75395 -accelerometer: 934250907,-0.0958148,0.0958148,9.77311 -accelerometer: 934270866,-0.0766519,0.0383259,9.81144 -accelerometer: 934290824,-0.0958148,0.0574889,9.8306 -accelerometer: 934310844,-0.114978,0.0766519,9.71563 -accelerometer: 934330833,-0.0574889,0.0766519,9.73479 -accelerometer: 934350700,-0.0958148,0.019163,9.79228 -irProximity:934353671,0.294118 -accelerometer: 934370872,-0.0766519,0.0574889,9.8306 -accelerometer: 934390647,-0.0958148,0.0958148,9.79228 -accelerometer: 934410789,-0.0383259,0.0574889,9.73479 -accelerometer: 934430656,-0.0574889,0.0766519,9.77311 -accelerometer: 934450614,-0.0383259,0.0958148,9.79228 -irProximity:934454531,0.309804 -accelerometer: 934470847,-0.0766519,0.0766519,9.71563 -accelerometer: 934490836,-0.0766519,0.0766519,9.77311 -accelerometer: 934510825,-0.0766519,0.0383259,9.79228 -accelerometer: 934530845,-0.019163,0.019163,9.79228 -accelerometer: 934550681,-0.114978,0.0766519,9.77311 -irProximity:934555361,0.247059 -accelerometer: 934570670,-0.0766519,0.0574889,9.75395 -accelerometer: 934590904,-0.0574889,0.0766519,9.73479 -accelerometer: 934610862,-0.0958148,0.0958148,9.75395 -accelerometer: 934630851,-0.0383259,0.0958148,9.73479 -accelerometer: 934650871,-0.134141,0.0958148,9.81144 -irProximity:934656344,0 -accelerometer: 934670829,-0.114978,0.114978,9.75395 -accelerometer: 934690849,-0.019163,0.0383259,9.8306 -accelerometer: 934710838,-0.0766519,0.0383259,9.71563 -accelerometer: 934730827,-0.134141,0.134141,9.75395 -accelerometer: 934750694,-0.0766519,0.0958148,9.75395 -irProximity:934757204,0.14902 -accelerometer: 934770835,-0.0574889,0.0958148,9.77311 -accelerometer: 934790855,-0.0958148,0.0574889,9.81144 -accelerometer: 934810661,-0.0574889,0.0958148,9.73479 -accelerometer: 934830772,-0.114978,0.0958148,9.8306 -accelerometer: 934850669,-0.0958148,0.0766519,9.77311 -accelerometer: 934870780,-0.0958148,0.0958148,9.75395 -accelerometer: 934890861,-0.019163,0.0574889,9.71563 -accelerometer: 934911186,-0.0383259,0.0766519,9.79228 -accelerometer: 934930839,-0.134141,0.114978,9.75395 -accelerometer: 934950675,-0.0958148,0.0574889,9.75395 -irProximity:934958743,0.12549 -accelerometer: 934970847,-0.0383259,0.0766519,9.86893 -accelerometer: 934990653,-0.0574889,0.0958148,9.77311 -accelerometer: 935010795,-0.0766519,0.0958148,9.84977 -accelerometer: 935030875,-0.0574889,0.0766519,9.77311 -accelerometer: 935050681,-0.0383259,0.0383259,9.71563 -irProximity:935059603,0.145098 -accelerometer: 935070884,-0.0383259,0.0958148,9.73479 -accelerometer: 935090873,-0.0958148,0.114978,9.81144 -accelerometer: 935110862,-0.0383259,0.0958148,9.77311 -accelerometer: 935130851,-0.0574889,0.019163,9.81144 -accelerometer: 935150688,-0.0958148,0.0766519,9.86893 -irProximity:935160464,0 -accelerometer: 935170860,-0.0574889,0.0766519,9.77311 -accelerometer: 935190879,-0.134141,0.153304,9.79228 -accelerometer: 935210838,-0.0766519,0.0574889,9.86893 -accelerometer: 935230644,-0.0958148,0.0574889,9.73479 -accelerometer: 935250724,-0.0574889,0.0766519,9.77311 -irProximity:935261294,0.137255 -accelerometer: 935270652,-0.0766519,0.0958148,9.75395 -accelerometer: 935290794,-0.0574889,0.0766519,9.75395 -accelerometer: 935310874,-0.0383259,0.019163,9.75395 -accelerometer: 935330863,-0.019163,0.0574889,9.73479 -accelerometer: 935350700,-0.0958148,0.0958148,9.77311 -irProximity:935362093,0.109804 -accelerometer: 935370841,-0.0958148,0.114978,9.75395 -accelerometer: 935390861,-0.0383259,0.0958148,9.77311 -accelerometer: 935410697,-0.0958148,0.0958148,9.77311 -accelerometer: 935430808,-0.153304,0.0766519,9.77311 -accelerometer: 935450858,-0.0574889,0.019163,9.75395 -irProximity:935462801,0.14902 -accelerometer: 935470878,-0.019163,0.0766519,9.73479 -accelerometer: 935490867,-0.0383259,0.0958148,9.84977 -accelerometer: 935510856,-0.0766519,0.019163,9.73479 -accelerometer: 935530875,-0.0383259,0.0958148,9.81144 -accelerometer: 935550865,-0.0766519,0.0958148,9.79228 -irProximity:935563509,0 -accelerometer: 935570701,-0.0766519,0.0766519,9.73479 -accelerometer: 935590873,-0.0766519,0.153304,9.8306 -accelerometer: 935610832,-0.0766519,0.0766519,9.79228 -accelerometer: 935630851,-0.0383259,0.0958148,9.77311 -accelerometer: 935650657,-0.114978,0.114978,14.6597 -accelerometer: 935670799,-0.0766519,0.0574889,9.75395 -accelerometer: 935690696,-0.0574889,0.0766519,9.79228 -accelerometer: 935710838,-0.0766519,0.0383259,9.79228 -accelerometer: 935730857,-0.0574889,0.0574889,9.77311 -accelerometer: 935750846,-0.0958148,0.0574889,9.77311 -accelerometer: 935770805,-0.0766519,0.0574889,9.79228 -accelerometer: 935790824,-0.114978,0.0574889,9.75395 -accelerometer: 935810874,-0.0766519,0.0958148,9.77311 -accelerometer: 935830680,-0.0766519,0.0574889,9.77311 -accelerometer: 935850822,-0.0766519,0.0766519,9.77311 -irProximity:935865542,0.0588235 -accelerometer: 935870872,-0.0958148,0.0574889,9.44734 -accelerometer: 935890830,-0.0958148,0.0574889,9.75395 -accelerometer: 935911704,-0.019163,0.0766519,9.8306 -accelerometer: 935930869,-0.0766519,0.134141,9.8306 -accelerometer: 935950828,-0.114978,0.0383259,9.69646 -irProximity:935966250,0 -accelerometer: 935970878,-0.0383259,0.153304,9.8306 -accelerometer: 935990684,-0.0574889,0.0766519,9.79228 -accelerometer: 936010642,-0.0574889,0.0766519,9.75395 -accelerometer: 936030814,-0.019163,0.0766519,9.79228 -accelerometer: 936050865,-0.0766519,0.0383259,9.71563 -irProximity:936066958,0.156863 -accelerometer: 936070670,-0.0383259,0.0574889,9.75395 -accelerometer: 936090629,-0.0958148,0.0766519,9.73479 -accelerometer: 936110648,-0.0958148,0.0574889,9.71563 -accelerometer: 936130821,-0.0574889,0.0766519,9.75395 -accelerometer: 936150871,-0.0958148,0.0958148,9.79228 -irProximity:936167696,0.0235294 -accelerometer: 936170860,-0.0766519,0.114978,9.81144 -accelerometer: 936190879,-0.0383259,0.019163,9.73479 -accelerometer: 936210838,-0.0574889,0.0958148,9.84977 -accelerometer: 936230827,-0.0574889,0.0766519,9.77311 -accelerometer: 936250694,-0.0383259,0.0766519,9.79228 -irProximity:936268374,0.105882 -accelerometer: 936270896,-0.134141,0.019163,9.75395 -accelerometer: 936290885,-0.0766519,0.0574889,9.77311 -accelerometer: 936310874,-0.0574889,0.114978,9.75395 -accelerometer: 936330863,-0.0766519,0.0766519,9.77311 -accelerometer: 936350852,-0.114978,0.019163,9.75395 -irProximity:936369082,0.137255 -accelerometer: 936370872,-0.0383259,0.0958148,9.77311 -accelerometer: 936390830,-0.0766519,0.0766519,9.73479 -accelerometer: 936410880,-0.114978,0.019163,9.73479 -accelerometer: 936430869,-0.0766519,0.0574889,9.8306 -accelerometer: 936450553,-0.785682,-0.249119,9.10241 -irProximity:936469881,0.0509804 -accelerometer: 936471610,0.613215,0.0383259,10.8654 -accelerometer: 936490653,0.019163,0.0383259,10.0606 -accelerometer: 936510825,-0.555726,0.0766519,8.87245 -accelerometer: 936530662,-0.0766519,0.0574889,9.98391 -accelerometer: 936550651,-0.019163,0.0766519,10.1564 -irProximity:936570956,0.121569 -accelerometer: 936570609,-0.344933,0.0574889,9.50483 -accelerometer: 936590659,-0.32577,0.0574889,9.6773 -accelerometer: 936610648,-0.114978,0.0766519,9.90726 -accelerometer: 936630668,-0.210793,0.0574889,9.6773 -accelerometer: 936650688,-0.134141,-0.383259,9.46651 -irProximity:936671450,0.0784314 -accelerometer: 936670524,0.344933,0.229956,10.0989 - diff --git a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_nothover2.dat b/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_nothover2.dat deleted file mode 100644 index 4f3c6bfe..00000000 --- a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_nothover2.dat +++ /dev/null @@ -1,204 +0,0 @@ -orientation:6991310589,5 -accelerometer: 6993361126,-0.440748,-0.32577,9.60065 -accelerometer: 6993380810,-0.5174,-0.172467,9.48567 -accelerometer: 6993400555,-0.5174,-0.172467,9.84977 -accelerometer: 6993440564,-0.383259,-0.555726,9.81144 -accelerometer: 6993460583,-0.651541,-0.32577,9.92642 -irProximity:6993468313,0.101961 -accelerometer: 6993480572,-0.134141,0.306608,10.0414 -proximity:6993491811,0 -accelerometer: 6993500592,-0.229956,0.249119,10.0031 -accelerometer: 6993520520,-0.229956,0.594052,9.88809 -accelerometer: 6993540570,-0.459911,0.670704,10.0797 -accelerometer: 6993560559,-0.383259,0.555726,9.54316 -irProximity:6993572286,0.117647 -accelerometer: 6993580639,-0.594052,0.651541,9.69646 -accelerometer: 6993600628,-0.613215,0.383259,9.524 -accelerometer: 6993620892,-0.574889,0.766519,9.33237 -accelerometer: 6993640912,-0.287445,1.01564,9.14074 -accelerometer: 6993660656,-0.574889,1.22643,8.96827 -irProximity:6993672933,0.156863 -accelerometer: 6993680584,-0.0766519,1.09229,9.524 -accelerometer: 6993700573,0.0958148,1.49471,10.0414 -accelerometer: 6993720746,0.344933,1.53304,10.0989 -accelerometer: 6993740551,0.287445,1.43722,10.6163 -accelerometer: 6993760601,0.229956,1.45639,10.3863 -irProximity:6993775747,0.0392157 -accelerometer: 6993780560,0.498237,1.37973,10.9995 -accelerometer: 6993800885,0.32577,1.83965,10.7888 -accelerometer: 6993820599,0.344933,2.0696,10.4247 -accelerometer: 6993840558,0.440748,2.20374,10.5588 -accelerometer: 6993860577,0.804845,2.47202,10.9612 -irProximity:6993876272,0.137255 -accelerometer: 6993880566,0.804845,2.18458,11.2295 -accelerometer: 6993900586,1.07313,2.03127,11.057 -accelerometer: 6993920910,0.824008,2.31872,10.5013 -accelerometer: 6993940930,0.996474,2.83612,10.3288 -accelerometer: 6993960919,1.87797,2.89361,10.4055 -irProximity:6993976949,0.101961 -accelerometer: 6993980938,2.33788,2.97026,10.6546 -accelerometer: 6994000866,2.51035,2.91277,9.75395 -accelerometer: 6994020947,2.85528,3.20022,9.40902 -accelerometer: 6994040936,3.60264,4.27334,9.86893 -accelerometer: 6994060925,3.89008,4.02422,9.04492 -irProximity:6994077596,0.121569 -accelerometer: 6994080945,4.40748,4.06255,8.01012 -accelerometer: 6994100689,4.61828,6.89867,7.56937 -accelerometer: 6994120923,5.5381,8.54668,7.22444 -accelerometer: 6994140942,4.48413,7.14779,5.5381 -accelerometer: 6994160809,2.0696,6.53457,2.79779 -irProximity:6994178274,0.117647 -accelerometer: 6994180920,0.153304,7.12862,1.20727 -orientation:6994180920,1 -accelerometer: 6994201001,-1.85881,7.07114,-0.440748 -accelerometer: 6994220929,-2.12709,8.2784,-1.82048 -accelerometer: 6994240918,-0.843171,7.47356,-1.36057 -accelerometer: 6994260907,0.172467,7.87598,-0.0958148 -irProximity:6994280477,0.0588235 -accelerometer: 6994280896,-0.536563,7.89514,0.459911 -accelerometer: 6994300580,-1.14978,7.91431,-0.210793 -accelerometer: 6994322339,-0.440748,8.2784,-0.632378 -accelerometer: 6994340954,0.019163,8.71915,-0.824008 -accelerometer: 6994360943,0.479074,8.66166,-0.32577 -irProximity:6994381002,0.156863 -accelerometer: 6994381024,0.344933,8.94911,-0.402422 -accelerometer: 6994400586,0.229956,9.29404,-0.172467 -accelerometer: 6994420910,0.651541,9.54316,0.0574889 -accelerometer: 6994440899,0.90066,9.56232,0.421585 -accelerometer: 6994460919,0.613215,9.42818,0.153304 -irProximity:6994481741,0.27451 -accelerometer: 6994481213,0.958148,9.60065,-0.0958148 -accelerometer: 6994501599,0.383259,9.23655,-0.747356 -accelerometer: 6994520764,-1.45639,8.14426,-0.574889 -accelerometer: 6994540814,-6.70704,4.84823,-1.16894 -accelerometer: 6994560833,-13.9698,0.5174,-0.938986 -accelerometer: 6994580517,-21.3092,-4.33083,-2.587 -irProximity:6994582265,0.270588 -accelerometer: 6994600537,-22.1141,-9.38986,-2.16542 -accelerometer: 6994620831,-13.8548,-14.1614,0.555726 -accelerometer: 6994640820,0.919823,-17.9557,4.48413 -accelerometer: 6994660779,21.4242,-17.9174,8.85329 -accelerometer: 6994680645,37.8469,-10.3288,-0.459911 -irProximity:6994683187,0.34902 -accelerometer: 6994701184,35.5665,-5.94052,-2.54868 -accelerometer: 6994720929,25.7359,-10.5205,4.86739 -accelerometer: 6994740918,21.2326,-7.62686,8.4892 -accelerometer: 6994760907,16.8251,-5.26982,7.35858 -accelerometer: 6994780713,12.5709,-3.35352,2.2229 -irProximity:6994784078,0.0862745 -accelerometer: 6994800549,10.7696,-3.89008,-0.134141 -accelerometer: 6994820935,11.4786,-3.12356,0.421585 -orientation:6994820935,4 -accelerometer: 6994840924,12.4943,-3.83259,0.114978 -accelerometer: 6994860913,12.1302,-3.06608,-0.0574889 -accelerometer: 6994880749,10.5205,-2.14625,0.804845 -irProximity:6994884969,0.141176 -accelerometer: 6994900647,10.2522,-1.5522,1.66718 -accelerometer: 6994920941,9.81144,-1.80132,2.10793 -accelerometer: 6994940930,9.0066,-1.89713,2.51035 -accelerometer: 6994960888,8.71915,-2.26123,2.85528 -accelerometer: 6994980755,8.52752,-2.2229,3.35352 -irProximity:6994985830,0.0901961 -accelerometer: 6995000775,8.22091,-2.68282,3.18105 -accelerometer: 6995020916,8.50836,-2.41453,2.77863 -accelerometer: 6995040905,8.50836,-2.51035,2.7403 -accelerometer: 6995060894,8.87245,-2.12709,2.87445 -accelerometer: 6995080761,9.10241,-2.52951,3.14273 -irProximity:6995086721,0.0941176 -accelerometer: 6995100567,9.0066,-2.29956,3.04691 -accelerometer: 6995120862,8.81497,-2.64449,3.02775 -accelerometer: 6995140759,8.6425,-2.4337,2.47202 -accelerometer: 6995160931,8.87245,-2.03127,2.41453 -accelerometer: 6995180706,9.27488,-1.95462,2.91277 -irProximity:6995187551,0.0980392 -accelerometer: 6995201153,9.3132,-2.0696,3.18105 -accelerometer: 6995220929,9.17906,-2.10793,3.23854 -accelerometer: 6995240857,8.98743,-2.29956,3.41101 -accelerometer: 6995260907,8.94911,-2.0696,3.21938 -accelerometer: 6995280713,8.83413,-2.14625,3.04691 -accelerometer: 6995300518,8.73831,-1.99295,2.9511 -accelerometer: 6995321087,8.77664,-2.12709,3.1044 -accelerometer: 6995340924,8.68083,-2.20374,3.14273 -accelerometer: 6995360882,8.66166,-2.18458,3.00859 -accelerometer: 6995380719,8.71915,-2.2229,2.9511 -irProximity:6995389303,0 -accelerometer: 6995400769,8.69999,-2.26123,3.02775 -accelerometer: 6995420910,8.7958,-2.16542,3.21938 -accelerometer: 6995440899,8.73831,-2.0696,3.23854 -accelerometer: 6995460888,8.6425,-1.97379,3.16189 -accelerometer: 6995480694,8.73831,-2.2229,3.33436 -irProximity:6995490011,0.0627451 -accelerometer: 6995500531,8.71915,-2.0696,3.54515 -accelerometer: 6995520916,8.73831,-2.18458,3.48766 -accelerometer: 6995540966,8.75748,-1.85881,3.43017 -accelerometer: 6995560925,8.91078,-1.93546,3.44933 -accelerometer: 6995580761,8.77664,-2.03127,3.23854 -irProximity:6995590963,0.0705882 -accelerometer: 6995601056,8.81497,-2.01211,3.44933 -accelerometer: 6995620862,8.71915,-2.10793,3.7751 -accelerometer: 6995640881,8.85329,-1.93546,4.02422 -accelerometer: 6995661053,8.7958,-2.24207,4.21585 -accelerometer: 6995680737,8.68083,-2.33788,3.94757 -accelerometer: 6995700543,8.73831,-2.26123,3.89008 -accelerometer: 6995720929,8.83413,-2.03127,4.63744 -accelerometer: 6995740887,8.87245,-2.03127,5.40396 -accelerometer: 6995760937,9.12157,-1.72467,6.49625 -accelerometer: 6995780896,8.73831,-1.72467,6.91783 -irProximity:6995792348,0 -accelerometer: 6995800549,8.24008,-2.47202,7.10946 -accelerometer: 6995820904,7.66519,-2.0696,7.28193 -accelerometer: 6995840924,6.78369,-2.70198,7.43523 -accelerometer: 6995860913,5.6914,-2.41453,7.53105 -orientation:6995860913,5 -accelerometer: 6995880932,4.46497,-2.10793,7.4544 -accelerometer: 6995900738,3.67929,-2.05044,7.41607 -accelerometer: 6995920910,3.23854,-1.87797,7.72268 -accelerometer: 6995940747,2.9511,-1.51387,8.50836 -accelerometer: 6995960858,2.72114,-1.43722,9.06409 -accelerometer: 6995980877,2.2229,-1.64802,8.73831 -irProximity:6995993764,0.105882 -accelerometer: 6996003003,1.66718,-1.7055,9.17906 -accelerometer: 6996020855,1.43722,-1.60969,9.40902 -accelerometer: 6996040875,1.20727,-1.83965,9.29404 -accelerometer: 6996060925,1.07313,-1.68634,9.46651 -accelerometer: 6996080945,1.24559,-1.41806,9.73479 -irProximity:6996094472,0 -accelerometer: 6996101147,0.90066,-1.30308,9.61981 -accelerometer: 6996120923,0.498237,-1.49471,9.04492 -accelerometer: 6996140912,0.5174,-1.16894,9.04492 -accelerometer: 6996160870,0.728193,-1.3989,9.48567 -accelerometer: 6996180890,0.19163,-1.09229,9.524 -accelerometer: 6996200543,0.344933,-1.24559,8.75748 -accelerometer: 6996220929,0.364096,-1.05396,9.40902 -accelerometer: 6996240918,0.364096,-1.34141,9.44734 -accelerometer: 6996260846,0.498237,-1.05396,9.61981 -accelerometer: 6996280896,0.459911,-0.958148,9.84977 -irProximity:6996295827,0.0196078 -accelerometer: 6996300549,0.32577,-0.804845,9.56232 -accelerometer: 6996320904,0.498237,-1.32224,9.14074 -accelerometer: 6996340893,0.229956,-1.51387,9.1599 -accelerometer: 6996360913,0.268282,-0.938986,9.40902 -accelerometer: 6996380902,0.364096,-1.07313,9.61981 -irProximity:6996396505,0 -accelerometer: 6996400799,-0.019163,-1.41806,9.44734 -accelerometer: 6996420880,-0.134141,-1.20727,9.8306 -accelerometer: 6996440838,-0.19163,-1.45639,9.90726 -accelerometer: 6996460827,-0.287445,-1.09229,9.84977 -accelerometer: 6996480725,0.019163,-0.440748,8.83413 -irProximity:6996497182,0.109804 -accelerometer: 6996500561,-0.344933,-1.22643,9.42818 -accelerometer: 6996522473,-0.383259,-1.37973,9.23655 -accelerometer: 6996541760,-0.594052,-1.41806,9.90726 -accelerometer: 6996561749,-0.594052,-1.57136,10.0989 -accelerometer: 6996581494,-0.498237,-1.28392,9.86893 -irProximity:6996597921,0.176471 -accelerometer: 6996601269,-0.344933,-1.13062,9.79228 -accelerometer: 6996621930,-0.249119,-1.05396,9.90726 -accelerometer: 6996641766,-0.0574889,-1.34141,10.2139 -accelerometer: 6996661419,-0.306608,-1.20727,10.3288 -accelerometer: 6996681378,-0.689867,-0.536563,10.5396 -irProximity:6996698598,0.0392157 -accelerometer: 6996701428,0.0383259,-0.843171,9.60065 -accelerometer: 6996720837,-0.134141,-0.5174,9.19823 -accelerometer: 6996740674,-0.210793,-0.766519,9.56232 - diff --git a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_pickup.dat b/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_pickup.dat deleted file mode 100644 index 9a821d18..00000000 --- a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_pickup.dat +++ /dev/null @@ -1,258 +0,0 @@ -accelerometer: 939660514,0.0766519,0.019163,10.0222 -accelerometer: 939680625,-0.0383259,0.0383259,9.86893 -orientation:910530601,5 -proximity:939716616,0 -irProximity:939718660,0.105882 -accelerometer: 939720542,-0.172467,0.019163,9.56232 -accelerometer: 939740806,0.0574889,0.153304,9.88809 -accelerometer: 939760856,-0.0383259,0.0383259,9.79228 -accelerometer: 939780845,0.0383259,0.0766519,9.86893 -accelerometer: 939800834,-0.0383259,0.0958148,9.69646 -irProximity:939819307,0.137255 -accelerometer: 939820609,0.019163,0.0766519,9.84977 -accelerometer: 939840812,-0.114978,0.0574889,9.69646 -accelerometer: 939860801,-0.0574889,0.019163,9.86893 -accelerometer: 939880851,-0.153304,0.0574889,9.6773 -accelerometer: 939900749,-0.0383259,0.0766519,9.8306 -irProximity:939919954,0 -accelerometer: 939920799,-0.153304,0.0574889,9.79228 -accelerometer: 939940849,-0.019163,0.0574889,9.8306 -accelerometer: 939960838,-0.134141,0.0383259,9.79228 -accelerometer: 939980827,-0.019163,0.0574889,9.84977 -accelerometer: 940001884,-0.0766519,0.0383259,9.69646 -irProximity:940020632,0.109804 -accelerometer: 940020927,-0.0766519,0.0766519,9.79228 -accelerometer: 940040824,-0.0766519,0.0766519,9.81144 -accelerometer: 940060661,-0.0383259,0.0574889,9.92642 -accelerometer: 940080772,-0.114978,0.0574889,9.81144 -accelerometer: 940100700,0.0383259,0.0574889,9.75395 -irProximity:940121279,0.129412 -accelerometer: 940120872,-0.0383259,0.134141,9.79228 -accelerometer: 940140830,-0.114978,0.0574889,9.6773 -accelerometer: 940160850,-0.0574889,0.0766519,9.73479 -accelerometer: 940180839,-0.0766519,0.114978,9.77311 -accelerometer: 940200553,-0.019163,0.0574889,9.79228 -irProximity:940221987,0.0784314 -accelerometer: 940220664,-0.0766519,0.0958148,9.71563 -accelerometer: 940241660,-0.134141,0.0958148,9.86893 -accelerometer: 940260612,-0.114978,0.134141,9.77311 -accelerometer: 940280814,-0.0766519,0.0766519,9.73479 -accelerometer: 940300834,-0.0383259,0.0958148,9.75395 -accelerometer: 940320609,-0.134141,0.0766519,9.81144 -irProximity:940322603,0.0980392 -accelerometer: 940340843,-0.0574889,0.134141,9.86893 -accelerometer: 940360832,-0.0958148,0.0766519,9.84977 -accelerometer: 940380851,-0.0958148,-0.019163,9.73479 -accelerometer: 940400840,-0.0574889,0.134141,9.75395 -accelerometer: 940420615,-2.28039,0.19163,10.4247 -irProximity:940423067,0.00784314 -accelerometer: 940440849,-1.89713,-1.13062,10.0606 -accelerometer: 940460838,2.97026,-1.22643,9.63897 -accelerometer: 940480644,0.344933,1.82048,10.8462 -accelerometer: 940500785,2.14625,-0.210793,9.56232 -accelerometer: 940520683,0.306608,-0.90066,10.0414 -irProximity:940523745,0 -accelerometer: 940540763,0.210793,-0.5174,9.3132 -accelerometer: 940560844,0.689867,-0.0383259,10.5013 -accelerometer: 940580650,1.72467,-0.172467,10.8654 -accelerometer: 940600822,6.99448,-1.05396,11.2678 -accelerometer: 940620689,5.28898,1.07313,7.89514 -irProximity:940624605,0.0980392 -accelerometer: 940640861,-1.07313,0.287445,10.1372 -accelerometer: 940660667,-2.12709,-2.79779,7.39691 -accelerometer: 940680808,5.51894,-2.60616,8.60417 -accelerometer: 940700828,3.44933,-0.0383259,9.96474 -accelerometer: 940720695,2.83612,-2.49119,11.3636 -irProximity:940725466,0.160784 -accelerometer: 940740836,3.89008,-1.1881,12.4176 -accelerometer: 940760825,5.40396,-2.20374,11.4786 -accelerometer: 940780845,3.21938,-0.344933,14.2572 -accelerometer: 940800834,1.01564,-1.20727,12.82 -accelerometer: 940820701,1.43722,-0.0766519,12.4368 -irProximity:940826326,0.0980392 -accelerometer: 940840873,2.4337,2.35705,13.1266 -accelerometer: 940860862,1.89713,-0.0574889,13.1075 -accelerometer: 940880851,0.594052,0.996474,11.6128 -accelerometer: 940900657,-0.383259,0.114978,10.9804 -accelerometer: 940920646,-1.43722,1.24559,9.56232 -irProximity:940927187,0 -accelerometer: 940940666,-1.57136,2.60616,7.72268 -accelerometer: 940960777,-0.651541,4.15836,7.37774 -accelerometer: 940980796,-0.172467,4.44581,6.99448 -accelerometer: 941000694,-0.172467,5.00153,5.61475 -accelerometer: 941020683,0.019163,5.15484,5.21233 -accelerometer: 941040824,-0.459911,5.44228,4.21585 -orientation:941040824,1 -accelerometer: 941060874,-0.5174,6.01717,4.17753 -accelerometer: 941080650,-0.0383259,6.30462,4.71409 -accelerometer: 941100791,0.0958148,6.2088,4.69493 -accelerometer: 941120689,-0.440748,6.2088,4.44581 -irProximity:941128878,0.180392 -accelerometer: 941140830,-0.0383259,6.5729,4.96321 -accelerometer: 941160850,0.0766519,6.84118,5.40396 -accelerometer: 941180839,-0.479074,6.7262,5.55726 -accelerometer: 941200828,-0.919823,6.63039,5.48061 -accelerometer: 941220695,-0.919823,6.76453,5.63391 -irProximity:941229738,0 -accelerometer: 941240562,-1.01564,6.86034,5.94052 -accelerometer: 941260642,-0.32577,6.86034,6.32378 -accelerometer: 941280875,-0.268282,6.91783,6.32378 -accelerometer: 941300834,-0.574889,6.70704,5.90219 -accelerometer: 941320670,-0.824008,6.51541,5.97885 -irProximity:941330446,0.12549 -accelerometer: 941340812,-1.1881,6.49625,6.70704 -accelerometer: 941360648,-0.824008,6.76453,7.2436 -accelerometer: 941380790,-0.613215,6.97532,7.14779 -accelerometer: 941400840,-0.574889,6.95616,6.97532 -accelerometer: 941420677,-0.651541,6.937,6.76453 -irProximity:941431307,0.0235294 -accelerometer: 941440849,-0.824008,6.99448,6.86034 -accelerometer: 941460807,-0.862334,6.937,7.35858 -accelerometer: 941480857,-0.881497,6.97532,7.30109 -accelerometer: 941500663,-0.804845,6.97532,7.47356 -accelerometer: 941522361,-1.0348,6.78369,6.99448 -irProximity:941531832,0.156863 -accelerometer: 941540519,-1.0348,6.82202,6.86034 -accelerometer: 941560600,-0.919823,7.01365,6.937 -accelerometer: 941580680,-0.728193,6.97532,6.91783 -accelerometer: 941600700,-0.766519,6.80285,6.59206 -accelerometer: 941620689,-0.670704,6.95616,6.66871 -irProximity:941632540,0.105882 -accelerometer: 941640678,-0.70903,6.80285,6.64955 -accelerometer: 941660697,-0.747356,6.87951,6.55374 -accelerometer: 941680808,-0.670704,6.89867,6.74537 -accelerometer: 941700828,-0.670704,6.91783,6.95616 -accelerometer: 941720847,-0.613215,6.87951,6.7262 -irProximity:941733248,0.152941 -accelerometer: 941740684,-0.651541,6.86034,7.07114 -accelerometer: 941760764,-0.613215,6.80285,6.7262 -accelerometer: 941780692,-0.536563,6.95616,6.55374 -accelerometer: 941800803,-0.459911,6.937,6.87951 -accelerometer: 941820854,-0.555726,6.84118,6.66871 -irProximity:941833956,0.0745098 -accelerometer: 941840843,-0.785682,6.76453,6.59206 -accelerometer: 941860832,-0.843171,6.76453,6.68788 -accelerometer: 941880851,-0.651541,6.89867,6.82202 -accelerometer: 941900687,-0.383259,7.07114,7.32025 -accelerometer: 941920677,-0.440748,6.89867,6.76453 -irProximity:941934755,0.160784 -accelerometer: 941940849,-0.651541,6.89867,6.86034 -accelerometer: 941960868,-0.594052,6.91783,6.86034 -accelerometer: 941980827,-0.536563,6.87951,6.59206 -accelerometer: 942000602,-0.594052,6.95616,6.64955 -accelerometer: 942020896,-0.555726,6.89867,6.55374 -irProximity:942035463,0.109804 -accelerometer: 942040855,-0.632378,6.82202,6.82202 -accelerometer: 942060844,-0.574889,6.82202,6.87951 -accelerometer: 942080833,-0.574889,6.86034,6.91783 -accelerometer: 942100883,-0.613215,6.82202,6.99448 -accelerometer: 942120872,-0.594052,6.86034,6.99448 -irProximity:942136171,0.0862745 -accelerometer: 942140830,-0.670704,6.86034,6.97532 -accelerometer: 942160667,-0.785682,6.87951,6.74537 -accelerometer: 942180839,-0.440748,6.99448,6.95616 -accelerometer: 942200675,-0.440748,6.87951,6.99448 -accelerometer: 942220817,-0.32577,6.937,6.70704 -irProximity:942236879,0.176471 -accelerometer: 942240836,-0.364096,6.89867,6.66871 -accelerometer: 942260825,-0.383259,6.84118,6.63039 -accelerometer: 942280845,-0.32577,6.87951,6.74537 -accelerometer: 942300865,-0.383259,6.86034,6.61122 -accelerometer: 942320884,-0.613215,6.86034,6.937 -irProximity:942337587,0 -accelerometer: 942340659,-0.728193,6.80285,6.99448 -accelerometer: 942360801,-0.728193,6.80285,6.86034 -accelerometer: 942380851,-0.766519,6.86034,6.70704 -accelerometer: 942400840,-0.555726,6.87951,6.937 -accelerometer: 942420860,-0.555726,6.76453,6.76453 -irProximity:942438265,0.0392157 -accelerometer: 942440879,-0.574889,6.7262,6.68788 -accelerometer: 942460868,-0.613215,6.70704,6.63039 -accelerometer: 942480857,-0.747356,6.59206,7.14779 -accelerometer: 942500877,-0.632378,6.70704,7.16695 -accelerometer: 942520866,-0.498237,6.61122,6.76453 -irProximity:942538912,0.105882 -accelerometer: 942540885,-0.498237,6.55374,6.28545 -accelerometer: 942560691,-0.172467,6.40043,5.67224 -accelerometer: 942580650,-0.574889,5.46145,5.67224 -accelerometer: 942600852,-0.32577,6.47708,4.34999 -accelerometer: 942620658,-0.344933,5.86387,4.67576 -irProximity:942639620,0.0901961 -accelerometer: 942640861,-0.421585,5.72973,4.57995 -accelerometer: 942660880,-0.287445,5.23149,4.82907 -accelerometer: 942680869,-0.574889,4.69493,4.63744 -accelerometer: 942700828,-0.019163,4.59911,5.21233 -accelerometer: 942720878,0.651541,4.88656,6.03634 -orientation:942720878,5 -irProximity:942740328,0.0823529 -accelerometer: 942740867,0.574889,3.96673,7.95263 -accelerometer: 942760673,0.843171,3.21938,7.51188 -accelerometer: 942780784,1.01564,2.79779,7.55021 -accelerometer: 942800834,1.7055,2.91277,8.96827 -accelerometer: 942820854,1.89713,2.54868,10.4438 -irProximity:942841005,0.0431373 -accelerometer: 942840873,2.54868,2.01211,10.0031 -accelerometer: 942860832,2.4337,1.99295,10.3863 -accelerometer: 942880882,3.23854,1.47555,10.1755 -accelerometer: 942900688,3.39185,1.26476,11.5553 -accelerometer: 942920951,4.12004,1.28392,11.7852 -irProximity:942941591,0.113725 -accelerometer: 942940513,4.5033,1.60969,11.9194 -accelerometer: 942960868,5.28898,0.440748,12.8584 -accelerometer: 942980827,6.18964,1.32224,18.4923 -accelerometer: 943000694,4.98237,-0.555726,9.42818 -accelerometer: 943020805,4.19669,1.26476,9.25571 -irProximity:943042391,0.0823529 -accelerometer: 943040824,3.56431,1.01564,7.30109 -accelerometer: 943060844,3.41101,0.134141,7.32025 -accelerometer: 943080863,3.16189,-0.019163,7.58854 -accelerometer: 943100883,3.52599,-0.0958148,7.58854 -accelerometer: 943120872,2.85528,-0.862334,8.04845 -accelerometer: 943140586,1.11145,-0.440748,3.87092 -irProximity:943142885,0.00392157 -accelerometer: 943160880,-1.24559,-0.728193,12.341 -accelerometer: 943180656,1.14978,-0.364096,10.2139 -accelerometer: 943200797,1.1881,-0.70903,8.7958 -accelerometer: 943220878,1.13062,0.249119,10.463 -accelerometer: 943240806,1.49471,1.1881,12.8009 -irProximity:943243349,0.0627451 -accelerometer: 943260703,0.344933,0.229956,14.1614 -accelerometer: 943280875,0.996474,0.440748,10.8271 -accelerometer: 943300834,-0.268282,0.0958148,9.79228 -accelerometer: 943320884,-0.134141,0.574889,10.463 -accelerometer: 943340690,0.536563,0.134141,10.6163 -irProximity:943344210,0.160784 -accelerometer: 943360862,-0.766519,-0.364096,8.56585 -accelerometer: 943380851,0.479074,0.344933,10.3863 -accelerometer: 943400840,-0.344933,0.287445,9.81144 -accelerometer: 943420646,-0.172467,-0.172467,9.3132 -accelerometer: 943440757,-0.0383259,0.134141,9.88809 -irProximity:943445040,0 -accelerometer: 943460685,-0.268282,0.19163,9.6773 -accelerometer: 943480796,0.440748,0.0383259,10.3288 -accelerometer: 943500877,-0.306608,0.0383259,9.46651 -accelerometer: 943520866,0.0574889,0.0574889,10.118 -accelerometer: 943540672,-0.210793,0.153304,9.6773 -irProximity:943545900,0.113725 -accelerometer: 943560691,-0.229956,0.0766519,9.56232 -accelerometer: 943580680,-0.19163,0.0574889,9.63897 -accelerometer: 943600669,-0.114978,0.0766519,9.58148 -accelerometer: 943620811,-0.19163,0.0766519,9.61981 -accelerometer: 943640678,0.019163,0.0766519,9.92642 -irProximity:943646761,0 -accelerometer: 943660880,-0.229956,0.0958148,9.56232 -accelerometer: 943680839,0.19163,0.0574889,10.0222 -accelerometer: 943700828,-1.78216,-0.689867,7.35858 -accelerometer: 943720908,0.651541,-0.19163,11.8236 -accelerometer: 943740836,0.0766519,-0.0383259,11.4211 -irProximity:943747682,0.0470588 -accelerometer: 943760856,-1.09229,0.306608,8.25924 -accelerometer: 943780875,-0.0574889,0.0958148,10.2522 -accelerometer: 943800865,-0.134141,-0.0574889,9.71563 -accelerometer: 943820976,-0.440748,-0.019163,9.3132 -accelerometer: 943840751,-0.019163,0.0766519,10.118 -irProximity:943848360,0.121569 -accelerometer: 943860587,-0.229956,0.0958148,9.77311 -accelerometer: 943880607,-0.0574889,0.134141,9.50483 -accelerometer: 943900596,0.306608,-0.0574889,9.81144 - diff --git a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_shake2.dat b/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_shake2.dat deleted file mode 100644 index fd839ec9..00000000 --- a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_shake2.dat +++ /dev/null @@ -1,260 +0,0 @@ -accelerometer: 948550803,0.0383259,2.12709,8.66166 -accelerometer: 948570579,-0.32577,2.18458,9.17906 -orientation:942720878,5 -proximity:948579652,0 -irProximity:948581789,0.129412 -accelerometer: 948590781,0.249119,2.05044,9.48567 -accelerometer: 948610832,-0.114978,1.72467,9.3132 -accelerometer: 948630882,0.114978,1.87797,9.48567 -accelerometer: 948650840,0.229956,2.10793,8.73831 -accelerometer: 948670646,0.268282,1.85881,8.58501 -irProximity:948682588,0.0705882 -accelerometer: 948690879,0.0574889,0.824008,8.31673 -accelerometer: 948710655,-0.555726,2.49119,8.69999 -accelerometer: 948730827,-0.344933,2.72114,10.1564 -accelerometer: 948750846,-1.37973,3.00859,10.2905 -accelerometer: 948770835,-0.843171,3.73678,10.2714 -irProximity:948783296,0.12549 -accelerometer: 948790824,-0.536563,3.6218,9.63897 -accelerometer: 948810874,-0.268282,4.34999,8.4892 -accelerometer: 948830863,0.268282,4.25418,7.89514 -accelerometer: 948850669,0.287445,3.60264,7.28193 -accelerometer: 948870780,-0.19163,2.66365,7.14779 -irProximity:948884004,0.156863 -accelerometer: 948890678,-5.57642,6.03634,14.4489 -accelerometer: 948910911,-0.268282,3.60264,7.79933 -accelerometer: 948930839,-0.498237,4.57995,8.6425 -accelerometer: 948950828,-0.843171,5.19316,10.1372 -accelerometer: 948970817,-0.306608,3.79427,9.27488 -irProximity:948984682,0 -accelerometer: 948990684,0.440748,3.41101,9.08325 -accelerometer: 949010825,-0.632378,3.66013,8.4892 -accelerometer: 949030662,-1.45639,3.89008,7.26277 -accelerometer: 949050803,-0.249119,4.25418,8.73831 -accelerometer: 949070854,0.651541,4.69493,10.2905 -irProximity:949085359,0.129412 -accelerometer: 949090659,0.479074,3.20022,9.88809 -accelerometer: 949110771,-1.05396,2.60616,10.2905 -accelerometer: 949130668,-0.689867,1.87797,10.3097 -accelerometer: 949150779,-0.613215,2.64449,9.54316 -accelerometer: 949170829,-0.268282,3.58348,9.29404 -irProximity:949186037,0.121569 -accelerometer: 949190849,-0.364096,4.52246,9.29404 -accelerometer: 949210838,-0.670704,3.75594,8.85329 -accelerometer: 949231010,-0.996474,3.58348,9.06409 -accelerometer: 949250846,-0.90066,3.64096,9.6773 -accelerometer: 949270652,-0.632378,3.64096,9.58148 -irProximity:949286622,0.0980392 -accelerometer: 949290855,-0.440748,4.17753,8.7958 -accelerometer: 949310874,-0.0766519,4.08171,9.19823 -accelerometer: 949330863,-0.0383259,4.04339,9.10241 -accelerometer: 949350852,0.229956,3.52599,8.87245 -accelerometer: 949370841,1.30308,4.04339,8.60417 -irProximity:949387330,0 -accelerometer: 949390830,2.18458,4.06255,8.31673 -accelerometer: 949410850,3.43017,5.07819,7.78017 -accelerometer: 949430839,3.39185,4.56079,7.03281 -accelerometer: 949450797,2.33788,3.9859,5.32731 -accelerometer: 949470847,-3.71762,4.42665,3.9859 -irProximity:949488008,0.0901961 -accelerometer: 949490867,-21.3092,-0.632378,2.31872 -accelerometer: 949510642,-37.0229,-10.0414,2.39537 -accelerometer: 949530875,-32.7878,-11.6511,10.0606 -accelerometer: 949550651,-15.0429,-9.40902,16.6143 -accelerometer: 949570854,5.78722,-4.96321,19.6612 -irProximity:949588685,0.027451 -accelerometer: 949590904,32.0022,5.82554,21.8841 -accelerometer: 949610832,39.2266,14.4489,19.7762 -accelerometer: 949630882,39.2266,16.1927,12.9542 -accelerometer: 949651054,37.1762,8.7958,7.35858 -accelerometer: 949670829,4.44581,-3.48766,1.47555 -irProximity:949689363,0.152941 -accelerometer: 949690666,-39.2458,-16.6335,-4.19669 -accelerometer: 949710807,-39.2458,-26.2533,8.16343 -accelerometer: 949730796,-39.2458,-33.2478,23.398 -accelerometer: 949750816,-31.5422,-25.4101,25.4676 -accelerometer: 949770866,8.35505,-10.6929,19.2013 -irProximity:949790040,0 -accelerometer: 949790855,39.2266,7.37774,14.1039 -accelerometer: 949810874,39.2266,18.0515,5.76805 -accelerometer: 949830833,39.2266,20.7727,-0.153304 -accelerometer: 949850883,39.2266,11.6128,-1.83965 -accelerometer: 949870872,4.6566,-7.6077,0.881497 -irProximity:949890748,0.0980392 -accelerometer: 949890678,-39.2458,-20.696,4.36916 -accelerometer: 949910911,-39.2458,-30.8332,20.5427 -accelerometer: 949930686,-39.2458,-30.7949,29.3768 -accelerometer: 949950797,-33.3244,-22.0183,25.046 -accelerometer: 949970695,2.20374,-11.1337,14.7363 -irProximity:949991334,0.121569 -accelerometer: 949990562,36.0647,5.0207,10.2139 -accelerometer: 950010673,39.2266,15.5412,2.54868 -accelerometer: 950030845,39.2266,19.7762,1.28392 -accelerometer: 950050865,39.2266,12.8009,2.16542 -accelerometer: 950070884,19.2013,-0.287445,5.76805 -irProximity:950092073,0.105882 -accelerometer: 950090751,-19.4313,-12.0152,5.95968 -accelerometer: 950110648,-39.2458,-26.9431,15.6753 -accelerometer: 950130790,-39.2458,-33.2861,27.633 -accelerometer: 950150840,-39.2458,-29.7793,24.9502 -accelerometer: 950170829,-16.4227,-17.7832,14.1806 -accelerometer: 950190696,22.9381,-3.89008,10.4438 -irProximity:950192720,0 -accelerometer: 950210868,39.2266,16.7676,5.40396 -accelerometer: 950230644,39.2266,20.3319,-0.32577 -accelerometer: 950250877,39.2266,14.9471,-1.16894 -accelerometer: 950270683,31.9638,6.2088,0.19163 -accelerometer: 950290641,1.93546,-5.72973,4.00506 -irProximity:950293153,0.0901961 -accelerometer: 950310844,-24.6436,-15.2346,11.4786 -accelerometer: 950330863,-35.1257,-18.2815,20.1403 -accelerometer: 950350700,-28.3804,-13.3758,22.5931 -accelerometer: 950370811,-18.7605,-7.91431,20.1403 -accelerometer: 950390647,-9.46651,-3.04691,15.7328 -irProximity:950393800,0.121569 -accelerometer: 950410819,-2.66365,0.498237,11.057 -accelerometer: 950430839,1.97379,2.75947,7.6077 -accelerometer: 950450797,4.82907,4.40748,6.32378 -accelerometer: 950470878,5.25065,4.6566,5.90219 -accelerometer: 950490684,3.48766,5.05902,8.73831 -irProximity:950494661,0.0431373 -accelerometer: 950511100,3.20022,4.94405,10.3863 -accelerometer: 950530692,1.32224,2.97026,9.33237 -accelerometer: 950550803,0.919823,2.7403,8.6425 -accelerometer: 950570884,1.49471,2.87445,9.50483 -accelerometer: 950590720,1.28392,2.41453,9.79228 -irProximity:950595521,0.156863 -accelerometer: 950610862,0.919823,2.20374,9.79228 -accelerometer: 950630882,0.938986,2.33788,10.233 -accelerometer: 950650871,0.862334,2.0696,10.1564 -accelerometer: 950670860,0.268282,1.66718,9.25571 -accelerometer: 950690696,-0.383259,1.72467,8.91078 -irProximity:950696443,0.0392157 -accelerometer: 950710838,-0.364096,1.68634,10.0414 -accelerometer: 950730857,0.0383259,0.996474,10.578 -accelerometer: 950750846,0.268282,1.24559,9.48567 -accelerometer: 950770683,0.651541,1.87797,9.27488 -accelerometer: 950790641,0.19163,1.93546,9.46651 -irProximity:950797304,0.0745098 -accelerometer: 950810691,0.210793,1.32224,9.65814 -accelerometer: 950830833,-0.134141,1.14978,9.6773 -accelerometer: 950850883,-0.19163,1.13062,9.6773 -accelerometer: 950870872,0.153304,0.996474,10.233 -accelerometer: 950890678,0.306608,1.26476,9.65814 -irProximity:950897859,0 -accelerometer: 950910880,0.0383259,1.41806,9.21739 -accelerometer: 950930869,0.19163,1.32224,9.1599 -accelerometer: 950950675,0.536563,1.72467,9.44734 -accelerometer: 950970817,0.344933,1.64802,9.56232 -accelerometer: 950990684,0.421585,1.53304,9.84977 -irProximity:950998597,0.168627 -accelerometer: 951010856,0.229956,1.37973,9.54316 -accelerometer: 951030845,-0.0574889,1.37973,9.1599 -accelerometer: 951050865,-0.229956,1.36057,9.06409 -accelerometer: 951070854,-0.0383259,1.20727,9.19823 -accelerometer: 951090690,0.0766519,1.37973,9.6773 -irProximity:951099458,0 -accelerometer: 951110862,0.32577,1.30308,9.77311 -accelerometer: 951130882,0.249119,1.53304,9.42818 -accelerometer: 951150840,0.344933,1.78216,9.3132 -accelerometer: 951170860,0.306608,1.68634,9.73479 -accelerometer: 951190666,0.249119,1.64802,9.79228 -accelerometer: 951210777,0.249119,1.57136,9.69646 -accelerometer: 951231376,0.114978,1.5522,9.56232 -accelerometer: 951250785,-0.019163,1.76299,9.77311 -accelerometer: 951270683,0.0383259,1.57136,9.75395 -accelerometer: 951290672,-0.019163,1.64802,9.50483 -accelerometer: 951310844,0.0383259,1.62885,9.46651 -accelerometer: 951330833,0.0383259,1.41806,9.63897 -accelerometer: 951350852,0.153304,1.64802,9.6773 -accelerometer: 951370689,0.229956,1.66718,9.71563 -accelerometer: 951390647,0.172467,1.66718,9.50483 -irProximity:951401857,0.101961 -accelerometer: 951410880,0.19163,1.5522,9.60065 -accelerometer: 951430839,-0.0574889,1.66718,9.71563 -accelerometer: 951450858,-0.114978,1.5522,9.54316 -accelerometer: 951470878,0.210793,1.76299,9.69646 -accelerometer: 951490867,0.19163,1.62885,9.524 -irProximity:951502534,0 -accelerometer: 951510825,0.114978,1.66718,9.65814 -accelerometer: 951530540,0.268282,1.89713,9.56232 -accelerometer: 951550529,0.306608,1.83965,9.40902 -accelerometer: 951570701,0.249119,1.7055,9.54316 -accelerometer: 951590720,0.172467,1.74383,9.56232 -accelerometer: 951610618,0.19163,1.5522,9.40902 -accelerometer: 951630637,0.153304,1.7055,9.46651 -accelerometer: 951650657,0.114978,1.80132,9.71563 -accelerometer: 951670615,0.229956,1.68634,9.58148 -accelerometer: 951690940,-0.019163,1.97379,8.91078 -irProximity:951704133,0.027451 -accelerometer: 951711540,0.0766519,1.74383,9.3132 -accelerometer: 951730583,-0.019163,1.72467,9.6773 -accelerometer: 951750816,0.0574889,1.5522,9.69646 -accelerometer: 951770652,0.0766519,1.43722,9.92642 -accelerometer: 951790611,0.0574889,1.53304,9.73479 -irProximity:951804780,0.109804 -accelerometer: 951810661,0,1.47555,9.71563 -accelerometer: 951830802,0.114978,1.53304,9.90726 -accelerometer: 951850883,0.153304,1.47555,10.0989 -accelerometer: 951870872,0.229956,1.80132,9.92642 -accelerometer: 951890678,0.344933,1.82048,10.233 -irProximity:951905580,0.0588235 -accelerometer: 951910911,0.268282,1.68634,10.0414 -accelerometer: 951930869,0.249119,1.85881,9.60065 -accelerometer: 951950645,0.0574889,1.74383,9.40902 -accelerometer: 951970847,0.229956,1.83965,9.65814 -accelerometer: 951990684,0.344933,1.64802,9.71563 -irProximity:952006074,0 -accelerometer: 952010673,0.19163,1.5522,9.71563 -accelerometer: 952030662,0.172467,1.41806,9.77311 -accelerometer: 952050773,0.19163,1.30308,9.65814 -accelerometer: 952070670,0.19163,1.49471,9.63897 -accelerometer: 952090629,0.019163,1.57136,9.21739 -irProximity:952106721,0.129412 -accelerometer: 952110862,0.019163,1.68634,9.14074 -accelerometer: 952130851,0.0574889,1.80132,9.29404 -accelerometer: 952150840,0.249119,1.57136,9.88809 -accelerometer: 952170829,0.268282,1.3989,9.96474 -accelerometer: 952190849,0.172467,1.49471,9.90726 -irProximity:952207429,0.0862745 -accelerometer: 952210655,-0.019163,1.5522,9.71563 -accelerometer: 952231162,0,1.51387,9.73479 -accelerometer: 952250816,0.0574889,1.66718,9.63897 -accelerometer: 952270652,0.19163,1.5522,9.71563 -accelerometer: 952290794,0.134141,1.68634,9.38986 -irProximity:952308137,0.164706 -accelerometer: 952310874,0.172467,1.7055,9.524 -accelerometer: 952330833,0.153304,1.68634,9.40902 -accelerometer: 952350852,0.364096,1.64802,9.35153 -accelerometer: 952370872,0.479074,1.62885,9.58148 -accelerometer: 952390830,0.268282,1.5522,9.37069 -irProximity:952408815,0.0980392 -accelerometer: 952410850,0.0958148,1.60969,9.40902 -accelerometer: 952430839,0.0574889,1.57136,9.42818 -accelerometer: 952450614,0.0958148,1.7055,9.60065 -accelerometer: 952470847,0.134141,1.74383,9.524 -accelerometer: 952490653,0.402422,1.72467,9.65814 -irProximity:952509431,0 -accelerometer: 952510825,0.32577,1.82048,9.37069 -accelerometer: 952530845,0.421585,1.85881,9.46651 -accelerometer: 952550681,0.383259,1.87797,9.65814 -accelerometer: 952570854,0.172467,1.64802,9.63897 -accelerometer: 952590904,0.210793,1.85881,9.61981 -irProximity:952610139,0.121569 -accelerometer: 952610832,0.19163,1.89713,9.524 -accelerometer: 952630668,-0.0574889,1.89713,9.50483 -accelerometer: 952650779,0.306608,1.78216,9.77311 -accelerometer: 952670829,0.114978,2.10793,9.56232 -accelerometer: 952690849,-0.689867,1.99295,8.10594 -irProximity:952710634,0.0705882 -accelerometer: 952712455,0.0383259,2.03127,9.65814 -accelerometer: 952730827,0,1.60969,10.0797 -accelerometer: 952750877,-0.0383259,1.85881,10.1755 -accelerometer: 952770835,0.0574889,1.72467,10.5971 -accelerometer: 952790855,0.229956,1.5522,10.118 -irProximity:952811219,0.0784314 -accelerometer: 952810844,0.249119,2.14625,9.96474 -accelerometer: 952830680,0.019163,2.16542,9.06409 -accelerometer: 952850608,-0.0958148,2.51035,9.23655 -accelerometer: 952870628,0.344933,2.20374,9.63897 - diff --git a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_slam.dat b/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_slam.dat deleted file mode 100644 index e8bc5c73..00000000 --- a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_slam.dat +++ /dev/null @@ -1,246 +0,0 @@ -accelerometer: 958370628,-0.479074,1.93546,9.71563 -accelerometer: 958391135,-0.5174,2.05044,9.48567 -orientation:942720878,5 -proximity:958398560,0 -irProximity:958400575,0 -accelerometer: 958410850,-0.19163,2.16542,9.58148 -accelerometer: 958430839,-0.153304,2.20374,9.42818 -accelerometer: 958450797,-0.249119,2.05044,9.69646 -accelerometer: 958470847,-0.32577,1.85881,9.61981 -accelerometer: 958490684,-0.229956,1.78216,9.79228 -accelerometer: 958510642,-0.210793,1.66718,9.71563 -accelerometer: 958530875,-0.210793,1.93546,9.46651 -accelerometer: 958550681,-0.19163,1.82048,9.37069 -accelerometer: 958570915,-0.153304,2.01211,9.29404 -accelerometer: 958590720,-0.0766519,1.83965,9.19823 -irProximity:958602235,0.0862745 -accelerometer: 958610832,-0.0574889,1.9163,9.21739 -accelerometer: 958630851,-0.134141,1.83965,9.524 -accelerometer: 958650840,-0.153304,1.82048,9.75395 -accelerometer: 958670829,-0.19163,1.7055,9.98391 -accelerometer: 958690849,-0.153304,1.76299,9.86893 -irProximity:958702912,0.156863 -accelerometer: 958710838,-0.114978,1.76299,9.63897 -accelerometer: 958730827,0.019163,1.9163,9.58148 -accelerometer: 958750785,0.019163,1.78216,9.61981 -accelerometer: 958770774,0,2.05044,9.65814 -accelerometer: 958790641,0.229956,2.2229,9.33237 -irProximity:958803559,0.0431373 -accelerometer: 958810874,0.364096,2.31872,9.81144 -accelerometer: 958830833,0.594052,2.31872,10.1755 -accelerometer: 958850852,0.689867,2.41453,9.98391 -accelerometer: 958870841,1.5522,2.77863,10.3863 -accelerometer: 958891135,2.16542,3.27687,11.0762 -irProximity:958904237,0.133333 -accelerometer: 958910911,2.87445,3.66013,11.5744 -accelerometer: 958930656,2.51035,4.02422,11.3636 -accelerometer: 958950767,1.51387,3.37268,10.9229 -accelerometer: 958970847,1.34141,4.21585,11.6319 -accelerometer: 958990684,1.09229,3.94757,12.5326 -irProximity:959004884,0.129412 -accelerometer: 959010795,0.862334,4.04339,12.5134 -accelerometer: 959030845,0.90066,4.36916,11.9002 -accelerometer: 959050834,0.824008,4.23502,11.7086 -accelerometer: 959070854,1.14978,4.29251,12.6859 -accelerometer: 959090843,0.670704,4.06255,12.226 -irProximity:959105561,0.0392157 -accelerometer: 959110832,1.41806,4.19669,12.6092 -accelerometer: 959130882,1.89713,3.94757,11.7661 -accelerometer: 959150871,1.97379,4.33083,11.5169 -accelerometer: 959170646,2.12709,5.03986,10.0989 -accelerometer: 959190788,1.59053,5.00153,7.85682 -irProximity:959206239,0.0588235 -accelerometer: 959210655,1.28392,5.40396,6.09382 -accelerometer: 959230827,1.0348,5.44228,4.5033 -accelerometer: 959250846,-0.0574889,5.84471,2.81696 -orientation:959250846,1 -accelerometer: 959270835,-1.68634,5.26982,0.824008 -accelerometer: 959290763,-2.37621,6.01717,-1.60969 -irProximity:959306916,0.160784 -accelerometer: 959310844,-3.04691,5.42312,-1.87797 -accelerometer: 959330833,-3.89008,5.63391,-0.19163 -accelerometer: 959350669,-4.67576,5.49977,-0.919823 -accelerometer: 959370811,-4.79074,5.99801,-1.0348 -accelerometer: 959390830,-4.19669,6.22797,-0.594052 -irProximity:959407594,0 -accelerometer: 959410880,-4.1392,6.61122,-0.651541 -accelerometer: 959430839,-3.64096,7.0903,-0.134141 -accelerometer: 959450767,-3.06608,7.68435,0.0958148 -accelerometer: 959470878,-2.7403,7.99096,0.479074 -accelerometer: 959490836,-2.37621,8.50836,0.632378 -irProximity:959508271,0.109804 -accelerometer: 959510825,-2.2229,8.6425,0 -accelerometer: 959530845,-1.74383,9.37069,-0.134141 -accelerometer: 959550681,-1.30308,10.0414,0.440748 -accelerometer: 959570884,-1.45639,9.25571,-0.0958148 -accelerometer: 959590690,-1.64802,9.61981,-0.306608 -irProximity:959608887,0.129412 -accelerometer: 959610862,-1.53304,9.96474,-0.134141 -accelerometer: 959630668,-1.24559,9.60065,-0.306608 -accelerometer: 959650962,-1.09229,9.69646,-0.843171 -accelerometer: 959670829,-1.20727,10.4055,-0.613215 -accelerometer: 959690879,-0.651541,10.5013,-0.19163 -irProximity:959709595,0 -accelerometer: 959710868,-1.07313,10.3672,-0.421585 -accelerometer: 959730827,-1.5522,9.77311,0.229956 -accelerometer: 959750846,-1.68634,9.524,0.019163 -accelerometer: 959770683,-0.90066,10.118,-0.287445 -accelerometer: 959790855,-0.919823,9.79228,-0.210793 -accelerometer: 959810844,0.0958148,9.10241,0.594052 -accelerometer: 959830833,-1.1881,9.90726,0.785682 -accelerometer: 959850883,-0.344933,9.77311,0.114978 -accelerometer: 959870872,-0.268282,9.71563,0.306608 -accelerometer: 959890861,-0.632378,9.63897,0.268282 -irProximity:959910981,0.0470588 -accelerometer: 959910880,0.019163,9.63897,-0.172467 -accelerometer: 959930869,-0.32577,9.84977,-0.210793 -accelerometer: 959950858,-1.45639,10.0222,0.344933 -accelerometer: 959970847,-1.45639,8.92994,-0.0383259 -accelerometer: 959990684,-1.95462,8.83413,0.70903 -irProximity:960011567,0.117647 -accelerometer: 960010490,-2.49119,8.71915,0.287445 -accelerometer: 960030875,-3.23854,7.64602,0.555726 -accelerometer: 960050681,-3.92841,6.84118,0.249119 -accelerometer: 960070854,-5.00153,4.6566,0.728193 -accelerometer: 960090690,-9.23655,1.26476,0.5174 -accelerometer: 960110771,-14.4872,-3.58348,0.019163 -irProximity:960112611,0 -accelerometer: 960130912,-20.1978,-12.5326,0.229956 -accelerometer: 960150840,-21.2709,-22.574,-0.632378 -accelerometer: 960170829,-20.8685,-28.3037,-2.87445 -accelerometer: 960190696,-14.2764,-35.5473,-3.02775 -accelerometer: 960210685,1.11145,-38.1151,1.93546 -irProximity:960213074,0.0431373 -accelerometer: 960230857,27.3264,-38.8433,13.1266 -accelerometer: 960250877,39.2266,-22.229,6.03634 -accelerometer: 960270866,39.2266,-22.9956,6.86034 -orientation:960270866,4 -accelerometer: 960290641,39.2266,-24.6819,27.8055 -accelerometer: 960310722,39.2266,-10.9421,17.5341 -irProximity:960313966,0 -accelerometer: 960330863,19.1821,-4.38832,-4.15836 -accelerometer: 960350883,10.3863,-3.75594,-7.53105 -accelerometer: 960370872,8.83413,-5.71057,-1.57136 -accelerometer: 960390830,10.2522,-6.80285,3.18105 -accelerometer: 960410697,12.3984,-6.91783,3.87092 -irProximity:960414826,0.129412 -accelerometer: 960430686,11.9769,-6.937,3.54515 -accelerometer: 960450767,9.44734,-5.74889,1.53304 -accelerometer: 960470695,8.06761,-5.174,0.862334 -accelerometer: 960490806,6.47708,-5.67224,1.16894 -accelerometer: 960510673,6.24713,-5.36563,2.24207 -irProximity:960515717,0.145098 -accelerometer: 960530875,6.26629,-6.01717,2.52951 -accelerometer: 960550651,6.64955,-6.13215,2.68282 -accelerometer: 960570579,7.51188,-5.95968,2.45286 -accelerometer: 960590568,7.99096,-5.6914,1.93546 -accelerometer: 960610557,8.2784,-5.0207,1.93546 -irProximity:960616273,0.109804 -accelerometer: 960631400,7.53105,-5.13568,0.881497 -accelerometer: 960650871,6.55374,-4.94405,1.16894 -accelerometer: 960670860,6.82202,-5.19316,2.4337 -accelerometer: 960690879,7.22444,-5.38479,2.35705 -accelerometer: 960710685,7.72268,-5.03986,1.97379 -irProximity:960717194,0 -accelerometer: 960730857,7.81849,-5.05902,1.7055 -accelerometer: 960750846,7.83765,-4.92488,1.60969 -accelerometer: 960771354,8.02928,-5.07819,1.85881 -accelerometer: 960790855,8.24008,-4.77158,1.9163 -accelerometer: 960810691,8.08677,-9.81144,1.60969 -irProximity:960818055,0.0705882 -accelerometer: 960830863,8.06761,-4.79074,1.66718 -accelerometer: 960850700,8.45087,-4.90572,2.16542 -accelerometer: 960870780,8.7958,-5.26982,2.29956 -accelerometer: 960890678,9.21739,-4.90572,2.20374 -accelerometer: 960910667,9.40902,-5.03986,2.49119 -irProximity:960918915,0.0588235 -accelerometer: 960930869,9.40902,-4.82907,2.68282 -accelerometer: 960950858,9.02576,-4.86739,1.85881 -accelerometer: 960970847,8.75748,-4.40748,1.66718 -accelerometer: 960990684,9.06409,-4.17753,2.31872 -accelerometer: 961010673,9.35153,-3.48766,2.77863 -irProximity:961019776,0.0117647 -accelerometer: 961030692,9.25571,-3.54515,2.52951 -accelerometer: 961050834,9.23655,-3.35352,2.47202 -accelerometer: 961070884,9.92642,-2.97026,2.587 -accelerometer: 961090843,10.2522,-2.72114,2.97026 -accelerometer: 961110709,10.9421,-2.64449,3.02775 -irProximity:961120637,0.117647 -accelerometer: 961130882,11.2487,-2.98942,3.9859 -accelerometer: 961150871,10.8271,-2.93193,5.05902 -accelerometer: 961170860,10.6163,-2.01211,6.13215 -accelerometer: 961190879,9.61981,-2.14625,6.18964 -accelerometer: 961210685,8.41254,-1.59053,5.82554 -irProximity:961222016,0 -accelerometer: 961230857,7.51188,-0.843171,5.95968 -accelerometer: 961250877,5.34647,1.49471,9.63897 -accelerometer: 961270683,6.24713,-0.670704,7.32025 -accelerometer: 961290611,5.15484,-0.172467,7.6077 -orientation:961290611,5 -accelerometer: 961310691,4.25418,1.01564,7.6077 -accelerometer: 961330833,3.69845,1.76299,7.58854 -accelerometer: 961350883,3.85176,1.49471,7.37774 -accelerometer: 961370872,3.39185,1.5522,8.66166 -accelerometer: 961390830,2.72114,1.32224,9.0066 -accelerometer: 961410880,2.35705,1.41806,8.56585 -irProximity:961423371,0.0313726 -accelerometer: 961430869,1.82048,1.7055,8.02928 -accelerometer: 961450645,1.16894,2.31872,8.4892 -accelerometer: 961470786,1.09229,2.41453,8.94911 -accelerometer: 961490867,1.1881,2.14625,9.02576 -accelerometer: 961510856,0.90066,2.70198,8.69999 -irProximity:961526093,0 -accelerometer: 961530509,0.824008,3.02775,7.49272 -accelerometer: 961550498,0.766519,3.37268,6.86034 -accelerometer: 961570548,0.804845,3.75594,7.30109 -accelerometer: 961590537,0.689867,3.71762,7.58854 -accelerometer: 961610496,0.134141,3.75594,7.91431 -irProximity:961626588,0.0980392 -accelerometer: 961630546,0,4.08171,7.91431 -accelerometer: 961650504,0.268282,4.17753,7.95263 -accelerometer: 961670493,0.402422,4.27334,7.66519 -accelerometer: 961690482,0.440748,4.42665,7.62686 -accelerometer: 961710502,0.574889,4.82907,7.32025 -irProximity:961727051,0 -accelerometer: 961730491,0.479074,5.00153,7.51188 -accelerometer: 961750511,0.613215,4.77158,8.04845 -accelerometer: 961770530,0.459911,4.63744,8.18259 -accelerometer: 961790641,0,4.52246,7.49272 -accelerometer: 961810661,-0.019163,4.69493,6.89867 -irProximity:961827729,0.113725 -accelerometer: 961830680,0.172467,5.0207,7.22444 -accelerometer: 961850700,0.306608,5.09735,8.01012 -accelerometer: 961870628,0.153304,4.94405,8.39338 -accelerometer: 961890861,0.249119,4.79074,8.08677 -accelerometer: 961910850,0.479074,5.23149,7.91431 -irProximity:961928406,0.152941 -accelerometer: 961930869,0.364096,5.28898,8.10594 -accelerometer: 961950858,0.306608,5.15484,8.52752 -accelerometer: 961970878,-0.019163,4.84823,8.50836 -accelerometer: 961990684,-0.0958148,4.80991,7.9718 -accelerometer: 962010673,0.153304,5.44228,7.761 -irProximity:962029084,0.141176 -accelerometer: 962030662,0.249119,5.46145,7.79933 -accelerometer: 962050803,0.19163,5.5381,8.41254 -accelerometer: 962070884,-0.019163,5.61475,8.45087 -accelerometer: 962090690,-0.498237,5.40396,9.46651 -accelerometer: 962110648,-1.95462,5.90219,8.16343 -irProximity:962129792,0.0392157 -accelerometer: 962130668,-0.498237,5.49977,6.937 -accelerometer: 962150657,-0.0574889,5.44228,7.89514 -accelerometer: 962170860,0.268282,5.13568,9.14074 -accelerometer: 962190879,0.0383259,4.88656,8.66166 -accelerometer: 962210685,0.0958148,5.00153,8.96827 -irProximity:962230866,0.192157 -accelerometer: 962230552,0.134141,4.69493,8.75748 -accelerometer: 962250877,0.210793,4.94405,8.54668 -accelerometer: 962270866,0.019163,5.03986,9.06409 -accelerometer: 962290550,-0.306608,4.82907,8.68083 -accelerometer: 962310600,-0.249119,5.07819,8.91078 -irProximity:962331421,0.0627451 -accelerometer: 962330955,0.306608,5.13568,9.06409 -accelerometer: 962350700,0.210793,5.174,9.04492 -accelerometer: 962370689,0.0766519,4.92488,8.96827 -accelerometer: 962390678,-0.229956,4.92488,7.81849 -accelerometer: 962410697,-0.172467,5.59559,7.78017 - diff --git a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_turnover.dat b/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_turnover.dat deleted file mode 100644 index 81e76758..00000000 --- a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_turnover.dat +++ /dev/null @@ -1,364 +0,0 @@ -accelerometer: 968940727,-0.402422,0.594052,9.84977 -accelerometer: 968960838,-0.210793,0.555726,9.94558 -accelerometer: 968980674,-0.0766519,0.574889,9.71563 -orientation:961290611,5 -accelerometer: 969000572,0.0383259,0.785682,9.69646 -proximity:969000977,0 -irProximity:969003693,0 -accelerometer: 969020866,-0.134141,0.747356,9.75395 -accelerometer: 969040641,-0.172467,0.613215,9.69646 -accelerometer: 969060813,-0.229956,0.632378,9.50483 -accelerometer: 969080650,-0.287445,0.843171,9.61981 -accelerometer: 969100639,-0.019163,0.766519,9.6773 -irProximity:969104675,0.105882 -accelerometer: 969120841,-0.153304,0.651541,9.6773 -accelerometer: 969140830,-0.114978,0.785682,9.60065 -accelerometer: 969160880,-0.0574889,0.938986,9.8306 -accelerometer: 969180869,0.0574889,0.804845,10.0222 -accelerometer: 969200675,-0.0574889,0.70903,9.77311 -irProximity:969205353,0.0431373 -accelerometer: 969220664,-0.0958148,0.785682,9.79228 -accelerometer: 969240806,0.0958148,0.747356,9.90726 -accelerometer: 969260825,-0.0383259,0.728193,9.65814 -accelerometer: 969280845,-0.19163,0.804845,9.58148 -accelerometer: 969300651,-0.172467,0.824008,9.8306 -irProximity:969306244,0.0117647 -accelerometer: 969320884,-0.172467,0.804845,9.61981 -accelerometer: 969340843,-0.19163,0.804845,9.61981 -accelerometer: 969360832,-0.268282,0.70903,9.35153 -accelerometer: 969380851,-0.268282,0.958148,9.10241 -accelerometer: 969400535,-0.114978,1.01564,9.38986 -irProximity:969407135,0.0980392 -accelerometer: 969420829,-0.114978,0.958148,9.54316 -accelerometer: 969440879,-0.0766519,0.90066,9.58148 -accelerometer: 969460655,0.0383259,0.977311,9.46651 -accelerometer: 969480766,0.153304,1.24559,9.42818 -accelerometer: 969500663,-0.0383259,1.43722,9.1599 -irProximity:969507813,0.113725 -accelerometer: 969520774,-0.0383259,1.80132,9.02576 -accelerometer: 969540550,-0.268282,1.93546,8.39338 -accelerometer: 969560874,0.134141,2.83612,7.58854 -accelerometer: 969580650,1.26476,3.90925,7.6077 -accelerometer: 969600669,1.82048,4.57995,7.6077 -irProximity:969608673,0.164706 -accelerometer: 969620872,1.82048,5.36563,7.85682 -accelerometer: 969640647,2.52951,4.12004,8.20175 -accelerometer: 969660819,4.1392,3.90925,6.74537 -accelerometer: 969680839,4.61828,4.79074,6.53457 -accelerometer: 969700645,5.97885,4.36916,5.94052 -irProximity:969709534,0 -accelerometer: 969720847,6.76453,3.64096,5.94052 -accelerometer: 969740836,8.29757,3.54515,5.38479 -orientation:969740836,4 -accelerometer: 969760825,9.524,4.31167,3.85176 -accelerometer: 969780845,10.0797,4.34999,2.37621 -accelerometer: 969800651,5.94052,5.40396,-2.56784 -irProximity:969810425,0.113725 -accelerometer: 969820854,11.1528,2.4337,4.04339 -accelerometer: 969840843,12.111,6.34294,-4.90572 -accelerometer: 969860832,8.56585,3.18105,1.62885 -accelerometer: 969880576,4.80991,0.70903,3.21938 -accelerometer: 969900687,3.50682,-0.670704,5.82554 -irProximity:969911316,0.129412 -accelerometer: 969920646,2.37621,0,2.31872 -accelerometer: 969940849,0.479074,1.85881,0.728193 -orientation:969940849,1 -accelerometer: 969960716,0.766519,1.41806,0.364096 -accelerometer: 969980857,4.61828,0.881497,-1.20727 -accelerometer: 970000602,4.38832,1.32224,0.90066 -irProximity:970011994,0.152941 -accelerometer: 970020927,-0.574889,-0.268282,1.9163 -accelerometer: 970040855,0.421585,1.80132,-3.00859 -accelerometer: 970060661,-4.73325,4.63744,5.11651 -accelerometer: 970080802,3.73678,2.85528,14.5255 -accelerometer: 970100883,2.72114,1.36057,5.55726 -irProximity:970112732,0 -accelerometer: 970120872,2.10793,-1.82048,12.9158 -accelerometer: 970140861,-1.26476,-3.18105,12.4176 -accelerometer: 970160850,-0.594052,-0.0958148,3.04691 -accelerometer: 970180869,0.383259,-2.24207,17.8599 -accelerometer: 970200675,0.555726,-2.51035,16.5951 -orientation:970200675,5 -irProximity:970214111,0.160784 -accelerometer: 970220878,-0.114978,-1.07313,6.64955 -accelerometer: 970240836,0.268282,-0.364096,3.50682 -accelerometer: 970260825,0.32577,-0.958148,6.87951 -accelerometer: 970280845,0.402422,-1.13062,8.56585 -accelerometer: 970300590,0.632378,-1.45639,12.7242 -irProximity:970314850,0.156863 -accelerometer: 970320884,0.249119,-1.76299,8.60417 -accelerometer: 970340690,1.0348,-2.68282,12.5709 -accelerometer: 970360801,1.41806,-0.153304,10.4438 -accelerometer: 970380882,-0.344933,-0.249119,7.64602 -accelerometer: 970400871,-0.287445,0.306608,11.1145 -irProximity:970415558,0.0784314 -accelerometer: 970420860,-0.229956,-0.0766519,8.89162 -accelerometer: 970440818,-0.594052,0.0383259,9.33237 -accelerometer: 970460868,0.785682,0.19163,10.4247 -accelerometer: 970480674,-0.804845,-0.383259,8.02928 -accelerometer: 970500846,0.0958148,0.268282,10.5013 -irProximity:970516266,0 -accelerometer: 970520866,-0.0766519,0.019163,9.81144 -accelerometer: 970540550,-0.5174,-0.134141,9.1599 -accelerometer: 970560874,0.536563,0.114978,10.6546 -accelerometer: 970580680,-0.344933,-0.153304,9.38986 -accelerometer: 970600791,-0.0766519,0.19163,4.92488 -accelerometer: 970620811,0.114978,-0.0574889,9.90726 -accelerometer: 970640830,-0.459911,-0.019163,9.37069 -accelerometer: 970660880,-1.0348,-1.36057,9.524 -accelerometer: 970680839,0.402422,-3.96673,11.1912 -accelerometer: 970700858,-0.824008,-0.996474,9.56232 -accelerometer: 970720664,1.7055,0.996474,9.0066 -accelerometer: 970740806,0.70903,0,10.0989 -accelerometer: 970760642,1.5522,-1.07313,9.88809 -accelerometer: 970780814,5.80638,-1.1881,9.38986 -accelerometer: 970800865,6.84118,-0.287445,8.77664 -irProximity:970818329,0.027451 -accelerometer: 970820884,1.72467,0.536563,9.65814 -accelerometer: 970840873,-3.14273,-1.5522,10.4438 -accelerometer: 970860832,1.87797,-4.31167,7.12862 -accelerometer: 970880882,5.32731,-0.843171,11.5744 -accelerometer: 970900657,8.89162,-1.85881,10.5396 -irProximity:970919006,0.133333 -accelerometer: 970920860,5.34647,-0.728193,13.0691 -accelerometer: 970940879,2.97026,-1.45639,12.0535 -accelerometer: 970960868,2.62533,-2.08876,11.2295 -accelerometer: 970980827,2.20374,-0.421585,10.9421 -accelerometer: 971000877,1.11145,1.34141,11.5553 -irProximity:971019684,0.0117647 -accelerometer: 971020866,0.938986,2.35705,11.2295 -accelerometer: 971040855,-0.287445,1.01564,8.71915 -accelerometer: 971060874,-1.62885,0.862334,4.98237 -accelerometer: 971080863,-2.587,1.20727,2.98942 -accelerometer: 971100883,-1.85881,1.82048,2.56784 -irProximity:971120392,0 -accelerometer: 971120872,-0.996474,2.62533,8.25924 -accelerometer: 971140678,-2.98942,2.87445,10.0222 -accelerometer: 971160789,-3.35352,2.20374,7.6077 -accelerometer: 971180686,-2.26123,3.14273,5.09735 -accelerometer: 971200645,-2.12709,3.6218,5.32731 -irProximity:971221100,0.160784 -accelerometer: 971220878,-4.57995,4.34999,5.82554 -accelerometer: 971240867,-5.67224,4.82907,6.97532 -accelerometer: 971260856,-4.61828,3.02775,9.92642 -accelerometer: 971280875,-3.90925,0.229956,10.9995 -accelerometer: 971300926,-3.2577,1.85881,10.4438 -irProximity:971321655,0.133333 -accelerometer: 971320518,-2.72114,1.89713,8.29757 -accelerometer: 971340812,-2.08876,1.34141,7.83765 -accelerometer: 971360862,-2.18458,3.12356,9.19823 -accelerometer: 971380851,-1.09229,3.71762,10.348 -accelerometer: 971400871,-1.16894,3.41101,10.8271 -irProximity:971422485,0.0980392 -accelerometer: 971420890,-1.07313,2.37621,9.54316 -accelerometer: 971440879,-1.1881,2.08876,7.83765 -accelerometer: 971460838,-1.30308,2.16542,8.71915 -accelerometer: 971480857,-0.670704,3.06608,9.29404 -accelerometer: 971500877,-0.114978,3.14273,9.65814 -accelerometer: 971520591,-0.0766519,2.33788,9.96474 -irProximity:971522980,0.141176 -accelerometer: 971541251,-1.0348,1.51387,9.21739 -accelerometer: 971560508,-0.785682,1.11145,8.41254 -accelerometer: 971580467,1.78216,2.68282,8.58501 -accelerometer: 971600486,2.9511,4.17753,7.64602 -accelerometer: 971620506,3.69845,3.90925,6.76453 -irProximity:971623474,0.105882 -accelerometer: 971640495,3.73678,4.02422,5.86387 -accelerometer: 971660514,5.97885,4.57995,5.40396 -accelerometer: 971680503,8.71915,5.26982,6.09382 -accelerometer: 971700492,9.96474,6.41959,5.67224 -accelerometer: 971720512,10.233,6.11299,3.89008 -irProximity:971724609,0.00392157 -orientation:971720512,4 -accelerometer: 971740592,8.29757,4.36916,1.49471 -accelerometer: 971760612,6.80285,3.1044,-0.919823 -accelerometer: 971780570,6.7262,1.80132,-2.97026 -accelerometer: 971800681,7.51188,1.14978,-4.04339 -accelerometer: 971820701,6.45792,1.01564,-5.94052 -irProximity:971825317,0.227451 -accelerometer: 971840690,7.26277,0.747356,-9.3132 -accelerometer: 971860648,5.80638,0.613215,-9.21739 -orientation:971860648,6 -accelerometer: 971880729,4.15836,-0.210793,-9.37069 -accelerometer: 971900871,1.82048,-1.20727,-8.68083 -proximity:971911582,1 -accelerometer: 971920677,0.613215,-1.60969,-7.93347 -irProximity:971926178,0.478431 -accelerometer: 971940879,-3.87092,1.09229,15.637 -accelerometer: 971960838,-1.3989,-5.00153,-8.02928 -accelerometer: 971980644,-1.22643,-0.862334,-9.58148 -accelerometer: 972000633,-0.938986,-0.747356,-9.48567 -accelerometer: 972020652,-1.53304,0.229956,-7.0903 -accelerometer: 972040824,-0.364096,-1.07313,-8.94911 -accelerometer: 972060844,0.5174,-0.785682,-6.66871 -accelerometer: 972080833,-0.574889,0.689867,-4.04339 -accelerometer: 972100852,0.19163,0.536563,-1.64802 -accelerometer: 972120689,-0.19163,-0.019163,0.0766519 -orientation:972120689,3 -irProximity:972126739,0.443137 -accelerometer: 972140891,-0.574889,0.268282,-16.6718 -accelerometer: 972160667,-0.287445,-0.019163,-10.6929 -accelerometer: 972180808,-0.153304,-0.114978,-9.79228 -orientation:972180808,6 -accelerometer: 972200675,-0.114978,-0.0766519,-9.63897 -accelerometer: 972220878,-0.0574889,-0.019163,-9.524 -accelerometer: 972240653,-0.0958148,-0.0766519,-9.42818 -proximity:972251090,0 -accelerometer: 972260825,-0.0766519,4.88656,-9.40902 -accelerometer: 972280845,-0.114978,4.88656,-9.48567 -accelerometer: 972300651,-0.114978,-0.019163,-9.44734 -accelerometer: 972320640,-0.0958148,0,-9.44734 -irProximity:972327606,0.270588 -accelerometer: 972340873,-0.0958148,-0.0574889,-9.44734 -accelerometer: 972360832,-0.114978,-0.019163,-9.524 -accelerometer: 972380882,-0.0958148,-0.0383259,-9.48567 -accelerometer: 972400657,-0.134141,-0.0383259,-9.44734 -accelerometer: 972420615,-0.0766519,-0.019163,-9.524 -irProximity:972428467,0.286275 -accelerometer: 972440635,-0.134141,-0.019163,-9.50483 -accelerometer: 972460807,-0.0383259,0,-9.524 -accelerometer: 972480827,-0.114978,-0.0574889,-9.50483 -accelerometer: 972500846,-0.0383259,-0.0383259,-9.48567 -accelerometer: 972520683,-0.0766519,-0.019163,-9.46651 -irProximity:972529358,0.266667 -accelerometer: 972540702,-0.0574889,0.019163,-9.50483 -accelerometer: 972560844,-0.0766519,-0.019163,-9.50483 -accelerometer: 972580650,-0.114978,-0.0766519,-9.48567 -accelerometer: 972600822,-0.0958148,-0.0574889,-9.48567 -accelerometer: 972620689,-0.0958148,-0.0766519,-9.46651 -irProximity:972630249,0.27451 -accelerometer: 972640830,-0.0766519,-0.0383259,-9.46651 -accelerometer: 972660880,-0.0958148,-0.0574889,-9.50483 -accelerometer: 972680839,-0.114978,-0.0383259,-9.46651 -accelerometer: 972700828,-0.0958148,-0.019163,-9.46651 -accelerometer: 972720695,-0.0958148,-0.0383259,-9.50483 -irProximity:972731110,0.278431 -accelerometer: 972740867,-0.114978,-0.0574889,-9.48567 -accelerometer: 972760825,-0.0383259,0.019163,-9.44734 -accelerometer: 972780845,-0.134141,0,-9.40902 -accelerometer: 972800803,-0.134141,-0.019163,-9.44734 -accelerometer: 972820670,-0.0958148,0,-9.44734 -irProximity:972831604,0.298039 -accelerometer: 972840843,-0.0958148,-0.0383259,-9.524 -accelerometer: 972860648,-0.0958148,-0.0383259,-9.48567 -accelerometer: 972880851,-0.0574889,-0.0383259,-9.48567 -accelerometer: 972900840,-0.0383259,4.88656,-9.46651 -accelerometer: 972920677,-0.0958148,-0.019163,-9.42818 -irProximity:972932281,0.290196 -accelerometer: 972940849,-0.134141,0,-9.50483 -accelerometer: 972960838,-0.0958148,0,-9.44734 -accelerometer: 972980827,-0.0958148,-0.0383259,-9.46651 -accelerometer: 973000663,-0.0574889,-0.0958148,-9.42818 -accelerometer: 973020774,-0.0574889,-0.019163,-9.48567 -irProximity:973032959,0.282353 -accelerometer: 973040855,-0.0383259,-0.019163,-9.50483 -accelerometer: 973060844,-0.0766519,0,-9.48567 -accelerometer: 973080833,-1.32224,1.49471,-9.35153 -accelerometer: 973100852,-0.344933,-0.574889,-9.60065 -accelerometer: 973120841,0.172467,-0.114978,-9.27488 -irProximity:973133667,0.278431 -accelerometer: 973140861,1.26476,-0.210793,-9.48567 -accelerometer: 973160850,0.977311,-0.5174,-9.75395 -accelerometer: 973180839,0.498237,-0.287445,-9.44734 -accelerometer: 973200675,-0.5174,-0.977311,-9.8306 -accelerometer: 973220847,-0.19163,0.114978,-9.10241 -irProximity:973234375,0.298039 -accelerometer: 973240653,-0.574889,-0.0383259,-8.94911 -accelerometer: 973260795,-0.459911,0.536563,-9.48567 -accelerometer: 973280662,-1.05396,-1.37973,-9.40902 -accelerometer: 973300620,-1.36057,-1.74383,-9.71563 -accelerometer: 973320854,0.479074,0.632378,-10.2522 -irProximity:973335083,0.356863 -accelerometer: 973340873,1.51387,-0.728193,-12.0535 -accelerometer: 973360832,2.62533,-0.919823,-10.463 -accelerometer: 973380851,3.43017,-1.22643,-12.7434 -accelerometer: 973400810,2.52951,-1.3989,-5.6914 -accelerometer: 973420646,3.20022,-0.689867,-11.057 -accelerometer: 973440757,4.44581,-2.85528,-4.82907 -accelerometer: 973460899,6.07466,-1.87797,-5.97885 -accelerometer: 973480827,7.41607,-3.37268,-4.71409 -orientation:973480827,4 -accelerometer: 973500846,10.233,-3.4685,-3.48766 -accelerometer: 973520835,13.7973,-2.70198,-15.4454 -irProximity:973535736,0.278431 -accelerometer: 973541160,16.2502,-6.15131,0.114978 -accelerometer: 973560844,13.0691,-6.66871,-1.5522 -accelerometer: 973580650,8.52752,-4.52246,-3.06608 -accelerometer: 973600822,2.31872,-3.12356,-1.57136 -accelerometer: 973620841,1.16894,-0.498237,1.60969 -irProximity:973636444,0.14902 -accelerometer: 973640830,4.04339,0.670704,4.31167 -accelerometer: 973660667,6.49625,0.0958148,7.32025 -accelerometer: 973680778,7.07114,1.51387,7.41607 -accelerometer: 973700645,5.40396,1.74383,8.41254 -orientation:973700645,5 -accelerometer: 973720817,1.74383,0.651541,5.61475 -irProximity:973737152,0.137255 -accelerometer: 973740867,3.33436,-2.01211,5.38479 -accelerometer: 973760856,1.97379,-2.28039,6.64955 -accelerometer: 973780906,0.479074,-1.45639,2.51035 -accelerometer: 973800834,-3.23854,0.134141,2.10793 -accelerometer: 973820854,-0.421585,4.33083,13.2224 -irProximity:973837829,0 -accelerometer: 973840659,1.32224,2.35705,10.6738 -accelerometer: 973860771,1.20727,2.98942,10.7504 -accelerometer: 973880912,2.12709,1.49471,9.79228 -accelerometer: 973900871,1.74383,1.3989,11.1528 -accelerometer: 973920829,1.24559,0.938986,11.8619 -irProximity:973938507,0.141176 -accelerometer: 973940849,1.28392,0.785682,11.6894 -accelerometer: 973960838,1.37973,1.16894,11.0762 -accelerometer: 973980827,1.59053,0.479074,10.4247 -accelerometer: 974000602,2.33788,0.383259,10.1755 -accelerometer: 974020896,2.70198,1.1881,10.9995 -irProximity:974039184,0.152941 -accelerometer: 974040824,2.01211,1.60969,10.5971 -accelerometer: 974060844,1.1881,1.1881,9.86893 -accelerometer: 974080650,0.90066,0.613215,9.48567 -accelerometer: 974100822,0.70903,0.172467,9.77311 -accelerometer: 974120658,1.13062,0.287445,10.2139 -irProximity:974139831,0.0235294 -accelerometer: 974140830,1.34141,0.785682,10.118 -accelerometer: 974160850,1.24559,0.862334,9.86893 -accelerometer: 974180839,0.881497,0.479074,9.65814 -accelerometer: 974200675,0.0574889,0.421585,9.19823 -accelerometer: 974220847,0.153304,1.09229,9.23655 -irProximity:974240539,0.12549 -accelerometer: 974240836,0.536563,0.843171,9.1599 -accelerometer: 974260642,0.613215,0.479074,9.524 -accelerometer: 974280814,0.153304,0.459911,9.46651 -accelerometer: 974300681,0.287445,0.574889,9.19823 -accelerometer: 974320884,0.0383259,0.364096,9.19823 -irProximity:974341156,0 -accelerometer: 974340873,-0.0958148,0.862334,9.8306 -accelerometer: 974360832,0,0.919823,9.63897 -accelerometer: 974380882,-0.210793,0.804845,9.50483 -accelerometer: 974400840,-0.459911,0.689867,9.19823 -accelerometer: 974420829,-0.689867,0.421585,9.54316 -irProximity:974441620,0.105882 -accelerometer: 974440513,-0.555726,0.0574889,9.90726 -accelerometer: 974460838,-0.498237,0.536563,10.0606 -accelerometer: 974480827,-0.249119,0.498237,9.48567 -accelerometer: 974500663,-0.402422,1.1881,9.61981 -accelerometer: 974520774,-0.440748,0.824008,9.50483 -irProximity:974542267,0.101961 -accelerometer: 974540794,-0.536563,0.421585,9.60065 -accelerometer: 974560752,-0.574889,0.479074,9.94558 -accelerometer: 974580650,-0.0383259,0.459911,10.233 -accelerometer: 974600791,-0.90066,1.30308,8.22091 -accelerometer: 974620506,-0.555726,0.555726,9.12157 -accelerometer: 974640556,-0.90066,0.210793,9.3132 -irProximity:974642792,0 -accelerometer: 974660819,-1.05396,0.19163,9.6773 -accelerometer: 974680686,-0.306608,0.0383259,10.4821 -accelerometer: 974700858,0.0766519,0.364096,10.4247 -accelerometer: 974720878,-0.019163,0.440748,10.8079 -accelerometer: 974740623,0,0.0766519,10.348 -irProximity:974743530,0.160784 -accelerometer: 974760856,-0.114978,0.70903,10.4438 -accelerometer: 974780845,-0.268282,0.881497,10.0222 -accelerometer: 974800865,-0.210793,1.0348,9.96474 -accelerometer: 974820579,-0.881497,0.594052,9.35153 -accelerometer: 974840690,-0.306608,0.383259,10.5205 -irProximity:974843994,0 - diff --git a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_twist.dat b/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_twist.dat deleted file mode 100644 index 19daacd2..00000000 --- a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_twist.dat +++ /dev/null @@ -1,85 +0,0 @@ -irProximity:860835426,0.0823529 -proximity:860892310,0 -irProximity:860936225,0.0431373 -orientation:0,5 -accelerometer: 1336048300935,0.632378,1.45639,9.79228 -irProximity:861036720,0.105882 -accelerometer: 1336048301035,-0.862334,1.1881,9.46651 -irProximity:861137397,0.0784314 -accelerometer: 1336048301135,-1.5522,0.421585,9.86893 -irProximity:861238319,0.172549 -accelerometer: 1336048301235,-0.996474,0.574889,9.69646 -irProximity:861338844,0.137255 -accelerometer: 1336048301335,-0.632378,0.364096,9.71563 -irProximity:861439765,0.168627 -accelerometer: 1336048301435,1.1881,0.766519,7.99096 -irProximity:861540626,0.0196078 -accelerometer: 1336048301535,9.50483,2.2229,5.49977 -irProximity:861641486,0.121569 -accelerometer: 1336048301635,9.02576,1.97379,0.919823 -irProximity:861742377,0.0784314 -accelerometer: 1336048301735,7.89514,1.51387,-5.88303 -irProximity:861843238,0.109804 -accelerometer: 1336048301835,9.21739,1.22643,-4.12004 -orientation:0,4 -irProximity:861944190,0.156863 -accelerometer: 1336048301935,9.61981,1.7055,-0.862334 -irProximity:862045112,0.152941 -accelerometer: 1336048302035,10.2905,1.89713,4.73325 -irProximity:862145942,0 -accelerometer: 1336048302135,1.47555,1.47555,8.20175 -irProximity:862246802,0.0745098 -accelerometer: 1336048302235,-1.97379,0.70903,9.61981 -irProximity:862347449,0.129412 -accelerometer: 1336048302336,-1.74383,0.824008,9.69646 -orientation:0,5 -irProximity:862448341,0.00392157 -accelerometer: 1336048302435,-1.97379,0.70903,9.69646 -irProximity:862549018,0.0509804 -accelerometer: 1336048302535,-1.99295,0.70903,9.44734 -irProximity:862649879,0.0588235 -accelerometer: 1336048302635,-1.78216,0.555726,9.58148 -irProximity:862750800,0.0156863 -accelerometer: 1336048302735,-1.41806,0.574889,9.58148 -irProximity:862851691,0.152941 -accelerometer: 1336048302835,-1.24559,0.594052,9.73479 -irProximity:862952430,0.145098 -accelerometer: 1336048302935,-1.47555,0.613215,9.61981 -irProximity:863053321,0.0901961 -accelerometer: 1336048303035,-1.34141,0.574889,9.524 -irProximity:863154212,0 -accelerometer: 1336048303135,-1.41806,0.440748,9.65814 -irProximity:863255042,0.0980392 -accelerometer: 1336048303235,-1.28392,0.574889,9.73479 -irProximity:863355933,0.0666667 -accelerometer: 1336048303335,-1.41806,0.479074,9.65814 -irProximity:863456763,0.105882 -accelerometer: 1336048303435,-1.28392,0.421585,9.86893 -irProximity:863557654,0 -accelerometer: 1336048303535,-1.01564,0.555726,9.54316 -irProximity:863658271,0.188235 -accelerometer: 1336048303635,-1.07313,0.5174,9.524 -irProximity:863759193,0.113725 -accelerometer: 1336048303735,-0.996474,0.670704,9.73479 -accelerometer: 1336048303835,-0.996474,0.536563,9.63897 -irProximity:863960731,0.0784314 -accelerometer: 1336048303935,-0.919823,0.574889,9.69646 -irProximity:864061591,0 -accelerometer: 1336048304035,-0.90066,0.536563,9.73479 -accelerometer: 1336048304135,-0.977311,0.402422,9.8306 -irProximity:864263221,0.0941176 -accelerometer: 1336048304235,-1.07313,0.344933,9.73479 -irProximity:864364142,0.117647 -accelerometer: 1336048304335,-1.07313,0.344933,9.69646 -irProximity:864465034,0.0627451 -accelerometer: 1336048304435,-0.919823,0.344933,9.69646 -irProximity:864565894,0.129412 -accelerometer: 1336048304535,-0.785682,0.555726,9.54316 -irProximity:864666419,0.113725 -accelerometer: 1336048304635,-1.11145,0.670704,9.42818 -irProximity:864767280,0.117647 -accelerometer: 1336048304735,-0.938986,0.210793,9.96474 -irProximity:864868171,0.121569 -accelerometer: 1336048304835,-0.977311,0.402422,9.86893 -irProximity:864969092,0.0784314 - diff --git a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_whip.dat b/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_whip.dat deleted file mode 100644 index d894ab7d..00000000 --- a/tests/auto/qsensorgestures_gestures/dataset2_mock_data/sensordata_whip.dat +++ /dev/null @@ -1,188 +0,0 @@ -accelerometer: 979450523,0.268282,1.80132,9.75395 -accelerometer: 979470847,-0.306608,2.51035,9.46651 -accelerometer: 979490836,-0.134141,2.14625,9.65814 -orientation:973700645,5 -accelerometer: 979510551,-0.613215,2.14625,9.38986 -proximity:979515075,0 -irProximity:979517150,0.133333 -accelerometer: 979530692,-0.0958148,2.64449,9.56232 -accelerometer: 979550864,-0.019163,2.41453,8.98743 -accelerometer: 979570854,0,3.12356,9.06409 -accelerometer: 979590873,0,3.31519,9.524 -accelerometer: 979610679,-0.019163,3.04691,9.14074 -irProximity:979618164,0.0980392 -accelerometer: 979630851,-0.32577,3.1044,8.92994 -accelerometer: 979651084,-0.440748,3.2577,8.87245 -accelerometer: 979670799,-0.268282,2.81696,8.92994 -accelerometer: 979690849,-0.498237,3.39185,8.94911 -accelerometer: 979710685,-0.229956,3.6218,8.52752 -irProximity:979719024,0.0156863 -accelerometer: 979730857,-0.0383259,3.43017,8.85329 -accelerometer: 979750663,-0.210793,3.39185,9.1599 -accelerometer: 979770805,-0.32577,3.16189,8.94911 -accelerometer: 979790641,-0.613215,2.39537,8.50836 -accelerometer: 979810661,-0.804845,3.16189,9.40902 -irProximity:979819915,0.0823529 -accelerometer: 979830833,-0.574889,3.2577,9.1599 -accelerometer: 979850852,-0.594052,2.97026,8.91078 -accelerometer: 979870872,-0.594052,3.16189,8.7958 -accelerometer: 979890830,-0.632378,3.23854,8.87245 -accelerometer: 979910697,-0.536563,2.98942,9.50483 -irProximity:979920776,0.129412 -accelerometer: 979930656,-0.249119,3.02775,9.40902 -accelerometer: 979950797,-0.172467,3.14273,9.27488 -accelerometer: 979970847,-0.19163,3.16189,9.14074 -accelerometer: 979990684,0.019163,3.14273,9.44734 -accelerometer: 980010673,-0.0766519,3.20022,9.50483 -irProximity:980021362,0.121569 -accelerometer: 980030875,-0.306608,3.66013,9.38986 -accelerometer: 980050834,0,3.16189,9.14074 -accelerometer: 980070884,-0.19163,3.29603,9.19823 -accelerometer: 980090659,-0.249119,3.29603,9.37069 -accelerometer: 980110618,-0.440748,3.21938,9.42818 -irProximity:980122070,0.109804 -accelerometer: 980130882,-0.613215,3.08524,9.3132 -accelerometer: 980150871,-0.440748,3.29603,9.04492 -accelerometer: 980170646,-0.172467,3.37268,9.27488 -accelerometer: 980190635,-0.134141,3.31519,9.69646 -accelerometer: 980210655,-0.32577,3.44933,9.10241 -irProximity:980222717,0.133333 -accelerometer: 980230857,-0.306608,3.44933,9.21739 -accelerometer: 980250846,-0.268282,3.39185,9.06409 -accelerometer: 980270835,-0.383259,4.00506,9.524 -accelerometer: 980290824,-0.364096,4.15836,10.0606 -accelerometer: 980310691,-0.287445,4.56079,12.0918 -irProximity:980323394,0.054902 -accelerometer: 980330863,0.0958148,4.25418,14.3722 -accelerometer: 980350669,-0.210793,3.90925,17.6874 -accelerometer: 980370811,-1.01564,3.29603,19.3163 -accelerometer: 980390830,-2.16542,2.56784,20.4661 -accelerometer: 980410850,-2.03127,2.68282,19.6804 -irProximity:980424072,0.137255 -accelerometer: 980430839,-1.07313,3.04691,15.1196 -accelerometer: 980450828,0.210793,1.89713,8.62334 -accelerometer: 980470878,0.919823,2.49119,3.83259 -accelerometer: 980490836,-0.919823,2.75947,-2.05044 -accelerometer: 980510825,0.0574889,1.3989,-5.76805 -irProximity:980525115,0.0313726 -accelerometer: 980531638,-0.747356,0.229956,-9.79228 -accelerometer: 980550834,-0.344933,-1.34141,-15.4645 -accelerometer: 980570854,-0.229956,-4.1392,-25.6592 -accelerometer: 980590690,0.689867,-7.83765,-35.2982 -accelerometer: 980610801,1.85881,-11.2678,-34.8958 -irProximity:980625854,0 -accelerometer: 980630668,2.18458,-13.759,-21.2517 -accelerometer: 980650779,2.29956,-15.1579,-3.85176 -accelerometer: 980670829,5.40396,-20.1978,39.2458 -accelerometer: 980690849,-8.45087,-31.0823,39.2458 -accelerometer: 980710838,-22.3632,-30.6416,39.2458 -irProximity:980726531,0.137255 -accelerometer: 980730827,-10.8462,-9.19823,39.2458 -accelerometer: 980750846,-1.22643,3.66013,8.47003 -accelerometer: 980770652,4.1392,3.7751,-4.86739 -accelerometer: 980790763,6.63039,6.97532,-14.8896 -accelerometer: 980810844,5.28898,5.25065,-15.7328 -orientation:980810844,6 -irProximity:980827209,0 -accelerometer: 980830863,3.18105,4.71409,-7.4544 -accelerometer: 980850852,2.10793,4.21585,3.69845 -accelerometer: 980870841,-1.57136,0.938986,14.5255 -accelerometer: 980890830,-4.00506,-0.0574889,19.2588 -accelerometer: 980910850,-4.61828,0.0766519,16.5185 -accelerometer: 980930808,-3.79427,2.24207,11.5744 -accelerometer: 980950858,-2.41453,3.04691,8.02928 -accelerometer: 980970847,-0.958148,3.50682,6.53457 -orientation:980970847,5 -accelerometer: 980990714,-0.0383259,3.37268,6.87951 -accelerometer: 981010642,0.172467,3.02775,8.16343 -accelerometer: 981030814,-0.32577,2.60616,9.04492 -accelerometer: 981050651,-0.843171,2.29956,10.233 -accelerometer: 981070823,-0.919823,2.60616,10.6929 -accelerometer: 981090843,-0.881497,3.00859,10.0414 -accelerometer: 981110832,-0.651541,3.41101,9.27488 -accelerometer: 981130821,-0.402422,3.83259,8.89162 -accelerometer: 981150840,-0.594052,3.58348,9.0066 -accelerometer: 981170829,-0.134141,3.58348,9.33237 -accelerometer: 981190666,-0.0958148,3.69845,8.85329 -accelerometer: 981210960,-0.229956,3.75594,9.0066 -irProximity:981229766,0.176471 -accelerometer: 981230857,-0.114978,3.6218,8.96827 -accelerometer: 981250846,-0.153304,3.43017,8.91078 -accelerometer: 981270835,-0.019163,3.75594,8.96827 -accelerometer: 981290824,-0.134141,3.4685,8.87245 -accelerometer: 981310691,-0.632378,3.41101,8.94911 -irProximity:981330444,0.0666667 -accelerometer: 981330863,-0.689867,3.23854,9.12157 -accelerometer: 981350852,-0.689867,3.18105,8.96827 -accelerometer: 981370841,-0.766519,3.21938,8.83413 -accelerometer: 981390861,-0.632378,3.20022,8.89162 -accelerometer: 981410850,-0.210793,3.16189,9.1599 -irProximity:981431121,0.0156863 -accelerometer: 981430656,-0.402422,3.27687,9.06409 -accelerometer: 981450797,-0.364096,3.1044,8.87245 -accelerometer: 981470664,-0.383259,3.16189,8.89162 -accelerometer: 981490775,-0.613215,2.89361,8.87245 -accelerometer: 981510825,-0.459911,3.33436,9.54316 -irProximity:981532775,0.0941176 -accelerometer: 981531364,0.210793,3.21938,9.6773 -accelerometer: 981550498,-0.210793,3.02775,9.06409 -accelerometer: 981570518,-0.249119,3.18105,9.29404 -accelerometer: 981590537,-0.287445,3.14273,9.14074 -accelerometer: 981610465,-0.210793,3.06608,9.29404 -accelerometer: 981630485,-0.440748,3.23854,9.44734 -irProximity:981633270,0 -accelerometer: 981650504,-0.019163,3.04691,9.65814 -accelerometer: 981670493,-0.134141,3.04691,9.29404 -accelerometer: 981690513,-0.479074,3.20022,9.06409 -accelerometer: 981710502,-0.689867,3.21938,8.77664 -accelerometer: 981730491,-0.555726,3.21938,8.98743 -irProximity:981733764,0.113725 -accelerometer: 981750511,-0.5174,2.93193,9.40902 -accelerometer: 981770561,-0.594052,2.81696,9.21739 -accelerometer: 981790702,-0.440748,2.98942,9.1599 -accelerometer: 981810691,-0.594052,3.20022,9.04492 -accelerometer: 981830680,-0.728193,2.97026,9.02576 -irProximity:981834472,0 -accelerometer: 981850669,-0.632378,2.83612,9.10241 -accelerometer: 981870719,-0.383259,3.08524,9.19823 -accelerometer: 981890678,-0.229956,3.00859,9.23655 -accelerometer: 981910819,-0.536563,2.87445,9.42818 -accelerometer: 981930686,-0.5174,3.02775,9.33237 -irProximity:981935363,0.027451 -accelerometer: 981950858,-0.632378,2.89361,9.42818 -accelerometer: 981970878,-0.536563,2.97026,9.40902 -accelerometer: 981990684,-0.651541,2.81696,9.33237 -accelerometer: 982010673,-0.555726,2.97026,9.1599 -accelerometer: 982030692,-0.651541,2.91277,9.46651 -irProximity:982036041,0.141176 -accelerometer: 982050803,-0.728193,2.79779,9.3132 -accelerometer: 982070701,-0.632378,2.91277,9.3132 -accelerometer: 982090659,-0.632378,2.87445,9.25571 -accelerometer: 982110832,-0.574889,2.77863,9.35153 -accelerometer: 982130698,-0.632378,2.79779,9.38986 -irProximity:982136932,0.129412 -accelerometer: 982150871,-0.364096,2.81696,9.524 -accelerometer: 982170829,-0.459911,2.87445,9.14074 -accelerometer: 982190696,-0.440748,2.91277,9.21739 -accelerometer: 982210868,-0.5174,2.79779,9.3132 -accelerometer: 982230674,-0.574889,2.77863,9.40902 -irProximity:982237792,0.109804 -accelerometer: 982250877,-0.383259,2.89361,9.54316 -accelerometer: 982270683,-0.555726,2.81696,9.46651 -accelerometer: 982291435,-1.0348,3.04691,8.69999 -accelerometer: 982310630,-0.670704,2.70198,9.02576 -accelerometer: 982330833,-0.938986,2.70198,8.98743 -irProximity:982338470,0.105882 -accelerometer: 982351005,-0.766519,2.56784,9.04492 -accelerometer: 982371055,-0.594052,2.79779,9.37069 -accelerometer: 982391044,-0.670704,2.56784,9.29404 -accelerometer: 982410728,-0.613215,2.45286,9.10241 -accelerometer: 982430747,-0.498237,2.45286,9.94558 -irProximity:982439269,0.117647 -accelerometer: 982450736,-0.728193,2.28039,9.8306 -accelerometer: 982470939,-0.613215,2.51035,10.0031 -accelerometer: 982490958,-0.670704,2.81696,9.98391 -accelerometer: 982510978,-0.498237,2.98942,9.65814 -accelerometer: 982530723,-0.843171,2.9511,8.85329 -irProximity:982540160,0.156863 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_cover.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_cover.dat deleted file mode 100644 index fc52f6d8..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_cover.dat +++ /dev/null @@ -1,296 +0,0 @@ -orientation:11415310938,5 -accelerometer: 11416690881,-0.383259,0.747356,10.3097 -accelerometer: 11416711145,-0.766519,0.728193,9.65814 -accelerometer: 11416731744,-0.402422,0.364096,9.98391 -irProximity:11416747364,0.294118 -proximity:11416749012,0 -accelerometer: 11416750574,-0.498237,-0.0766519,9.88809 -accelerometer: 11416771845,-0.32577,0.153304,9.60065 -accelerometer: 11416790918,0.0383259,-0.843171,8.91078 -accelerometer: 11416810938,-0.229956,-0.287445,8.85329 -accelerometer: 11416830713,-0.862334,-0.0766519,8.85329 -accelerometer: 11416850885,-1.11145,0.0383259,9.40902 -accelerometer: 11416872675,-0.90066,-0.536563,9.46651 -accelerometer: 11416890649,-0.689867,0.32577,9.77311 -accelerometer: 11416910700,-0.747356,-0.19163,9.69646 -accelerometer: 11416930689,-0.498237,-0.249119,9.33237 -accelerometer: 11416951227,-0.172467,-0.402422,9.50483 -accelerometer: 11416970636,-0.0958148,-0.249119,9.73479 -accelerometer: 11416991480,0,-0.153304,9.75395 -accelerometer: 11417010736,-0.114978,-0.32577,9.81144 -accelerometer: 11417031397,-0.344933,-0.19163,9.63897 -accelerometer: 11417051325,-0.019163,-0.172467,9.21739 -accelerometer: 11417070856,-0.114978,-0.268282,9.50483 -accelerometer: 11417090967,-0.383259,0.019163,9.33237 -accelerometer: 11417110925,-0.172467,-0.210793,9.60065 -accelerometer: 11417130731,-0.383259,-0.114978,9.37069 -accelerometer: 11417150873,-0.5174,-0.421585,9.88809 -accelerometer: 11417171014,-0.747356,-0.172467,9.65814 -accelerometer: 11417191034,-0.402422,0.0958148,9.75395 -accelerometer: 11417210931,-0.229956,-0.0383259,9.90726 -accelerometer: 11417230920,-0.306608,0.0958148,9.65814 -accelerometer: 11417250787,-0.153304,-0.019163,9.50483 -accelerometer: 11417270929,-0.306608,-0.249119,9.84977 -accelerometer: 11417290888,-0.344933,-0.287445,9.6773 -accelerometer: 11417310938,-0.0574889,-0.344933,9.6773 -accelerometer: 11417330927,-0.402422,-0.134141,9.50483 -accelerometer: 11417350794,-0.651541,-0.19163,9.46651 -accelerometer: 11417370935,-0.364096,-0.306608,9.50483 -accelerometer: 11417390924,-0.344933,-0.0958148,9.37069 -accelerometer: 11417410974,-0.19163,-0.134141,9.6773 -accelerometer: 11417430933,-0.172467,-0.249119,9.40902 -accelerometer: 11417450769,-0.440748,-0.19163,9.48567 -irProximity:11417455616,0.290196 -accelerometer: 11417470819,-0.498237,-0.210793,9.50483 -accelerometer: 11417490930,-0.421585,-0.172467,9.63897 -accelerometer: 11417510950,-0.287445,0.019163,9.75395 -accelerometer: 11417530969,-0.229956,-0.268282,9.48567 -accelerometer: 11417550775,-0.459911,-0.019163,9.42818 -accelerometer: 11417570886,-0.383259,-0.134141,9.56232 -accelerometer: 11417590997,-0.402422,-0.114978,9.69646 -accelerometer: 11417610986,-0.498237,4.82907,9.61981 -accelerometer: 11417630945,-0.32577,-0.114978,9.61981 -accelerometer: 11417650812,-0.383259,-0.134141,9.63897 -irProximity:11417657459,0.294118 -accelerometer: 11417670953,-0.210793,-0.0383259,10.0797 -accelerometer: 11417690942,-0.344933,-0.344933,9.63897 -accelerometer: 11417710962,-0.32577,-0.134141,9.63897 -accelerometer: 11417730951,-0.364096,-0.306608,9.54316 -accelerometer: 11417750818,-0.632378,0.0766519,9.65814 -irProximity:11417758381,0.290196 -accelerometer: 11417773218,-0.344933,4.75242,9.44734 -accelerometer: 11417790918,-0.440748,0.249119,9.42818 -accelerometer: 11417811029,-0.5174,4.77158,9.524 -accelerometer: 11417830713,-0.32577,-0.0383259,9.60065 -accelerometer: 11417850702,-0.421585,4.84823,9.75395 -accelerometer: 11417870722,-0.287445,-0.019163,9.56232 -accelerometer: 11417890802,-0.287445,-0.172467,9.75395 -accelerometer: 11417910791,-0.421585,-0.114978,10.0989 -accelerometer: 11417930933,-0.594052,0.153304,10.0031 -accelerometer: 11417950800,-0.977311,0.019163,10.4438 -irProximity:11417960224,0.294118 -accelerometer: 11417970972,-0.881497,-0.344933,9.94558 -accelerometer: 11417990808,-1.93546,0.19163,9.38986 -accelerometer: 11418010980,-1.51387,-0.249119,7.66519 -accelerometer: 11418031000,-1.78216,-1.20727,8.16343 -accelerometer: 11418050775,-2.2229,-1.43722,8.91078 -irProximity:11418061146,0.290196 -accelerometer: 11418070947,-1.89713,-1.36057,8.01012 -accelerometer: 11418090967,-1.57136,-0.498237,8.68083 -accelerometer: 11418110895,-2.28039,-0.574889,7.91431 -accelerometer: 11418130945,-1.51387,-1.24559,6.99448 -accelerometer: 11418150964,1.49471,-0.862334,8.41254 -irProximity:11418161915,0.294118 -accelerometer: 11418171198,2.9511,0.977311,10.8462 -accelerometer: 11418191004,2.05044,2.64449,11.3253 -accelerometer: 11418210962,1.53304,1.36057,10.8462 -accelerometer: 11418230951,0.364096,0.249119,9.1599 -accelerometer: 11418250971,-0.268282,-0.421585,8.4892 -irProximity:11418262653,0.290196 -accelerometer: 11418270929,-0.689867,4.84823,8.75748 -accelerometer: 11418290949,-0.613215,0.479074,10.4438 -accelerometer: 11418310938,-1.57136,0.306608,14.3722 -accelerometer: 11418330927,-1.57136,0.364096,10.8462 -accelerometer: 11418350946,-1.07313,0.0574889,9.524 -irProximity:11418363453,0.294118 -accelerometer: 11418370905,-1.01564,-0.19163,9.65814 -accelerometer: 11418390985,-0.919823,0.0958148,9.79228 -accelerometer: 11418410944,-1.05396,-0.0574889,9.35153 -accelerometer: 11418430963,-1.13062,0.383259,9.1599 -accelerometer: 11418450952,-1.64802,0.402422,9.46651 -accelerometer: 11418470789,-1.60969,0.19163,9.92642 -accelerometer: 11418490930,-1.26476,0.268282,9.54316 -accelerometer: 11418510950,-1.16894,0.0383259,9.44734 -accelerometer: 11418531000,-1.11145,0.0958148,9.65814 -accelerometer: 11418550928,-1.37973,0.268282,9.81144 -irProximity:11418565083,0.345098 -accelerometer: 11418570947,-1.05396,0.210793,9.73479 -accelerometer: 11418590906,-0.804845,0.0958148,9.75395 -accelerometer: 11418610956,-0.919823,-0.0958148,9.71563 -proximity:11418618768,1 -accelerometer: 11418631006,-0.594052,-0.172467,9.38986 -accelerometer: 11418650964,-0.728193,-0.0383259,9.33237 -irProximity:11418665882,0.466667 -accelerometer: 11418670923,-0.574889,0.0383259,9.23655 -accelerometer: 11418690942,-1.01564,-4.84823,9.25571 -accelerometer: 11418711054,-0.70903,0.249119,8.45087 -accelerometer: 11418730920,-0.632378,0.5174,8.66166 -accelerometer: 11418750910,-0.632378,0.306608,9.10241 -accelerometer: 11418772272,-0.824008,0.229956,10.0989 -accelerometer: 11418791010,-0.919823,0.134141,10.2714 -accelerometer: 11418810571,-0.804845,0.0766519,9.84977 -accelerometer: 11418830621,-0.90066,0.172467,9.56232 -accelerometer: 11418850671,-1.0348,0.306608,9.79228 -irProximity:11418866627,0.639216 -accelerometer: 11418870813,-0.90066,-0.19163,8.89162 -accelerometer: 11418890802,-0.766519,0.306608,9.29404 -accelerometer: 11418910761,-0.651541,0.114978,9.54316 -accelerometer: 11418930963,-0.958148,0.0766519,9.79228 -accelerometer: 11418950983,-0.613215,-0.019163,9.54316 -accelerometer: 11418970972,-0.70903,0.0574889,9.44734 -accelerometer: 11418990808,-0.958148,0.32577,9.38986 -accelerometer: 11419010828,-0.574889,0,9.46651 -accelerometer: 11419030908,-1.01564,0.32577,9.61981 -accelerometer: 11419050928,-0.862334,0.0574889,9.58148 -irProximity:11419067371,0.713726 -accelerometer: 11419070917,-0.766519,0.249119,9.40902 -accelerometer: 11419090875,-0.938986,0.210793,9.50483 -accelerometer: 11419110895,-0.804845,0.172467,9.524 -accelerometer: 11419130945,-0.766519,0.172467,9.75395 -accelerometer: 11419150903,-0.90066,0.19163,9.58148 -accelerometer: 11419170923,-1.07313,0.268282,9.65814 -accelerometer: 11419190942,-0.843171,0.344933,9.54316 -accelerometer: 11419210931,-1.05396,0.19163,9.40902 -accelerometer: 11419230951,-1.13062,0.268282,9.63897 -accelerometer: 11419250940,-1.09229,0.402422,9.60065 -irProximity:11419268085,0.709804 -accelerometer: 11419270899,-0.938986,0.383259,9.58148 -accelerometer: 11419290888,-0.843171,0.134141,9.40902 -accelerometer: 11419310999,-0.90066,0.32577,9.44734 -accelerometer: 11419330896,-0.977311,0.421585,9.524 -accelerometer: 11419350916,-1.01564,0.383259,9.46651 -accelerometer: 11419370966,-1.01564,0.402422,9.19823 -accelerometer: 11419390955,-1.05396,0.134141,9.54316 -accelerometer: 11419410944,-0.728193,0.229956,9.54316 -accelerometer: 11419430963,-0.843171,0.459911,9.524 -accelerometer: 11419451044,-1.01564,0.344933,9.77311 -irProximity:11419468830,0.705882 -accelerometer: 11419470789,-1.01564,0.498237,9.48567 -accelerometer: 11419490930,-0.938986,0.306608,9.3132 -accelerometer: 11419510919,-0.938986,0.306608,9.44734 -accelerometer: 11419530939,-0.843171,0.402422,9.46651 -accelerometer: 11419550928,-0.766519,0.402422,9.61981 -accelerometer: 11419570978,-1.01564,0.421585,9.58148 -accelerometer: 11419590845,-0.996474,0.5174,9.3132 -accelerometer: 11419610773,-0.90066,0.402422,9.44734 -accelerometer: 11419630945,-0.938986,0.421585,9.44734 -accelerometer: 11419650934,-1.01564,0.440748,9.6773 -accelerometer: 11419671014,-1.16894,0.459911,9.73479 -accelerometer: 11419690912,-1.05396,0.402422,9.44734 -accelerometer: 11419710901,-1.0348,0.459911,9.37069 -accelerometer: 11419730890,-0.862334,0.268282,9.46651 -accelerometer: 11419750910,-1.01564,0.536563,9.38986 -accelerometer: 11419773645,-1.05396,0.440748,9.60065 -accelerometer: 11419791010,-1.05396,0.670704,9.44734 -accelerometer: 11419810571,-0.919823,0.5174,9.60065 -accelerometer: 11419830591,-0.804845,0.344933,9.48567 -accelerometer: 11419850610,-1.0348,0.153304,9.40902 -accelerometer: 11419870874,-0.70903,0.344933,9.33237 -accelerometer: 11419890772,-0.958148,0.479074,9.90726 -accelerometer: 11419910761,-0.919823,0.287445,9.56232 -accelerometer: 11419930902,-1.13062,0.153304,9.38986 -accelerometer: 11419950952,-0.977311,0.153304,9.54316 -accelerometer: 11419970972,-1.07313,0.574889,9.46651 -accelerometer: 11419990808,-0.862334,0.5174,9.56232 -accelerometer: 11420010889,-1.09229,0.440748,9.46651 -accelerometer: 11420030969,-1.0348,0.383259,9.42818 -accelerometer: 11420050958,-1.16894,0.459911,9.6773 -irProximity:11420070759,0.709804 -accelerometer: 11420071008,-1.47555,0.498237,9.65814 -accelerometer: 11420090906,-1.20727,0.804845,9.46651 -accelerometer: 11420110895,-0.766519,0.536563,9.3132 -accelerometer: 11420130914,-0.90066,0.70903,9.3132 -accelerometer: 11420150903,-0.728193,0.134141,9.54316 -accelerometer: 11420170984,-1.01564,0.306608,9.44734 -accelerometer: 11420190912,-0.689867,0.210793,9.58148 -accelerometer: 11420210901,-0.785682,0.383259,9.65814 -accelerometer: 11420230798,-0.747356,0.153304,9.44734 -proximity:11420241113,0 -accelerometer: 11420250940,-0.632378,0.19163,9.77311 -irProximity:11420271656,0.329412 -accelerometer: 11420271417,-0.862334,0.268282,9.60065 -accelerometer: 11420290949,-0.728193,0.210793,9.54316 -accelerometer: 11420310999,-0.824008,0.287445,9.60065 -accelerometer: 11420330957,-0.919823,0.344933,9.46651 -accelerometer: 11420350946,-0.958148,0.555726,9.50483 -accelerometer: 11420370538,-0.728193,0.249119,9.50483 -irProximity:11420372730,0.290196 -accelerometer: 11420390924,-0.938986,0.19163,9.38986 -accelerometer: 11420411005,-0.70903,0.210793,9.21739 -accelerometer: 11420430933,-1.05396,0.479074,14.6788 -accelerometer: 11420450922,-0.881497,0.383259,9.73479 -accelerometer: 11420470728,-0.651541,4.86739,9.58148 -accelerometer: 11420490930,-0.440748,0.0958148,9.48567 -accelerometer: 11420510919,-0.498237,0.0383259,9.73479 -accelerometer: 11420530969,-0.479074,0.0574889,9.58148 -accelerometer: 11420550958,-0.555726,0.0383259,9.37069 -accelerometer: 11420570795,-0.440748,4.84823,9.71563 -irProximity:11420574360,0.294118 -accelerometer: 11420591119,-0.306608,0,9.63897 -accelerometer: 11420610986,-0.32577,-0.0383259,9.524 -accelerometer: 11420630975,-0.459911,0.019163,9.44734 -accelerometer: 11420650964,-0.479074,0.5174,9.60065 -accelerometer: 11420670770,-0.440748,0.383259,4.94405 -accelerometer: 11420690912,-0.479074,0.555726,9.65814 -accelerometer: 11420710931,-0.5174,0.306608,9.38986 -accelerometer: 11420730920,-0.651541,0.249119,9.37069 -accelerometer: 11420750940,-0.574889,0.249119,9.48567 -accelerometer: 11420773401,-0.632378,0.19163,9.33237 -accelerometer: 11420790582,-0.421585,0.249119,9.33237 -accelerometer: 11420810571,-0.344933,-0.0766519,9.48567 -accelerometer: 11420830652,-0.249119,-0.0766519,9.6773 -accelerometer: 11420850794,-0.134141,-0.0383259,9.71563 -accelerometer: 11420870783,-0.344933,0.134141,9.77311 -accelerometer: 11420890711,-0.249119,-0.0383259,9.3132 -accelerometer: 11420910852,-0.459911,-4.80991,9.524 -accelerometer: 11420930902,-0.421585,0.287445,9.61981 -accelerometer: 11420950922,-0.364096,0.421585,9.48567 -accelerometer: 11420970819,-0.402422,0.364096,9.38986 -irProximity:11420977863,0.290196 -accelerometer: 11420990808,-0.613215,0.364096,9.50483 -accelerometer: 11421010828,-0.574889,0.402422,9.61981 -accelerometer: 11421030969,-0.536563,0.0766519,9.46651 -accelerometer: 11421050958,-0.651541,0.0958148,9.58148 -accelerometer: 11421070795,-0.651541,0.249119,9.84977 -irProximity:11421078815,0.294118 -accelerometer: 11421090936,-0.440748,0.0958148,9.69646 -accelerometer: 11421110956,-0.364096,0.0574889,9.75395 -accelerometer: 11421130945,-0.402422,-0.0574889,9.46651 -accelerometer: 11421150934,-0.402422,0.134141,9.33237 -accelerometer: 11421170770,-0.421585,0.153304,9.75395 -accelerometer: 11421190912,-0.229956,-0.114978,9.38986 -accelerometer: 11421210962,-0.32577,-0.019163,9.44734 -accelerometer: 11421230951,-0.383259,0.0574889,9.69646 -accelerometer: 11421250971,-0.402422,0.019163,9.54316 -accelerometer: 11421270807,-0.479074,0.249119,9.6773 -accelerometer: 11421290857,-0.728193,0.249119,9.65814 -accelerometer: 11421310816,-0.421585,0.32577,9.56232 -accelerometer: 11421330896,-0.459911,0.19163,9.524 -accelerometer: 11421350885,-0.32577,0.210793,9.77311 -accelerometer: 11421370813,-0.440748,0.0766519,9.61981 -irProximity:11421381428,0.290196 -accelerometer: 11421390894,-0.5174,0.229956,9.61981 -accelerometer: 11421410913,-0.613215,0.229956,9.44734 -accelerometer: 11421430902,-0.747356,0.210793,9.48567 -accelerometer: 11421450922,-0.5174,0.210793,9.61981 -accelerometer: 11421470789,-0.555726,0.172467,9.524 -accelerometer: 11421490930,-0.383259,0.0766519,9.58148 -accelerometer: 11421510980,-0.364096,0.153304,9.65814 -accelerometer: 11421530969,-0.555726,0.32577,9.42818 -accelerometer: 11421550958,-0.383259,0.210793,9.61981 -accelerometer: 11421570917,-0.555726,0.210793,9.54316 -accelerometer: 11421591119,-0.574889,0.19163,9.42818 -accelerometer: 11421610895,-0.32577,0.268282,9.79228 -accelerometer: 11421630914,-0.5174,0.153304,9.48567 -accelerometer: 11421650903,-0.613215,0.153304,9.56232 -accelerometer: 11421670740,-0.536563,0.153304,9.44734 -accelerometer: 11421690912,-0.459911,0.268282,9.50483 -accelerometer: 11421710931,-0.459911,0.19163,9.54316 -accelerometer: 11421730951,-0.651541,0.287445,9.54316 -accelerometer: 11421751001,-0.574889,0.306608,9.54316 -irProximity:11421784443,0.294118 -accelerometer: 11421790613,-0.613215,0.134141,9.50483 -accelerometer: 11421810724,-0.383259,0.0958148,9.58148 -accelerometer: 11421830713,-0.555726,0.249119,9.46651 -accelerometer: 11421850794,-0.594052,0.32577,9.54316 -accelerometer: 11421870844,-0.364096,0.287445,9.69646 -accelerometer: 11421890711,-0.459911,0.287445,9.40902 -accelerometer: 11421910822,-0.958148,0.804845,6.70704 -accelerometer: 11421930933,-0.5174,0.306608,9.35153 -accelerometer: 11421950952,-1.07313,0.594052,9.98391 -accelerometer: 11421970911,-0.344933,0.210793,10.4821 -accelerometer: 11421990808,-0.594052,0.249119,10.4438 -accelerometer: 11422010767,-0.440748,0.479074,10.5588 -accelerometer: 11422030969,-0.977311,0.287445,9.86893 -accelerometer: 11422050684,-0.5174,0.344933,9.33237 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_doubletap.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_doubletap.dat deleted file mode 100644 index a5ac6739..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_doubletap.dat +++ /dev/null @@ -1,161 +0,0 @@ -orientation:11415310938,5 -accelerometer: 11422167413,-0.498237,-0.019163,9.60065 -accelerometer: 11422180811,-0.421585,0,9.90726 -irProximity:11422190265,0.294118 -accelerometer: 11422200830,-0.440748,-0.0383259,9.88809 -accelerometer: 11422220545,-0.249119,0,9.71563 -proximity:11422224537,0 -accelerometer: 11422240930,-0.5174,0.134141,9.6773 -accelerometer: 11422260950,-0.536563,0.19163,9.54316 -accelerometer: 11422280756,-0.555726,0.459911,9.25571 -accelerometer: 11422300928,-0.689867,0.440748,9.29404 -accelerometer: 11422320947,-0.689867,0.5174,9.27488 -accelerometer: 11422340967,-0.555726,0.479074,9.46651 -accelerometer: 11422360956,-0.651541,0.440748,9.63897 -accelerometer: 11422380945,-0.632378,0.229956,9.65814 -accelerometer: 11422400873,-0.421585,0.019163,9.58148 -accelerometer: 11422420892,-0.536563,0.0958148,9.46651 -accelerometer: 11422440912,-0.383259,0.114978,9.65814 -accelerometer: 11422460901,-0.364096,0.0958148,9.63897 -accelerometer: 11422480982,-0.498237,0.134141,9.60065 -accelerometer: 11422500910,-0.383259,0.0958148,9.54316 -accelerometer: 11422520960,-0.383259,0.344933,9.42818 -accelerometer: 11422540949,-0.555726,0.32577,9.54316 -accelerometer: 11422560968,-0.421585,0.498237,9.58148 -accelerometer: 11422580988,-0.594052,0.32577,9.54316 -accelerometer: 11422600916,-0.555726,0.268282,9.56232 -accelerometer: 11422620966,-0.632378,0.249119,9.75395 -accelerometer: 11422640985,-0.440748,0.134141,9.61981 -accelerometer: 11422660974,-0.383259,0.249119,9.56232 -accelerometer: 11422680963,-0.459911,0.249119,9.48567 -accelerometer: 11422700891,-0.32577,0.229956,9.40902 -accelerometer: 11422720972,-0.19163,0,9.48567 -accelerometer: 11422740961,-0.383259,0.402422,9.69646 -accelerometer: 11422760950,-0.306608,0.0766519,9.69646 -accelerometer: 11422780756,-0.498237,0.268282,9.63897 -irProximity:11422795337,0.290196 -accelerometer: 11422800562,-0.555726,0.210793,9.50483 -accelerometer: 11422820856,-0.440748,0.0574889,9.58148 -accelerometer: 11422840784,-0.555726,0.0958148,9.69646 -accelerometer: 11422860834,-0.268282,0.153304,9.54316 -accelerometer: 11422880823,-0.651541,0.402422,9.46651 -irProximity:11422896137,0.294118 -accelerometer: 11422900812,-0.613215,0.306608,9.40902 -accelerometer: 11422920801,-0.32577,0.153304,9.44734 -accelerometer: 11422940973,-0.364096,0.459911,9.19823 -accelerometer: 11422960962,-0.421585,0.172467,8.96827 -accelerometer: 11422980982,-0.594052,0.536563,9.3132 -accelerometer: 11423000696,-1.72467,0.459911,10.2714 -accelerometer: 11423020960,-0.958148,0.632378,9.25571 -accelerometer: 11423040949,-1.07313,0.977311,10.1755 -accelerometer: 11423060999,0.019163,1.07313,10.4438 -accelerometer: 11423080957,-0.153304,0.996474,10.233 -irProximity:11423097736,0.290196 -accelerometer: 11423100946,-0.0574889,0.747356,10.0989 -accelerometer: 11423120935,4.88656,0.613215,9.56232 -accelerometer: 11423140924,0.287445,0.766519,9.46651 -accelerometer: 11423160974,0.5174,0.843171,9.44734 -accelerometer: 11423180963,-0.287445,0.459911,9.56232 -irProximity:11423198536,0.294118 -accelerometer: 11423200952,-0.153304,0.536563,9.14074 -accelerometer: 11423220941,-0.172467,0.498237,9.10241 -accelerometer: 11423240930,0.0958148,0.651541,9.35153 -accelerometer: 11423260950,-0.0383259,0.824008,9.48567 -accelerometer: 11423280969,-0.114978,0.364096,9.44734 -accelerometer: 11423300867,-0.19163,0.555726,9.60065 -accelerometer: 11423320917,3.83259,-0.862334,15.2729 -accelerometer: 11423341028,0.5174,2.98942,7.64602 -accelerometer: 11423360895,3.33436,1.53304,8.47003 -accelerometer: 11423380975,2.20374,0.594052,8.41254 -accelerometer: 11423400873,-1.16894,-0.938986,10.7504 -accelerometer: 11423420892,-0.0958148,0,9.61981 -accelerometer: 11423440912,0.249119,-0.114978,8.96827 -accelerometer: 11423460901,0.344933,0.383259,8.89162 -accelerometer: 11423480982,-0.019163,0.689867,9.10241 -accelerometer: 11423501062,-39.2458,8.52752,17.2275 -accelerometer: 11423520960,-0.555726,2.85528,7.35858 -accelerometer: 11423540949,1.37973,2.587,10.3097 -accelerometer: 11423560968,2.64449,0.881497,9.50483 -accelerometer: 11423580927,-1.30308,-0.594052,10.3288 -tap:11423595112,1 -accelerometer: 11423601038,-1.43722,-0.421585,10.3672 -accelerometer: 11423621027,-0.440748,0.153304,9.08325 -accelerometer: 11423640955,-0.249119,0.440748,8.66166 -accelerometer: 11423660944,-0.268282,0.958148,9.25571 -accelerometer: 11423680963,-0.249119,0.689867,9.58148 -accelerometer: 11423700586,-0.306608,0.747356,9.84977 -accelerometer: 11423720972,-0.555726,0.594052,9.90726 -accelerometer: 11423740961,-0.689867,0.747356,9.77311 -accelerometer: 11423760950,-0.440748,0.613215,9.81144 -accelerometer: 11423780573,-0.344933,0.459911,9.60065 -accelerometer: 11423800623,-0.459911,0.421585,9.3132 -accelerometer: 11423820795,-0.268282,0.249119,9.40902 -accelerometer: 11423840784,-0.613215,0.364096,9.1599 -accelerometer: 11423860773,-0.498237,0.479074,9.42818 -accelerometer: 11423880853,-0.306608,0.402422,9.75395 -accelerometer: 11423900812,0.019163,0.19163,9.69646 -accelerometer: 11423920770,-0.172467,0.249119,9.54316 -accelerometer: 11423940790,-0.19163,0.364096,9.58148 -accelerometer: 11423960962,-0.287445,0.0958148,9.37069 -accelerometer: 11423980951,-0.229956,0.479074,9.71563 -accelerometer: 11424000818,-0.383259,0.5174,9.60065 -accelerometer: 11424020899,-0.364096,0.364096,9.46651 -accelerometer: 11424040888,-0.287445,0.32577,9.58148 -accelerometer: 11424060968,-0.421585,0.32577,9.37069 -accelerometer: 11424080988,-0.344933,0.287445,9.60065 -accelerometer: 11424100763,-0.32577,0.134141,9.48567 -accelerometer: 11424120935,-0.459911,0.0958148,9.71563 -accelerometer: 11424140924,-0.210793,0.0766519,9.86893 -accelerometer: 11424161035,-0.383259,0.153304,9.81144 -accelerometer: 11424181085,-0.268282,0.172467,9.88809 -accelerometer: 11424200800,-0.364096,0.0574889,9.56232 -irProximity:11424205555,0.290196 -accelerometer: 11424221033,-0.32577,0.0383259,9.50483 -accelerometer: 11424240961,-0.0958148,0.229956,9.69646 -accelerometer: 11424260950,-0.344933,-0.287445,9.14074 -accelerometer: 11424280939,-0.574889,0.019163,9.54316 -accelerometer: 11424300775,-0.287445,-0.153304,9.60065 -irProximity:11424306476,0.294118 -accelerometer: 11424320947,-0.306608,-4.69493,9.56232 -accelerometer: 11424340967,-0.172467,0.0958148,9.58148 -accelerometer: 11424360925,-0.574889,0.172467,9.79228 -accelerometer: 11424380945,-0.383259,0.210793,9.81144 -accelerometer: 11424400812,-0.479074,0.0766519,9.71563 -accelerometer: 11424420892,-0.268282,-0.0766519,9.48567 -accelerometer: 11424440942,-0.344933,0.019163,9.35153 -accelerometer: 11424460931,-0.498237,0.172467,9.48567 -accelerometer: 11424480982,-0.479074,0.19163,9.44734 -accelerometer: 11424500818,-0.210793,-0.0383259,9.48567 -accelerometer: 11424520929,-0.459911,0.0383259,9.56232 -accelerometer: 11424540918,-0.32577,-4.86739,9.56232 -accelerometer: 11424560938,-0.574889,-0.0574889,9.48567 -accelerometer: 11424580927,-0.402422,-0.0383259,9.54316 -accelerometer: 11424600946,-0.498237,0.0383259,9.71563 -accelerometer: 11424620722,-0.613215,0.229956,9.46651 -accelerometer: 11424640863,-0.440748,-4.75242,9.6773 -accelerometer: 11424660822,-0.440748,0.019163,9.48567 -accelerometer: 11424680963,-0.536563,-0.0574889,9.46651 -accelerometer: 11424700769,-0.32577,-0.0383259,9.40902 -irProximity:11424709949,0.290196 -accelerometer: 11424720972,-0.287445,-0.019163,9.71563 -accelerometer: 11424740961,-0.498237,-4.77158,9.63897 -accelerometer: 11424760950,-0.440748,0.0766519,9.77311 -accelerometer: 11424780664,-0.344933,0.114978,9.6773 -accelerometer: 11424800623,-0.229956,0.134141,9.48567 -irProximity:11424810932,0.294118 -accelerometer: 11424820795,-0.402422,-0.0574889,9.54316 -accelerometer: 11424840784,-0.479074,0.287445,9.61981 -accelerometer: 11424860773,-0.5174,0.249119,9.58148 -accelerometer: 11424880823,-0.536563,0.0958148,9.54316 -accelerometer: 11424900842,-0.287445,0.268282,9.6773 -irProximity:11424911670,0.290196 -accelerometer: 11424920801,-0.536563,0.153304,9.56232 -accelerometer: 11424941004,-0.5174,0.287445,6.36211 -accelerometer: 11424960962,-0.172467,-0.019163,9.54316 -accelerometer: 11424981073,-1.01564,0.479074,10.5396 -accelerometer: 11425000757,-0.574889,0.229956,10.8846 -irProximity:11425012409,0.294118 -accelerometer: 11425020654,-0.249119,0,10.5396 -accelerometer: 11425040643,-0.0574889,-0.249119,9.63897 -accelerometer: 11425060571,-0.766519,0.0766519,9.27488 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_hover.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_hover.dat deleted file mode 100644 index 20e16580..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_hover.dat +++ /dev/null @@ -1,248 +0,0 @@ -orientation:11415310938,5 -accelerometer: 11425173670,-0.421585,0.0958148,9.63897 -accelerometer: 11425190942,-0.268282,0.287445,9.69646 -accelerometer: 11425210840,-0.383259,0.153304,9.81144 -proximity:11425220050,0 -irProximity:11425226551,0.294118 -accelerometer: 11425230982,-0.479074,-0.019163,9.65814 -accelerometer: 11425250971,-0.536563,0.229956,9.58148 -accelerometer: 11425270929,-0.747356,0.32577,9.44734 -accelerometer: 11425290949,-0.459911,0.402422,9.37069 -accelerometer: 11425310968,-0.5174,0.134141,9.44734 -accelerometer: 11425330866,-0.287445,0.153304,9.48567 -accelerometer: 11425350916,-0.344933,0.172467,9.46651 -accelerometer: 11425370966,-0.344933,0.0574889,9.58148 -accelerometer: 11425390955,-0.402422,0.19163,9.69646 -accelerometer: 11425410974,-0.32577,4.88656,9.73479 -accelerometer: 11425430872,-0.210793,0.114978,9.63897 -accelerometer: 11425450891,-0.5174,0.172467,9.58148 -accelerometer: 11425470758,-0.459911,0.287445,9.37069 -accelerometer: 11425490900,-0.498237,0.383259,9.44734 -accelerometer: 11425510980,-0.421585,0.229956,9.61981 -accelerometer: 11425530908,-0.306608,0.249119,9.60065 -accelerometer: 11425550958,-0.498237,0.364096,9.75395 -accelerometer: 11425570917,-0.421585,0.229956,9.8306 -accelerometer: 11425590814,-0.574889,0.210793,9.61981 -accelerometer: 11425610925,-0.268282,0.383259,9.58148 -accelerometer: 11425630945,-0.383259,0.229956,9.50483 -accelerometer: 11425650995,-0.344933,0.306608,9.54316 -accelerometer: 11425670953,-0.229956,0.210793,9.50483 -accelerometer: 11425691034,-0.153304,0.19163,9.58148 -accelerometer: 11425710962,-0.172467,0.268282,9.40902 -irProximity:11425730731,0.290196 -accelerometer: 11425730646,-0.19163,0.229956,9.60065 -accelerometer: 11425750971,-0.229956,0.019163,9.63897 -accelerometer: 11425774286,-0.536563,0.19163,9.42818 -accelerometer: 11425790704,-0.440748,0.19163,9.524 -accelerometer: 11425810754,-0.459911,0.19163,9.63897 -irProximity:11425831775,0.294118 -accelerometer: 11425830896,-0.613215,0.0574889,9.48567 -accelerometer: 11425850824,-0.824008,0.153304,9.65814 -accelerometer: 11425870813,-0.747356,0.19163,9.69646 -accelerometer: 11425890802,-0.996474,0.421585,9.56232 -accelerometer: 11425910822,-0.785682,0.249119,9.60065 -accelerometer: 11425930628,-1.11145,0.32577,9.44734 -accelerometer: 11425950952,-0.728193,0.0958148,9.38986 -accelerometer: 11425970941,-0.881497,0.114978,9.524 -accelerometer: 11425990778,-0.862334,0.114978,9.71563 -accelerometer: 11426010950,-0.555726,0.153304,9.56232 -accelerometer: 11426030725,-0.670704,-0.0574889,9.81144 -irProximity:11426033039,0.313726 -accelerometer: 11426050958,-0.70903,4.88656,9.63897 -accelerometer: 11426070917,-0.804845,0.364096,9.6773 -accelerometer: 11426090967,-0.651541,0.268282,9.42818 -accelerometer: 11426110956,-0.766519,-0.0958148,9.50483 -accelerometer: 11426130823,-0.766519,0.172467,9.50483 -irProximity:11426133960,0.376471 -accelerometer: 11426150964,-0.862334,0.210793,9.524 -accelerometer: 11426170892,-0.613215,0.287445,9.3132 -accelerometer: 11426190942,-0.555726,0,9.6773 -accelerometer: 11426210931,-0.479074,0.153304,9.40902 -accelerometer: 11426230798,-0.804845,0.19163,9.44734 -irProximity:11426234851,0.384314 -accelerometer: 11426250971,-0.766519,0.134141,9.75395 -accelerometer: 11426270929,-0.689867,0.153304,9.63897 -accelerometer: 11426290918,-0.804845,0.0574889,9.65814 -accelerometer: 11426310938,-0.689867,0.172467,9.524 -accelerometer: 11426330774,-0.613215,0.364096,9.524 -irProximity:11426335773,0.4 -accelerometer: 11426350946,-0.90066,0.287445,9.48567 -accelerometer: 11426370966,-0.90066,0.134141,9.42818 -accelerometer: 11426390985,-0.728193,0.344933,9.44734 -accelerometer: 11426410944,-0.689867,0,9.54316 -accelerometer: 11426430780,-0.498237,0.0958148,9.48567 -irProximity:11426436664,0.415686 -accelerometer: 11426450891,-0.364096,0.172467,9.37069 -accelerometer: 11426470789,-0.421585,0.0766519,9.56232 -accelerometer: 11426490900,-0.440748,0.0383259,9.40902 -accelerometer: 11426510950,-0.689867,0,9.46651 -accelerometer: 11426530786,-0.594052,4.88656,9.54316 -accelerometer: 11426550897,-0.555726,0.287445,9.69646 -accelerometer: 11426570917,-0.670704,0.32577,9.63897 -accelerometer: 11426590997,-0.651541,0.383259,9.50483 -accelerometer: 11426610925,-0.670704,0.249119,9.42818 -accelerometer: 11426630823,-0.632378,0.153304,9.50483 -irProximity:11426638446,0.423529 -accelerometer: 11426650903,-0.594052,0.249119,9.40902 -accelerometer: 11426670801,-0.613215,0.19163,9.6773 -accelerometer: 11426690912,-0.536563,-0.019163,9.48567 -accelerometer: 11426710931,-0.421585,0.19163,9.48567 -accelerometer: 11426730798,-0.479074,0.0766519,9.56232 -accelerometer: 11426750940,-0.555726,0.0766519,9.63897 -accelerometer: 11426773431,-0.594052,0.172467,9.61981 -accelerometer: 11426790735,-0.651541,0.210793,9.56232 -accelerometer: 11426810816,-0.613215,0.249119,9.56232 -accelerometer: 11426830774,-0.785682,0.210793,9.35153 -accelerometer: 11426850763,-0.613215,0.32577,9.44734 -accelerometer: 11426870813,-0.747356,0.0383259,9.58148 -accelerometer: 11426890772,-0.574889,0.172467,9.61981 -accelerometer: 11426910761,-0.670704,0.229956,9.6773 -accelerometer: 11426930780,-0.651541,0.249119,9.48567 -accelerometer: 11426950922,-0.5174,0.134141,9.50483 -accelerometer: 11426970941,-0.613215,0.019163,9.40902 -accelerometer: 11426990808,-0.536563,0.172467,9.69646 -accelerometer: 11427010828,-0.5174,0.0958148,9.63897 -accelerometer: 11427030908,-0.498237,0.172467,9.46651 -irProximity:11427041889,0.427451 -accelerometer: 11427050989,-0.632378,0.249119,9.61981 -accelerometer: 11427070947,-0.728193,0.172467,9.38986 -accelerometer: 11427090967,-0.555726,0.114978,9.50483 -accelerometer: 11427110956,-0.498237,0.134141,9.54316 -accelerometer: 11427130975,-0.364096,0.153304,9.61981 -accelerometer: 11427150903,-0.689867,0.32577,9.65814 -accelerometer: 11427170923,-0.536563,0.153304,9.38986 -accelerometer: 11427191004,-0.613215,0.32577,9.44734 -accelerometer: 11427210931,-0.498237,0.210793,9.48567 -accelerometer: 11427230951,-0.613215,0.172467,9.33237 -irProximity:11427243396,0.431373 -accelerometer: 11427250940,-0.613215,0.19163,9.71563 -accelerometer: 11427270929,-0.574889,0.19163,9.50483 -accelerometer: 11427290918,-0.574889,0.306608,9.56232 -accelerometer: 11427310968,-0.747356,0.364096,9.60065 -accelerometer: 11427330957,-0.555726,0.0383259,9.524 -accelerometer: 11427350977,-0.594052,0.134141,9.54316 -accelerometer: 11427370935,-0.498237,0.287445,9.63897 -accelerometer: 11427390924,-0.766519,0.0383259,9.54316 -accelerometer: 11427410944,-0.689867,0.344933,9.48567 -accelerometer: 11427430933,-0.402422,0.172467,9.60065 -irProximity:11427444904,0.439216 -accelerometer: 11427450922,-0.574889,0.0958148,9.524 -accelerometer: 11427470789,-0.632378,0.249119,9.46651 -accelerometer: 11427490961,-0.632378,0.268282,9.44734 -accelerometer: 11427510919,-0.613215,0.287445,9.46651 -accelerometer: 11427530969,-0.555726,0.364096,9.6773 -accelerometer: 11427550928,-0.613215,0.210793,9.58148 -accelerometer: 11427570947,-0.5174,0.249119,9.56232 -accelerometer: 11427590784,-0.670704,0.249119,9.63897 -accelerometer: 11427610956,-0.555726,0.32577,9.42818 -accelerometer: 11427631006,-0.747356,0.153304,9.54316 -irProximity:11427646533,0.298039 -accelerometer: 11427651514,-0.498237,0.0383259,9.54316 -accelerometer: 11427670740,-0.613215,0.172467,9.524 -accelerometer: 11427690973,-0.689867,0.210793,9.54316 -accelerometer: 11427710931,-0.613215,0.249119,9.48567 -accelerometer: 11427730920,-0.632378,0.134141,9.44734 -irProximity:11427747272,0.294118 -accelerometer: 11427750940,-0.459911,0.172467,9.35153 -accelerometer: 11427773248,-0.5174,0.287445,9.58148 -accelerometer: 11427790765,-0.402422,0.268282,9.40902 -accelerometer: 11427810846,-0.402422,0.114978,9.58148 -accelerometer: 11427830805,-0.210793,0.019163,9.54316 -accelerometer: 11427850794,-0.287445,0.019163,9.44734 -accelerometer: 11427870813,-0.498237,0,9.46651 -accelerometer: 11427890772,-0.555726,0.153304,9.44734 -accelerometer: 11427910791,-0.70903,0.210793,9.42818 -accelerometer: 11427930902,-0.594052,0.210793,9.38986 -accelerometer: 11427950891,-0.344933,0.32577,9.65814 -accelerometer: 11427970941,-0.632378,0.421585,9.42818 -accelerometer: 11427990778,-0.536563,0.306608,9.524 -accelerometer: 11428010797,-0.555726,0.344933,9.63897 -accelerometer: 11428030939,-0.479074,0.268282,9.71563 -irProximity:11428049518,0.290196 -accelerometer: 11428051019,-0.5174,0.134141,9.524 -accelerometer: 11428070947,-0.70903,0.0766519,9.46651 -accelerometer: 11428090997,-0.594052,0.19163,9.42818 -accelerometer: 11428110925,-0.498237,0.19163,9.38986 -accelerometer: 11428130975,-0.402422,0.383259,9.61981 -irProximity:11428150287,0.294118 -accelerometer: 11428150964,-0.153304,4.80991,9.61981 -accelerometer: 11428171076,-0.268282,-0.134141,9.77311 -accelerometer: 11428190942,-0.479074,0.0766519,9.63897 -accelerometer: 11428210962,-0.249119,0.249119,9.77311 -accelerometer: 11428230920,-0.306608,-0.019163,9.48567 -accelerometer: 11428251093,-0.689867,0.229956,9.40902 -accelerometer: 11428270960,-0.268282,0.19163,9.46651 -accelerometer: 11428290949,-0.383259,0.229956,9.35153 -accelerometer: 11428310968,-0.306608,0.019163,9.524 -accelerometer: 11428330957,-0.364096,-0.0383259,9.73479 -accelerometer: 11428350946,-0.383259,0.0574889,9.6773 -accelerometer: 11428370935,-0.383259,0.249119,9.90726 -accelerometer: 11428390924,-0.32577,0.19163,9.60065 -accelerometer: 11428410944,-0.479074,0.114978,9.50483 -accelerometer: 11428430933,-0.421585,0.344933,9.44734 -accelerometer: 11428450525,-0.479074,0.210793,9.42818 -accelerometer: 11428470758,-0.402422,0.210793,9.56232 -accelerometer: 11428490900,-0.364096,0.114978,9.63897 -accelerometer: 11428510950,-0.172467,0.0766519,9.48567 -accelerometer: 11428531000,-0.440748,0.0766519,9.65814 -accelerometer: 11428550623,-0.306608,0.134141,9.8306 -accelerometer: 11428570917,-0.153304,-0.0958148,9.58148 -accelerometer: 11428590814,-0.172467,-4.86739,9.50483 -accelerometer: 11428610986,-0.249119,-0.019163,9.60065 -accelerometer: 11428630945,-0.287445,0.0766519,9.50483 -accelerometer: 11428650781,-0.32577,0.0958148,9.56232 -accelerometer: 11428670923,-0.344933,0.249119,9.50483 -accelerometer: 11428690820,-0.689867,0.19163,9.56232 -accelerometer: 11428710962,-0.383259,0.0766519,9.71563 -accelerometer: 11428730920,-0.402422,0.134141,9.46651 -accelerometer: 11428750818,-0.479074,0.287445,9.65814 -accelerometer: 11428772577,-0.479074,0.287445,9.6773 -accelerometer: 11428790827,-0.421585,0.249119,9.46651 -accelerometer: 11428810846,-0.287445,4.82907,9.58148 -accelerometer: 11428830805,-0.440748,0.0958148,9.46651 -accelerometer: 11428850763,-0.32577,0.172467,9.54316 -accelerometer: 11428870813,-0.594052,0.172467,9.60065 -accelerometer: 11428890802,-0.32577,0.172467,9.56232 -accelerometer: 11428910822,-0.306608,0.0383259,9.60065 -accelerometer: 11428930811,-0.440748,0.114978,9.524 -accelerometer: 11428950800,-0.459911,0.0383259,9.524 -accelerometer: 11428970941,-0.421585,0.0766519,9.50483 -accelerometer: 11428990778,-0.287445,0.172467,9.56232 -accelerometer: 11429010858,-0.210793,0.0574889,9.54316 -accelerometer: 11429030969,-0.5174,0.229956,9.56232 -accelerometer: 11429050775,-0.32577,0.306608,9.54316 -accelerometer: 11429070917,-0.32577,0.134141,9.65814 -accelerometer: 11429090997,-0.229956,0.229956,9.69646 -accelerometer: 11429110925,-0.344933,0.153304,9.60065 -accelerometer: 11429130945,-0.479074,0.0958148,9.50483 -accelerometer: 11429150812,-0.306608,0.19163,9.71563 -accelerometer: 11429170953,-0.421585,0.0574889,9.56232 -accelerometer: 11429190942,-0.479074,0.210793,9.50483 -accelerometer: 11429210962,-0.383259,0.287445,9.6773 -accelerometer: 11429230920,-0.402422,0.134141,9.50483 -accelerometer: 11429250818,-0.5174,0.32577,9.40902 -irProximity:11429259143,0.290196 -accelerometer: 11429270929,-0.689867,0.172467,9.3132 -accelerometer: 11429290949,-0.728193,0.210793,9.65814 -accelerometer: 11429310968,-0.287445,0.153304,9.69646 -accelerometer: 11429330835,-0.249119,0.153304,9.69646 -accelerometer: 11429350794,-0.287445,0.0958148,9.54316 -irProximity:11429360339,0.294118 -accelerometer: 11429370844,-0.594052,0.19163,9.50483 -accelerometer: 11429390894,-0.632378,0.19163,9.42818 -accelerometer: 11429410822,-0.440748,0.249119,9.37069 -accelerometer: 11429430811,-0.421585,0.019163,9.56232 -accelerometer: 11429450769,-0.498237,0.364096,9.48567 -accelerometer: 11429470667,-0.306608,0.153304,9.69646 -accelerometer: 11429490839,-0.5174,0.210793,9.56232 -accelerometer: 11429510797,-0.32577,0.19163,9.63897 -accelerometer: 11429530786,-0.364096,0.153304,9.46651 -accelerometer: 11429550806,-0.536563,0.153304,9.58148 -accelerometer: 11429570795,-0.594052,0.958148,6.36211 -accelerometer: 11429591608,-0.747356,0.287445,9.14074 -accelerometer: 11429610956,-1.09229,0.555726,10.0989 -accelerometer: 11429630640,-0.229956,0.134141,10.5588 -accelerometer: 11429650842,-0.268282,-0.153304,10.3863 -accelerometer: 11429670831,-0.574889,0.0958148,10.2139 -accelerometer: 11429690790,-0.421585,0.0383259,9.63897 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_nothover.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_nothover.dat deleted file mode 100644 index f49d5a22..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_nothover.dat +++ /dev/null @@ -1,234 +0,0 @@ -orientation:11043900509,5 -accelerometer: 11100730588,-0.114978,0.536563,9.04492 -accelerometer: 11100750912,0.0766519,-0.249119,9.42818 -accelerometer: 11100770962,0.0958148,0,9.75395 -irProximity:11100791116,0.286275 -accelerometer: 11100790951,-0.249119,0.172467,9.23655 -proximity:11100797891,0 -accelerometer: 11100810940,0.0766519,-0.0574889,9.65814 -accelerometer: 11100830929,0.0766519,-0.114978,9.524 -accelerometer: 11100850918,-0.249119,-0.019163,9.42818 -accelerometer: 11100870968,0.19163,-0.229956,9.75395 -accelerometer: 11100890744,-0.153304,-0.019163,9.58148 -accelerometer: 11100910946,-0.0574889,0.0766519,9.48567 -accelerometer: 11100930966,-0.134141,4.75242,9.6773 -accelerometer: 11100950924,0.0958148,-0.172467,9.63897 -accelerometer: 11100970944,0.019163,-0.0574889,9.46651 -accelerometer: 11100990689,0.229956,-0.229956,9.71563 -accelerometer: 11101010922,0.0574889,0,9.6773 -accelerometer: 11101030758,-0.0958148,-0.0574889,9.77311 -accelerometer: 11101051663,-0.210793,-0.134141,9.73479 -accelerometer: 11101071133,-0.0766519,0.0766519,9.79228 -accelerometer: 11101090878,0.0383259,0.0766519,9.86893 -accelerometer: 11101111203,-0.019163,0.0574889,9.46651 -accelerometer: 11101130642,-0.0383259,-0.0574889,9.6773 -accelerometer: 11101150967,-0.0958148,-0.0766519,9.54316 -accelerometer: 11101170956,0.019163,-0.134141,9.71563 -accelerometer: 11101190823,-0.0574889,0.0958148,9.6773 -accelerometer: 11101210934,0.0383259,-0.0766519,9.48567 -accelerometer: 11101230984,-0.0958148,-0.249119,9.6773 -accelerometer: 11101250973,0.114978,-4.88656,9.44734 -accelerometer: 11101270962,-0.19163,-0.0574889,9.73479 -accelerometer: 11101290799,-0.0574889,-0.0958148,9.61981 -irProximity:11101296243,0.415686 -accelerometer: 11101310971,-0.0766519,0.019163,9.63897 -accelerometer: 11101330960,0.0574889,-0.153304,9.6773 -accelerometer: 11101350979,-0.153304,4.80991,9.60065 -accelerometer: 11101370968,0.287445,0.0383259,9.8306 -proximity:11101385922,1 -accelerometer: 11101390774,0.0574889,-0.0766519,9.48567 -irProximity:11101397225,0.517647 -accelerometer: 11101410946,-0.0766519,-0.0766519,9.63897 -accelerometer: 11101430966,0.268282,0.0383259,9.6773 -accelerometer: 11101450955,-0.0958148,-4.82907,9.40902 -accelerometer: 11101470944,0.287445,-0.0383259,9.69646 -accelerometer: 11101490902,0.153304,-0.0383259,9.61981 -accelerometer: 11101510830,-0.019163,-0.0574889,9.46651 -accelerometer: 11101530942,1.09229,0.0574889,10.5205 -accelerometer: 11101550778,-0.32577,0.172467,10.3672 -accelerometer: 11101570981,-0.306608,0.0766519,9.48567 -accelerometer: 11101590848,0.5174,-0.229956,10.2905 -irProximity:11101598153,0.6 -accelerometer: 11101611050,-0.153304,0,9.44734 -accelerometer: 11101630948,-0.19163,-0.229956,9.46651 -accelerometer: 11101650540,-0.019163,0.0958148,9.33237 -accelerometer: 11101670682,-0.19163,-0.0766519,9.40902 -accelerometer: 11101690793,-0.0574889,0,9.63897 -accelerometer: 11101710812,-0.0766519,0.0383259,9.69646 -accelerometer: 11101730801,0.019163,-0.229956,9.60065 -accelerometer: 11101750821,-0.114978,-0.0383259,9.71563 -accelerometer: 11101770779,-0.019163,-0.0574889,9.58148 -accelerometer: 11101790768,-0.249119,-0.153304,9.65814 -irProximity:11101798623,0.690196 -accelerometer: 11101810788,0.0383259,-0.249119,9.54316 -accelerometer: 11101830807,-0.0383259,0.0766519,9.524 -accelerometer: 11101850888,0,-0.19163,9.60065 -accelerometer: 11101870938,-0.0766519,-0.0766519,9.46651 -accelerometer: 11101890896,-0.19163,-0.019163,9.56232 -accelerometer: 11101910946,-0.134141,-0.134141,9.46651 -accelerometer: 11101930996,-0.114978,-0.0574889,9.63897 -accelerometer: 11101950924,-0.0958148,-0.287445,9.65814 -accelerometer: 11101970913,-0.229956,0.0383259,9.81144 -accelerometer: 11101990780,0,-0.0766519,9.63897 -irProximity:11101999398,0.682353 -accelerometer: 11102010739,0,-0.0766519,9.61981 -accelerometer: 11102030911,-0.019163,-0.114978,9.61981 -accelerometer: 11102051632,0,-0.134141,9.37069 -accelerometer: 11102072079,-0.114978,0.134141,9.79228 -accelerometer: 11102092007,-0.0958148,0.0766519,9.61981 -accelerometer: 11102113003,-0.19163,-4.88656,9.60065 -accelerometer: 11102131100,-0.268282,-0.19163,9.56232 -accelerometer: 11102150998,0.019163,-0.134141,9.524 -accelerometer: 11102171017,0.0766519,-0.0766519,9.63897 -accelerometer: 11102190854,-0.114978,0.0383259,9.69646 -irProximity:11102200356,0.678431 -accelerometer: 11102210843,-0.19163,-0.229956,9.44734 -accelerometer: 11102230801,-0.0958148,-0.019163,9.54316 -accelerometer: 11102251034,-0.229956,4.88656,9.65814 -accelerometer: 11102271054,-0.0383259,-0.134141,9.44734 -accelerometer: 11102291012,-0.0574889,-0.114978,9.58148 -accelerometer: 11102311001,-0.0958148,-0.0383259,9.61981 -accelerometer: 11102330990,-0.114978,-0.114978,9.54316 -accelerometer: 11102350979,-0.0574889,-0.0766519,9.61981 -accelerometer: 11102370999,-0.0766519,4.82907,9.61981 -accelerometer: 11102390866,-0.134141,-0.0574889,9.58148 -accelerometer: 11102410550,-0.0383259,0.153304,9.63897 -accelerometer: 11102430508,-0.229956,-0.229956,9.46651 -accelerometer: 11102450711,0.0383259,0.0574889,9.54316 -accelerometer: 11102470822,-0.153304,-0.172467,9.63897 -accelerometer: 11102490811,-0.172467,-0.0766519,9.75395 -accelerometer: 11102510800,-0.229956,0.19163,9.73479 -accelerometer: 11102530850,-0.0958148,-0.172467,9.56232 -accelerometer: 11102550808,-0.172467,-0.134141,9.71563 -accelerometer: 11102570767,-0.0383259,-4.75242,9.58148 -accelerometer: 11102590787,-0.0383259,-0.114978,9.73479 -accelerometer: 11102610837,-0.268282,0.153304,9.61981 -accelerometer: 11102630795,-0.0574889,-0.229956,9.61981 -accelerometer: 11102650845,-0.172467,-0.019163,9.63897 -accelerometer: 11102670926,0.019163,-0.153304,9.63897 -accelerometer: 11102690976,0.114978,-0.0383259,9.58148 -accelerometer: 11102710965,-0.134141,-0.0766519,9.6773 -accelerometer: 11102730984,-0.134141,0.0574889,9.524 -accelerometer: 11102751004,0.0574889,0.0766519,9.75395 -accelerometer: 11102771054,-0.0383259,-0.019163,9.60065 -accelerometer: 11102790890,-0.114978,-0.114978,9.63897 -irProximity:11102803261,0.67451 -accelerometer: 11102810940,-0.0958148,0,9.73479 -accelerometer: 11102830960,-0.0383259,-0.134141,9.6773 -accelerometer: 11102850949,-0.114978,4.75242,9.69646 -accelerometer: 11102871029,-0.134141,-0.0383259,9.63897 -accelerometer: 11102890988,-0.0958148,0.019163,9.75395 -accelerometer: 11102910946,-0.019163,-0.0574889,9.48567 -accelerometer: 11102930874,0.0766519,0.134141,9.79228 -accelerometer: 11102950833,-0.019163,-0.114978,9.40902 -accelerometer: 11102970578,-0.153304,0.114978,9.71563 -accelerometer: 11102990567,-0.172467,0.0574889,9.94558 -irProximity:11103004037,0.678431 -accelerometer: 11103010830,-0.268282,0,9.37069 -accelerometer: 11103030972,-0.0958148,0.249119,9.73479 -accelerometer: 11103050900,-0.268282,-0.0574889,7.39691 -accelerometer: 11103070523,0.555726,-0.19163,9.98391 -accelerometer: 11103091122,-0.134141,-0.172467,9.17906 -accelerometer: 11103111020,-0.306608,0.172467,10.6163 -accelerometer: 11103130978,0.19163,0.0574889,10.0222 -accelerometer: 11103150906,-0.364096,-0.0383259,8.6425 -accelerometer: 11103170956,0.19163,0.0958148,10.0222 -accelerometer: 11103190762,0.0766519,-0.229956,9.524 -proximity:11103201321,0 -irProximity:11103204537,0.439216 -accelerometer: 11103210995,-0.0383259,-0.0766519,9.54316 -accelerometer: 11103230923,0.0766519,-4.86739,9.8306 -accelerometer: 11103250943,-0.172467,-0.249119,9.35153 -accelerometer: 11103270962,-0.0574889,-0.0383259,9.6773 -accelerometer: 11103290951,-0.19163,-0.0958148,9.54316 -accelerometer: 11103310940,-0.0766519,-0.0574889,9.73479 -accelerometer: 11103330960,-0.0958148,-0.0383259,9.79228 -accelerometer: 11103350949,-0.114978,0.019163,9.61981 -accelerometer: 11103370968,-0.172467,-0.019163,9.6773 -accelerometer: 11103390927,-0.019163,0.0574889,9.524 -irProximity:11103406136,0.286275 -accelerometer: 11103410916,0.0766519,-0.134141,9.37069 -accelerometer: 11103430935,-0.114978,-0.0383259,9.46651 -accelerometer: 11103450955,-0.019163,-0.172467,9.73479 -accelerometer: 11103470975,-0.172467,0.0766519,9.524 -accelerometer: 11103490933,0.019163,0,9.71563 -accelerometer: 11103510739,-0.0958148,-0.153304,9.524 -accelerometer: 11103530911,-0.0574889,-0.19163,9.60065 -accelerometer: 11103550808,-0.153304,-0.0958148,9.73479 -accelerometer: 11103570981,-0.287445,0.114978,9.56232 -accelerometer: 11103591000,0,-0.114978,9.56232 -accelerometer: 11103610928,-0.172467,0.019163,9.58148 -accelerometer: 11103630948,0.019163,-0.0383259,9.38986 -accelerometer: 11103650937,-0.0574889,0.0766519,9.58148 -accelerometer: 11103670956,-0.134141,0.0383259,9.60065 -accelerometer: 11103690945,-0.249119,-0.019163,9.56232 -accelerometer: 11103710934,-0.019163,4.73325,9.61981 -accelerometer: 11103730740,-0.0383259,-0.0574889,9.54316 -accelerometer: 11103750912,0.0574889,0.0574889,9.65814 -accelerometer: 11103770962,-0.134141,-0.172467,9.71563 -accelerometer: 11103790951,0.0574889,0.268282,9.60065 -accelerometer: 11103811001,-0.268282,-0.268282,9.63897 -accelerometer: 11103830990,-0.0958148,-0.0766519,9.65814 -accelerometer: 11103850949,-0.210793,-0.0766519,9.38986 -accelerometer: 11103870968,-0.0574889,-0.114978,9.6773 -accelerometer: 11103890927,0.019163,-0.019163,9.65814 -accelerometer: 11103910885,-4.90572,-0.0766519,9.65814 -accelerometer: 11103930935,0.019163,4.82907,9.69646 -accelerometer: 11103950924,-0.210793,-0.019163,9.50483 -accelerometer: 11103970944,-0.019163,-0.134141,9.61981 -accelerometer: 11103990811,-0.210793,0.0766519,9.54316 -accelerometer: 11104010922,-0.19163,-0.114978,9.44734 -accelerometer: 11104030819,-0.114978,-0.0383259,9.54316 -accelerometer: 11104050992,-0.0383259,-0.019163,9.58148 -accelerometer: 11104070981,-0.19163,-0.0383259,9.44734 -accelerometer: 11104091031,-0.287445,4.77158,9.54316 -accelerometer: 11104111416,-0.134141,-4.82907,9.42818 -accelerometer: 11104130551,-0.019163,-0.019163,9.65814 -accelerometer: 11104150967,0.0958148,-0.268282,9.63897 -accelerometer: 11104170926,0.0574889,0,9.60065 -accelerometer: 11104190976,-0.32577,-0.172467,9.524 -accelerometer: 11104210995,0,0,9.6773 -accelerometer: 11104230954,0.0958148,-0.0958148,9.58148 -accelerometer: 11104250973,-0.114978,-0.383259,9.60065 -accelerometer: 11104270962,0.0574889,0,9.61981 -accelerometer: 11104290951,-0.134141,-0.0383259,9.60065 -accelerometer: 11104310635,-0.134141,0,9.60065 -accelerometer: 11104330960,-0.0766519,-0.0766519,9.54316 -accelerometer: 11104350949,-0.0958148,-0.114978,9.60065 -accelerometer: 11104370968,0.019163,-0.153304,9.58148 -accelerometer: 11104390927,-0.287445,0.0958148,9.61981 -accelerometer: 11104410733,-0.0383259,0.134141,9.65814 -accelerometer: 11104430905,-0.153304,-0.19163,9.54316 -accelerometer: 11104450894,-0.210793,-0.019163,9.6773 -accelerometer: 11104470913,0.153304,-0.229956,9.65814 -accelerometer: 11104490964,0.134141,-0.0383259,9.63897 -accelerometer: 11104510800,0.153304,-0.0766519,9.63897 -accelerometer: 11104530942,0,-0.210793,9.6773 -accelerometer: 11104550961,-0.019163,-0.019163,9.65814 -accelerometer: 11104570950,0.172467,-0.0574889,9.73479 -accelerometer: 11104590939,-0.0958148,-0.0574889,9.81144 -accelerometer: 11104610806,-0.19163,0.019163,9.8306 -accelerometer: 11104630917,-0.0766519,4.80991,9.48567 -accelerometer: 11104650937,-0.134141,0.0958148,9.524 -accelerometer: 11104670926,0.0574889,-0.019163,9.63897 -accelerometer: 11104690976,-0.134141,-0.019163,9.48567 -accelerometer: 11104710812,-0.0383259,-0.0383259,9.61981 -accelerometer: 11104730862,-0.0766519,-0.249119,9.73479 -accelerometer: 11104750973,0.0766519,-0.0958148,9.8306 -accelerometer: 11104770962,-0.0766519,-0.19163,9.56232 -accelerometer: 11104790951,-0.632378,0.344933,9.44734 -accelerometer: 11104810818,0.306608,-0.172467,9.71563 -accelerometer: 11104830929,-0.0574889,4.84823,9.75395 -accelerometer: 11104850949,-0.632378,0.210793,9.54316 -accelerometer: 11104870938,-0.32577,-0.0383259,9.38986 -accelerometer: 11104890927,-0.268282,-0.0958148,9.29404 -accelerometer: 11104910763,-0.344933,-0.019163,9.21739 -accelerometer: 11104931241,-0.210793,-0.019163,9.54316 -accelerometer: 11104950528,-0.0574889,-0.114978,9.46651 -accelerometer: 11104970822,-0.0574889,-0.0574889,9.524 -accelerometer: 11104990811,-0.114978,0.0383259,9.524 -accelerometer: 11105010800,0.0766519,-0.0958148,9.69646 -accelerometer: 11105030789,-0.114978,-0.0958148,9.58148 -accelerometer: 11105050808,-0.210793,-4.79074,9.35153 -accelerometer: 11105070798,0.114978,0.134141,10.233 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_notpickup.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_notpickup.dat deleted file mode 100644 index ecaf670d..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_notpickup.dat +++ /dev/null @@ -1,400 +0,0 @@ -orientation:402980682,5 -accelerometer: 405572082,0.210793,0,9.56232 -accelerometer: 405591125,0.134141,0.114978,9.96474 -accelerometer: 405611084,-0.229956,-0.0958148,9.58148 -accelerometer: 405631042,0.019163,0.134141,9.60065 -irProximity:405644383,0.286275 -accelerometer: 405650787,-0.210793,0.249119,9.33237 -accelerometer: 405670807,-0.153304,-0.210793,9.33237 -proximity:405673985,0 -accelerometer: 405690796,0.287445,0,9.90726 -accelerometer: 405710815,0.19163,-0.019163,9.75395 -accelerometer: 405731231,-0.019163,-4.88656,9.63897 -accelerometer: 405751129,0.134141,4.88656,9.71563 -accelerometer: 405771026,-0.0574889,0,9.58148 -accelerometer: 405791137,-0.134141,0.0766519,9.88809 -accelerometer: 405811126,-0.19163,0.0958148,9.50483 -accelerometer: 405831024,-0.0574889,-0.19163,9.81144 -accelerometer: 405851135,0.153304,-0.0766519,9.71563 -accelerometer: 405871124,-0.0574889,0.019163,9.71563 -accelerometer: 405891052,0.0958148,-0.0383259,9.90726 -accelerometer: 405911163,-0.0383259,-4.86739,9.63897 -accelerometer: 405931091,-0.153304,-0.0574889,9.69646 -accelerometer: 405951050,0.153304,-0.0958148,9.81144 -accelerometer: 405970978,-0.019163,0,9.79228 -accelerometer: 405990844,-0.0958148,-0.114978,9.524 -accelerometer: 406010833,0.114978,0.0383259,9.84977 -accelerometer: 406031067,-0.134141,0.134141,9.56232 -accelerometer: 406051056,0.153304,-0.172467,9.86893 -accelerometer: 406071045,0.0383259,-4.82907,9.56232 -accelerometer: 406090973,-0.0383259,4.88656,9.60065 -accelerometer: 406110992,-0.114978,-0.019163,9.73479 -accelerometer: 406130951,-0.114978,0.0574889,9.61981 -accelerometer: 406150940,-0.0383259,0.210793,9.50483 -accelerometer: 406170929,-0.153304,0.019163,9.71563 -accelerometer: 406190796,0.0574889,0.019163,9.6773 -accelerometer: 406210937,0.114978,0.019163,9.60065 -accelerometer: 406231109,-0.0574889,-0.019163,9.54316 -accelerometer: 406250885,-0.153304,0.0958148,9.6773 -accelerometer: 406270965,0.019163,0.0958148,9.79228 -accelerometer: 406290954,-0.0574889,-0.019163,9.56232 -accelerometer: 406310974,0,0.0574889,9.71563 -accelerometer: 406330993,-0.249119,0.0958148,9.65814 -accelerometer: 406350799,-0.0574889,0.0383259,9.63897 -accelerometer: 406371002,0.210793,-4.86739,9.71563 -accelerometer: 406391021,-0.153304,0.0766519,9.71563 -accelerometer: 406410919,-0.249119,-0.019163,9.63897 -accelerometer: 406430938,-0.0766519,0.0766519,9.86893 -accelerometer: 406450744,-0.019163,-0.019163,9.6773 -accelerometer: 406471405,-0.172467,0.0574889,9.65814 -accelerometer: 406490997,0.019163,-0.019163,9.69646 -accelerometer: 406510925,0.153304,0.0383259,9.8306 -accelerometer: 406531006,-0.0766519,0.19163,9.77311 -accelerometer: 406550750,0.0958148,-0.0958148,9.6773 -accelerometer: 406570953,0.229956,-0.0766519,9.58148 -accelerometer: 406591003,-0.153304,-0.114978,9.73479 -accelerometer: 406610962,0.0766519,-0.134141,9.63897 -accelerometer: 406630951,-0.0383259,-4.88656,9.58148 -accelerometer: 406650909,-0.153304,0.0574889,9.58148 -accelerometer: 406670959,-0.0574889,-0.153304,9.63897 -accelerometer: 406690613,0.0383259,-0.19163,9.63897 -accelerometer: 406710968,-0.0574889,-0.0766519,9.56232 -accelerometer: 406730987,-0.134141,0.0383259,9.77311 -accelerometer: 406751068,0.0574889,0.0766519,9.81144 -accelerometer: 406770935,-0.0383259,0.019163,9.63897 -accelerometer: 406790954,0.114978,0.0574889,9.90726 -accelerometer: 406810943,0.019163,0.0383259,9.65814 -accelerometer: 406830993,-0.249119,-0.019163,9.60065 -accelerometer: 406850555,-0.134141,0.0766519,9.84977 -accelerometer: 406870971,-0.210793,-0.0383259,9.75395 -accelerometer: 406890991,0.0383259,0.0383259,9.73479 -accelerometer: 406910949,0.019163,-0.153304,9.60065 -accelerometer: 406930969,0.0766519,-0.0574889,9.524 -accelerometer: 406950714,0.153304,0.019163,9.69646 -accelerometer: 406971222,0.0383259,-4.82907,9.73479 -accelerometer: 406991058,-0.019163,-4.90572,9.65814 -accelerometer: 407010864,0.0383259,0.0766519,9.79228 -accelerometer: 407030975,0.0958148,-4.79074,9.58148 -accelerometer: 407050811,-0.134141,4.73325,9.61981 -accelerometer: 407070923,-0.0958148,0.0383259,9.71563 -accelerometer: 407090881,0.0766519,0.0766519,9.79228 -accelerometer: 407110748,-0.134141,0.0766519,9.54316 -accelerometer: 407130768,-0.0958148,0.0574889,9.6773 -accelerometer: 407150818,-0.0574889,-0.172467,9.63897 -accelerometer: 407170959,-0.134141,-0.0383259,9.6773 -accelerometer: 407190918,0.0574889,0.019163,9.69646 -accelerometer: 407210968,0.019163,-0.0383259,9.63897 -accelerometer: 407230957,-0.172467,0.0958148,9.73479 -accelerometer: 407250793,-0.0574889,0,9.60065 -accelerometer: 407270935,-0.134141,-0.0383259,9.63897 -accelerometer: 407290954,0,-0.0958148,9.65814 -accelerometer: 407311004,-4.84823,-0.0574889,9.73479 -accelerometer: 407330963,-0.0958148,0.114978,9.81144 -accelerometer: 407350769,0.134141,0.0383259,9.63897 -accelerometer: 407371032,0.0574889,0,9.63897 -accelerometer: 407390930,0.0574889,-0.0383259,9.50483 -accelerometer: 407410980,-0.114978,0,9.524 -accelerometer: 407430938,-0.134141,0.019163,9.6773 -accelerometer: 407450866,-0.0766519,0.0958148,9.81144 -accelerometer: 407470764,-0.019163,-0.019163,9.86893 -accelerometer: 407490905,0.019163,-0.019163,9.63897 -accelerometer: 407510833,-0.0383259,0.019163,9.6773 -accelerometer: 407530914,-0.19163,0.0766519,9.63897 -accelerometer: 407550811,-0.249119,0.229956,9.61981 -accelerometer: 407570923,0.134141,0.0383259,9.54316 -accelerometer: 407590973,-0.153304,-0.019163,9.56232 -accelerometer: 407610962,-0.153304,0,9.63897 -accelerometer: 407630951,0.0383259,0.0958148,9.81144 -accelerometer: 407650787,-0.0574889,0.0766519,9.48567 -accelerometer: 407670898,0.0383259,-0.0574889,9.79228 -accelerometer: 407690796,-0.344933,0.0958148,9.56232 -accelerometer: 407710998,-0.019163,-0.0383259,9.73479 -accelerometer: 407731018,-0.134141,0,9.60065 -accelerometer: 407750824,0.0766519,0.019163,9.73479 -accelerometer: 407770874,0.019163,0.0766519,9.75395 -accelerometer: 407790954,-0.229956,4.88656,9.63897 -accelerometer: 407811004,-0.0766519,-4.86739,9.75395 -accelerometer: 407830963,0.0766519,-0.114978,9.63897 -accelerometer: 407850799,0.0766519,0.0383259,9.6773 -accelerometer: 407870910,0.0766519,0.019163,9.73479 -accelerometer: 407890930,0.0383259,-0.0766519,9.56232 -accelerometer: 407910919,0.019163,-0.19163,9.69646 -accelerometer: 407930969,-0.114978,0.153304,9.65814 -accelerometer: 407950927,0.0574889,4.73325,9.50483 -accelerometer: 407970855,-0.229956,4.84823,9.61981 -accelerometer: 407990967,-0.134141,-0.0383259,9.42818 -accelerometer: 408011078,-0.0574889,0.19163,9.65814 -accelerometer: 408031006,0.0383259,-0.0766519,9.58148 -accelerometer: 408050995,-0.0574889,-0.0958148,9.63897 -accelerometer: 408070923,0.019163,0.019163,9.60065 -accelerometer: 408091003,-0.0383259,0.114978,9.60065 -accelerometer: 408110992,-0.153304,-0.172467,9.44734 -accelerometer: 408130951,0,0.134141,9.54316 -accelerometer: 408150970,-0.134141,0.0766519,9.50483 -accelerometer: 408170898,0,-0.0574889,9.77311 -accelerometer: 408190918,-0.114978,-0.0383259,9.50483 -accelerometer: 408210968,-0.0958148,0.0383259,9.48567 -accelerometer: 408231079,-0.019163,0.0766519,9.90726 -accelerometer: 408250976,0.019163,-0.0766519,9.8306 -accelerometer: 408270935,0.0383259,-0.0958148,9.63897 -accelerometer: 408290954,0.0574889,0.0383259,9.6773 -accelerometer: 408310974,-0.0766519,-0.019163,9.42818 -accelerometer: 408330963,0.114978,-0.0383259,9.60065 -accelerometer: 408350769,0.0766519,-0.0383259,9.65814 -accelerometer: 408370971,0.019163,-4.86739,9.69646 -accelerometer: 408390960,0,0.153304,9.71563 -accelerometer: 408410949,0.0958148,0.0383259,9.69646 -accelerometer: 408430999,-0.153304,-0.019163,9.79228 -accelerometer: 408450805,-0.0383259,-0.0766519,9.65814 -accelerometer: 408470764,-0.0958148,0.153304,9.75395 -accelerometer: 408490936,-0.172467,4.88656,9.69646 -accelerometer: 408510986,0,0.019163,9.69646 -accelerometer: 408530975,0,-0.0958148,9.81144 -accelerometer: 408550995,-0.0958148,0.0574889,9.50483 -accelerometer: 408570923,0.0574889,-0.114978,9.60065 -accelerometer: 408590942,-0.0383259,-0.0766519,9.79228 -accelerometer: 408610931,0.0958148,-4.77158,9.65814 -accelerometer: 408630920,-0.0958148,-4.88656,9.58148 -accelerometer: 408650940,-0.19163,-0.019163,9.77311 -accelerometer: 408670898,0.019163,0.0574889,9.6773 -accelerometer: 408690613,0.019163,-0.0958148,9.8306 -accelerometer: 408710998,-0.172467,0,9.60065 -accelerometer: 408730957,-0.210793,-0.0383259,9.65814 -accelerometer: 408750946,-0.134141,-4.88656,9.69646 -accelerometer: 408770935,-0.0958148,0.0766519,9.77311 -accelerometer: 408790954,-0.0383259,0,9.56232 -accelerometer: 408810974,0.172467,-0.114978,9.69646 -accelerometer: 408830932,0.0574889,-0.0574889,9.58148 -accelerometer: 408850952,0,0.19163,9.65814 -accelerometer: 408870910,0,0.0958148,9.84977 -accelerometer: 408890930,-0.0574889,0.0766519,9.50483 -accelerometer: 408910949,-0.229956,4.71409,9.40902 -accelerometer: 408930999,0.019163,0.0383259,9.6773 -accelerometer: 408950927,-0.19163,0.0958148,9.65814 -accelerometer: 408970886,-0.0958148,0.0766519,9.65814 -accelerometer: 408990967,0.114978,-0.019163,9.60065 -accelerometer: 409010833,-0.114978,0.0383259,9.50483 -accelerometer: 409031036,-0.0383259,-4.88656,9.48567 -accelerometer: 409050995,-0.210793,0.019163,9.63897 -accelerometer: 409071075,-0.134141,0.19163,9.60065 -accelerometer: 409090942,0.153304,-0.0574889,9.75395 -accelerometer: 409110931,0,0.0574889,9.63897 -accelerometer: 409130951,-0.134141,0.0383259,9.69646 -accelerometer: 409150940,-0.0574889,4.82907,9.75395 -accelerometer: 409171142,0.0766519,0.0574889,9.81144 -accelerometer: 409190948,-0.0574889,-0.172467,9.46651 -accelerometer: 409210937,0.134141,-0.153304,9.48567 -accelerometer: 409230957,-0.153304,0.19163,9.6773 -accelerometer: 409250946,0.0574889,0.0383259,9.6773 -accelerometer: 409271087,0,-0.134141,9.69646 -accelerometer: 409290954,0.0958148,4.88656,9.65814 -accelerometer: 409310974,0.0766519,-0.0766519,9.65814 -accelerometer: 409330963,0.19163,-0.0958148,9.77311 -accelerometer: 409350799,-0.0383259,0.268282,9.79228 -accelerometer: 409370605,-0.134141,0.0574889,9.61981 -accelerometer: 409390960,-0.0766519,0.0766519,9.56232 -accelerometer: 409410949,0.0766519,-4.82907,9.56232 -accelerometer: 409430816,-0.0958148,-0.134141,9.77311 -accelerometer: 409450805,0.019163,0.153304,9.77311 -accelerometer: 409470703,-0.153304,0,9.65814 -accelerometer: 409490936,0.0958148,-0.0958148,9.60065 -accelerometer: 409510894,0.019163,0.0383259,9.65814 -accelerometer: 409530945,-0.114978,-0.0574889,9.6773 -accelerometer: 409550995,-0.153304,0.172467,9.54316 -accelerometer: 409570800,-0.134141,-0.0383259,9.56232 -accelerometer: 409590942,-0.0574889,0.019163,9.61981 -accelerometer: 409610962,0.0766519,-0.0766519,9.69646 -accelerometer: 409630981,-0.0383259,-0.134141,9.60065 -accelerometer: 409650940,-0.0958148,-0.114978,9.56232 -accelerometer: 409670807,0.0958148,-0.134141,9.63897 -accelerometer: 409691284,-0.210793,-0.0958148,9.61981 -accelerometer: 409710937,-0.019163,-0.0574889,9.71563 -accelerometer: 409730957,-0.0574889,-0.114978,9.69646 -accelerometer: 409750946,0,0,9.69646 -accelerometer: 409770782,0.0766519,-0.019163,9.58148 -accelerometer: 409790954,-0.0574889,0.0383259,9.56232 -accelerometer: 409810974,-0.153304,4.67576,9.58148 -accelerometer: 409830963,-0.0383259,4.88656,9.6773 -accelerometer: 409850952,0.0383259,0.0958148,9.75395 -accelerometer: 409870788,-0.153304,0,9.61981 -accelerometer: 409890899,-0.0958148,-0.0766519,9.65814 -accelerometer: 409910919,-0.0958148,-0.0574889,9.38986 -accelerometer: 409930938,0.0766519,0.0766519,9.69646 -accelerometer: 409950988,-0.0574889,-0.114978,9.61981 -accelerometer: 409970794,-0.0383259,-0.0958148,9.56232 -accelerometer: 409990967,-0.134141,-0.114978,9.73479 -accelerometer: 410010925,0.0574889,0.0383259,9.73479 -accelerometer: 410031036,-0.0766519,0.0574889,9.6773 -accelerometer: 410050995,-0.0766519,-0.0766519,9.56232 -accelerometer: 410070800,-0.0574889,0.0574889,9.524 -accelerometer: 410090973,-0.0766519,0.114978,9.58148 -accelerometer: 410110931,-0.0958148,4.84823,9.524 -accelerometer: 410130981,-0.153304,0.0958148,9.61981 -accelerometer: 410150940,0,0.0383259,9.69646 -accelerometer: 410170807,0.0958148,-0.114978,9.60065 -accelerometer: 410190887,-0.0958148,0.0383259,9.63897 -accelerometer: 410210968,0.0574889,-0.134141,9.71563 -accelerometer: 410231079,-0.172467,-0.0958148,9.6773 -accelerometer: 410251007,-0.0383259,-0.019163,9.54316 -accelerometer: 410270813,0.019163,-0.0383259,9.69646 -accelerometer: 410290893,-0.0574889,-0.0766519,9.56232 -accelerometer: 410310943,-0.114978,-0.0574889,9.69646 -accelerometer: 410330963,0.019163,-0.019163,9.71563 -accelerometer: 410350799,-0.19163,0.134141,9.60065 -accelerometer: 410370819,-0.114978,-0.019163,9.69646 -accelerometer: 410390930,0.0383259,0.0574889,9.56232 -accelerometer: 410410919,0.0574889,-4.82907,9.81144 -accelerometer: 410430938,0.0574889,-4.88656,9.73479 -accelerometer: 410450805,0.019163,0.19163,9.58148 -accelerometer: 410470703,0.0383259,-0.0574889,9.54316 -accelerometer: 410490936,-0.114978,0.172467,9.6773 -accelerometer: 410510956,-0.0766519,-0.0958148,9.6773 -accelerometer: 410530975,0.0958148,-0.0383259,9.69646 -accelerometer: 410550934,0.134141,-0.0766519,9.71563 -accelerometer: 410570923,-0.0383259,-4.90572,9.69646 -accelerometer: 410590912,-0.268282,0.019163,9.60065 -accelerometer: 410610962,-0.153304,-0.019163,9.61981 -accelerometer: 410630951,-0.134141,0.0766519,9.60065 -accelerometer: 410650940,-0.229956,0.0766519,9.58148 -accelerometer: 410670929,0.0574889,-0.019163,9.58148 -accelerometer: 410691742,0.0766519,0,9.8306 -accelerometer: 410710998,0,-4.84823,9.69646 -accelerometer: 410730957,-0.172467,0.0574889,9.46651 -accelerometer: 410750946,-0.172467,-0.0383259,9.48567 -accelerometer: 410770935,-0.0766519,-0.114978,9.54316 -accelerometer: 410790924,-0.153304,0.019163,9.56232 -accelerometer: 410810943,-0.0958148,0.153304,9.61981 -accelerometer: 410830963,0.0958148,0.172467,9.63897 -accelerometer: 410850952,-0.0383259,-0.0574889,9.73479 -accelerometer: 410870941,-0.0383259,0.0383259,9.60065 -accelerometer: 410890899,-0.134141,0.134141,9.58148 -accelerometer: 410910980,-0.0958148,-0.0958148,9.58148 -accelerometer: 410930969,0,0.210793,9.69646 -accelerometer: 410950958,0.0574889,-0.019163,9.75395 -accelerometer: 410970947,-0.0383259,-0.0574889,9.6773 -accelerometer: 410990936,0.0574889,-0.0574889,9.71563 -accelerometer: 411010864,-0.19163,0.0383259,9.84977 -accelerometer: 411031036,0,-0.0766519,9.54316 -accelerometer: 411050934,0.0574889,-0.172467,9.69646 -accelerometer: 411070984,-0.153304,0.210793,9.58148 -accelerometer: 411090912,0.019163,0.0574889,9.73479 -accelerometer: 411110931,0.134141,-0.172467,9.61981 -accelerometer: 411131805,-0.0574889,0,9.61981 -accelerometer: 411151245,-0.210793,-0.019163,9.46651 -accelerometer: 411170959,-0.0958148,0.19163,9.6773 -accelerometer: 411190979,0.0958148,0,9.65814 -accelerometer: 411211029,-0.0574889,-0.0574889,9.75395 -accelerometer: 411230957,0.0766519,0.0958148,9.69646 -accelerometer: 411250793,0.229956,-0.0958148,9.71563 -accelerometer: 411270874,-0.0958148,0.172467,9.524 -accelerometer: 411290924,0,0,9.75395 -accelerometer: 411310974,-0.019163,-0.019163,9.63897 -accelerometer: 411330932,-0.0383259,0.19163,9.6773 -accelerometer: 411350799,-0.0383259,0.0958148,9.61981 -accelerometer: 411371002,0.0574889,-0.134141,9.8306 -accelerometer: 411390899,-0.0383259,-0.0958148,9.63897 -accelerometer: 411410980,-0.0383259,0.153304,9.69646 -accelerometer: 411430969,-0.19163,-0.114978,9.88809 -accelerometer: 411450958,0.210793,0,9.75395 -accelerometer: 411470703,0.0958148,-0.19163,9.58148 -accelerometer: 411490936,-0.0766519,0.019163,9.63897 -accelerometer: 411510833,-0.019163,-0.153304,9.6773 -accelerometer: 411530945,-0.019163,0.0958148,9.524 -accelerometer: 411550964,-0.0383259,-4.86739,9.65814 -accelerometer: 411570953,0.114978,4.84823,9.73479 -accelerometer: 411591095,-0.210793,0.0766519,9.6773 -accelerometer: 411610931,-0.114978,0.172467,9.88809 -accelerometer: 411630920,-0.0383259,0.0958148,9.71563 -accelerometer: 411651001,-0.019163,-0.019163,9.6773 -accelerometer: 411670959,0.210793,-0.0766519,9.54316 -accelerometer: 411691040,-0.0766519,0.0383259,9.63897 -accelerometer: 411710785,-0.0574889,0.019163,9.71563 -accelerometer: 411730835,-0.153304,0,9.69646 -accelerometer: 411750976,-0.153304,0.0574889,9.56232 -accelerometer: 411770935,-0.153304,0,9.61981 -accelerometer: 411791015,0.019163,-0.134141,9.48567 -accelerometer: 411810943,-0.019163,0.114978,9.60065 -accelerometer: 411830932,0,-0.0383259,9.77311 -accelerometer: 411850921,0.0958148,-0.172467,9.6773 -accelerometer: 411870971,0.0383259,-0.0383259,9.73479 -accelerometer: 411890564,-0.0766519,-0.114978,9.75395 -accelerometer: 411910858,-0.0766519,-0.019163,9.63897 -accelerometer: 411930908,0.0383259,0.019163,9.71563 -accelerometer: 411950927,0.019163,0.114978,9.63897 -accelerometer: 411971100,-0.0958148,4.77158,9.79228 -accelerometer: 411990814,0.0958148,-0.0383259,9.60065 -accelerometer: 412010894,0.0383259,-0.0383259,9.69646 -accelerometer: 412031006,-0.114978,0.19163,9.60065 -accelerometer: 412050964,-0.19163,0.0383259,9.61981 -accelerometer: 412070953,-0.0766519,0,9.50483 -accelerometer: 412090790,0.364096,-0.134141,9.60065 -accelerometer: 412110779,-0.114978,0.114978,9.58148 -accelerometer: 412130859,-0.0766519,-0.019163,9.50483 -accelerometer: 412150757,0.153304,-0.0574889,9.79228 -accelerometer: 412170868,0.0383259,-4.84823,9.6773 -accelerometer: 412190765,-0.0574889,-0.0383259,9.63897 -accelerometer: 412210907,-0.0766519,0,9.81144 -accelerometer: 412231109,-0.153304,-4.82907,9.79228 -accelerometer: 412250976,-0.019163,-0.114978,9.69646 -accelerometer: 412270935,-0.153304,0.172467,9.42818 -accelerometer: 412290802,-0.153304,-0.0958148,9.65814 -accelerometer: 412311004,-0.114978,-0.0383259,9.61981 -accelerometer: 412330963,-0.153304,-0.0574889,9.63897 -accelerometer: 412350799,-0.0766519,-0.0574889,9.63897 -accelerometer: 412371002,-0.19163,-0.0958148,9.61981 -accelerometer: 412390838,0.0383259,0.134141,9.58148 -accelerometer: 412410919,-0.0766519,-0.134141,9.54316 -accelerometer: 412430938,-0.19163,-4.88656,9.56232 -accelerometer: 412450927,-0.172467,0.0383259,9.63897 -accelerometer: 412470703,-0.172467,0.19163,9.44734 -accelerometer: 412490783,0.0574889,0.114978,9.65814 -accelerometer: 412510925,-0.0574889,-0.134141,9.77311 -accelerometer: 412530975,0.0383259,0.019163,9.81144 -accelerometer: 412550903,0.019163,-0.019163,9.73479 -accelerometer: 412570923,0.0574889,0.114978,9.50483 -accelerometer: 412590820,0.0766519,-0.0574889,9.71563 -accelerometer: 412610931,0.0383259,-0.0766519,9.65814 -accelerometer: 412630951,0,-0.0766519,9.60065 -accelerometer: 412650970,0.0766519,0.0766519,9.73479 -accelerometer: 412670929,0.19163,-0.210793,9.71563 -accelerometer: 412690796,0.0574889,0.0574889,9.6773 -accelerometer: 412710937,0.134141,-4.88656,9.44734 -accelerometer: 412730957,0,0,9.73479 -accelerometer: 412750915,0.0383259,-0.114978,9.56232 -accelerometer: 412770935,-0.0766519,-0.0958148,9.524 -accelerometer: 412790832,0.134141,0,9.6773 -accelerometer: 412810974,-0.134141,0.134141,9.54316 -accelerometer: 412830963,-0.134141,0.0958148,9.63897 -accelerometer: 412850952,0.0383259,-0.210793,9.54316 -accelerometer: 412870941,0.0383259,4.88656,9.8306 -accelerometer: 412890777,0.0766519,0.0958148,9.60065 -accelerometer: 412910888,0.0383259,-0.0574889,9.54316 -accelerometer: 412930938,0,-0.0574889,9.65814 -accelerometer: 412950927,-0.210793,0.0766519,9.56232 -accelerometer: 412970916,-0.210793,-0.0766519,9.65814 -accelerometer: 412990967,0.134141,-0.0383259,9.65814 -accelerometer: 413010650,-0.0574889,0.0574889,9.524 -accelerometer: 413031097,-0.019163,0.114978,9.63897 -accelerometer: 413050934,-0.0766519,0.134141,9.65814 -accelerometer: 413070923,0.0958148,-0.0574889,9.77311 -accelerometer: 413090942,0.019163,0.210793,9.6773 -accelerometer: 413110901,-0.114978,0.153304,9.75395 -accelerometer: 413130920,0.019163,-0.172467,9.54316 -accelerometer: 413150940,-0.0766519,0.019163,9.50483 -accelerometer: 413170929,-4.88656,-0.0766519,9.77311 -accelerometer: 413190918,0.019163,-0.0383259,9.65814 -accelerometer: 413210663,-0.0574889,-0.306608,9.6773 -accelerometer: 413231018,-0.0574889,0,9.60065 -accelerometer: 413250915,0.383259,0.019163,9.86893 -accelerometer: 413270935,-0.268282,-0.210793,9.17906 -accelerometer: 413290893,0.440748,-0.019163,9.90726 -accelerometer: 413311920,0.210793,0,9.75395 -accelerometer: 413330780,-0.019163,-0.0958148,9.61981 -accelerometer: 413350769,-0.0958148,-0.019163,9.65814 -accelerometer: 413370910,-0.114978,0.0574889,9.6773 -accelerometer: 413390899,0.019163,-0.0958148,9.77311 -accelerometer: 413410888,-0.268282,0.210793,9.48567 -accelerometer: 413430969,-0.019163,-0.0574889,9.58148 -accelerometer: 413450958,-0.0766519,0.019163,9.65814 -accelerometer: 413470794,-0.134141,4.80991,9.58148 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_notwhip.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_notwhip.dat deleted file mode 100644 index 4ee7293b..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_notwhip.dat +++ /dev/null @@ -1,653 +0,0 @@ -orientation:9573770688,5 -accelerometer: 9576731808,0.402422,-0.0383259,9.69646 -accelerometer: 9576750577,0.134141,-0.153304,9.38986 -accelerometer: 9576770718,0.0383259,0.019163,9.75395 -accelerometer: 9576790555,-0.019163,0.229956,9.23655 -accelerometer: 9576810727,0.19163,-0.0958148,9.46651 -irProximity:9576818280,0.286275 -accelerometer: 9576833462,0.0958148,-4.84823,9.6773 -proximity:9576836896,0 -accelerometer: 9576850552,0.0383259,-0.0766519,9.35153 -accelerometer: 9576870572,0.114978,-0.0766519,9.77311 -accelerometer: 9576890561,-0.0383259,0.0383259,9.6773 -accelerometer: 9576910550,0,-0.0766519,9.6773 -accelerometer: 9576930752,0.114978,0,9.73479 -accelerometer: 9576950711,-0.134141,0.114978,9.60065 -accelerometer: 9576970639,0.114978,-0.0383259,9.79228 -accelerometer: 9576990719,-0.0958148,-0.114978,9.44734 -accelerometer: 9577010525,-0.229956,0.134141,9.63897 -accelerometer: 9577031064,-0.210793,0,9.63897 -accelerometer: 9577050717,0.0383259,-0.0574889,9.48567 -accelerometer: 9577070767,-0.0383259,4.86739,9.48567 -accelerometer: 9577090909,0,-0.0383259,9.44734 -accelerometer: 9577110776,-0.0766519,-0.019163,9.6773 -accelerometer: 9577130887,0.0383259,0.153304,9.54316 -accelerometer: 9577150784,0.0766519,-0.0766519,9.71563 -accelerometer: 9577170804,0.0574889,-0.0574889,9.63897 -accelerometer: 9577190976,-0.0766519,0.0383259,9.42818 -accelerometer: 9577210873,0,4.84823,9.65814 -accelerometer: 9577231015,0.0383259,-0.210793,9.48567 -accelerometer: 9577250790,-0.0958148,0.0383259,9.65814 -accelerometer: 9577270810,0.114978,-0.0766519,9.50483 -accelerometer: 9577290982,1.82048,0.229956,1.97379 -accelerometer: 9577310544,-1.68634,-0.0574889,9.37069 -irProximity:9577324872,0.290196 -accelerometer: 9577330533,1.72467,-0.440748,8.68083 -accelerometer: 9577350491,-0.919823,-0.134141,6.99448 -accelerometer: 9577370572,0.785682,-0.019163,10.3288 -accelerometer: 9577390896,-0.249119,0,9.10241 -accelerometer: 9577410916,0.114978,0.249119,2.97026 -irProximity:9577425335,0.286275 -accelerometer: 9577430630,-0.689867,-1.01564,9.90726 -accelerometer: 9577450497,-1.9163,0.594052,8.47003 -accelerometer: 9577470517,0,-0.0766519,10.2714 -accelerometer: 9577490506,-0.114978,0.229956,10.0797 -tap:9577504834,1 -accelerometer: 9577510495,0.364096,0.153304,10.8079 -accelerometer: 9577530575,-0.019163,0.229956,9.21739 -accelerometer: 9577550534,1.07313,2.28039,-19.4504 -accelerometer: 9577570645,0.32577,-2.14625,1.0348 -accelerometer: 9577590695,-0.632378,2.70198,16.2885 -accelerometer: 9577610531,0.613215,-0.5174,8.81497 -irProximity:9577626202,0.290196 -accelerometer: 9577630520,0.383259,-0.555726,8.75748 -accelerometer: 9577650693,0.843171,1.14978,6.22797 -accelerometer: 9577670743,0.344933,0.594052,-1.13062 -accelerometer: 9577690915,0.364096,-1.41806,10.463 -accelerometer: 9577712582,-0.229956,-1.09229,6.78369 -irProximity:9577727002,0.286275 -accelerometer: 9577732815,0.938986,1.22643,19.3163 -accelerometer: 9577752499,0.249119,0.134141,8.33589 -accelerometer: 9577770871,0.364096,1.09229,12.4176 -accelerometer: 9577791043,0.32577,-0.32577,-5.11651 -accelerometer: 9577811123,0.249119,-0.536563,5.03986 -accelerometer: 9577831051,0.0958148,0.383259,10.1947 -accelerometer: 9577850857,-0.019163,0.440748,10.233 -accelerometer: 9577870663,1.16894,-0.229956,10.6354 -accelerometer: 9577891446,1.82048,0.134141,27.9779 -accelerometer: 9577911160,1.36057,1.5522,7.66519 -irProximity:9577928418,0.294118 -accelerometer: 9577930996,-1.3989,-0.824008,6.68788 -accelerometer: 9577950955,-0.632378,-0.249119,6.40043 -accelerometer: 9577970852,0.536563,-0.785682,7.81849 -accelerometer: 9577991910,0.32577,1.99295,12.9733 -accelerometer: 9578012875,-2.16542,6.76453,8.92994 -irProximity:9578029309,0.286275 -accelerometer: 9578031033,0.5174,-0.996474,10.5013 -accelerometer: 9578051053,-0.536563,0.210793,9.48567 -accelerometer: 9578070614,0.268282,0,9.88809 -accelerometer: 9578090817,-0.766519,4.04339,12.9925 -accelerometer: 9578110959,0.804845,-0.364096,4.86739 -irProximity:9578129925,0.282353 -accelerometer: 9578130734,-1.41806,-1.01564,8.91078 -accelerometer: 9578150937,-0.459911,0.344933,10.9804 -accelerometer: 9578170590,-0.344933,-0.0766519,9.08325 -accelerometer: 9578190701,0.287445,-0.134141,11.7852 -accelerometer: 9578210690,-0.019163,-0.114978,9.17906 -irProximity:9578230389,0.286275 -accelerometer: 9578230527,0.114978,0.5174,9.98391 -accelerometer: 9578250516,0.824008,-0.862334,4.46497 -accelerometer: 9578270688,-0.0383259,-0.574889,8.98743 -accelerometer: 9578290829,-0.268282,-0.114978,9.96474 -accelerometer: 9578310818,0.785682,-0.0574889,9.42818 -irProximity:9578331097,0.294118 -accelerometer: 9578330807,-0.019163,0.019163,10.6354 -accelerometer: 9578350827,-0.766519,0.0766519,5.0207 -accelerometer: 9578370877,-0.498237,-0.594052,11.287 -accelerometer: 9578390805,-0.134141,0.19163,11.6702 -accelerometer: 9578410916,-1.60969,-0.594052,5.71057 -irProximity:9578431622,0.286275 -accelerometer: 9578430661,-1.43722,1.36057,12.2835 -accelerometer: 9578450985,-1.64802,0.785682,8.71915 -accelerometer: 9578471036,1.74383,-0.402422,8.54668 -accelerometer: 9578490994,1.30308,1.53304,-4.6566 -accelerometer: 9578510830,-1.20727,0.536563,6.15131 -irProximity:9578532422,0.290196 -accelerometer: 9578531216,0.153304,-0.747356,3.96673 -accelerometer: 9578550992,-0.383259,-0.0766519,9.1599 -accelerometer: 9578570645,-1.26476,0.32577,8.83413 -accelerometer: 9578590756,1.09229,-0.0383259,10.5205 -accelerometer: 9578610989,-0.70903,-0.114978,8.52752 -accelerometer: 9578630612,0.594052,0.0383259,10.3288 -irProximity:9578633648,0.294118 -accelerometer: 9578650967,-0.383259,-0.019163,9.71563 -accelerometer: 9578670956,-0.210793,0.0574889,9.60065 -accelerometer: 9578691250,0.134141,0.19163,9.96474 -accelerometer: 9578710904,-0.651541,-4.80991,8.83413 -accelerometer: 9578730771,0.536563,-0.0574889,9.56232 -irProximity:9578734601,0.290196 -accelerometer: 9578750943,-0.421585,0.287445,9.40902 -accelerometer: 9578770932,0.344933,0,10.1372 -accelerometer: 9578790951,-0.479074,4.86739,8.75748 -accelerometer: 9578810940,0.32577,0.287445,10.6163 -accelerometer: 9578830838,-0.0958148,-0.0958148,9.27488 -irProximity:9578835522,0.286275 -accelerometer: 9578851010,0.0383259,0.0574889,9.90726 -accelerometer: 9578870968,-0.114978,4.86739,9.60065 -accelerometer: 9578890988,-0.134141,-0.0574889,9.48567 -accelerometer: 9578910946,-0.0766519,0.19163,9.90726 -accelerometer: 9578930752,-0.114978,0,9.50483 -accelerometer: 9578950924,4.75242,0.0383259,9.81144 -accelerometer: 9578970822,-0.0958148,-4.77158,9.33237 -accelerometer: 9578990750,0.172467,-0.229956,9.37069 -accelerometer: 9579010739,0.172467,-0.0383259,9.50483 -accelerometer: 9579030789,0.210793,0.019163,9.8306 -accelerometer: 9579050961,-0.019163,-0.019163,9.58148 -accelerometer: 9579070950,0,0.153304,9.73479 -accelerometer: 9579090970,0.019163,-0.0766519,9.524 -accelerometer: 9579110959,-0.0958148,0.019163,9.6773 -accelerometer: 9579130826,0.153304,-4.86739,9.60065 -accelerometer: 9579150937,0.0766519,-0.0958148,9.61981 -accelerometer: 9579170956,-0.114978,0.0766519,9.61981 -accelerometer: 9579190793,-0.0383259,-0.0383259,9.63897 -accelerometer: 9579210995,-0.134141,0.114978,9.524 -accelerometer: 9579230801,-0.019163,0.0383259,9.60065 -accelerometer: 9579250943,0.172467,-0.134141,9.65814 -accelerometer: 9579270962,-0.019163,-4.77158,9.61981 -accelerometer: 9579290951,-0.153304,0,9.56232 -accelerometer: 9579311001,0.172467,-0.134141,9.79228 -accelerometer: 9579330807,-0.019163,-0.019163,9.46651 -accelerometer: 9579350918,0,0.153304,9.56232 -accelerometer: 9579370999,0.0958148,0.114978,9.69646 -accelerometer: 9579390957,-0.0383259,-0.0383259,9.46651 -accelerometer: 9579410946,-0.0383259,-4.82907,9.524 -accelerometer: 9579430813,0,4.80991,9.63897 -accelerometer: 9579450924,-0.0958148,-0.0958148,9.44734 -accelerometer: 9579470944,-0.153304,0,9.58148 -accelerometer: 9579490933,-0.0766519,-4.88656,9.65814 -accelerometer: 9579510891,0.0958148,0.0383259,9.56232 -accelerometer: 9579530881,-0.172467,-0.0958148,9.524 -accelerometer: 9579550961,0.268282,-0.172467,9.73479 -accelerometer: 9579570981,-0.0383259,-0.019163,9.58148 -accelerometer: 9579590970,-0.153304,0.19163,9.44734 -accelerometer: 9579610959,-0.0383259,0.0574889,9.60065 -accelerometer: 9579630795,-0.134141,0.0383259,9.40902 -accelerometer: 9579650906,-0.172467,-4.90572,9.54316 -accelerometer: 9579670956,-0.172467,0.0958148,9.50483 -accelerometer: 9579690945,-0.019163,0.0383259,9.63897 -accelerometer: 9579710965,4.67576,0,9.73479 -accelerometer: 9579730954,0.019163,-0.306608,9.69646 -accelerometer: 9579750912,0.153304,-0.153304,9.50483 -accelerometer: 9579770993,0.134141,-0.114978,9.50483 -accelerometer: 9579790951,0.344933,0,9.48567 -accelerometer: 9579811093,0.0766519,-0.0766519,9.58148 -accelerometer: 9579831021,0.153304,-0.019163,9.58148 -accelerometer: 9579850918,-0.0958148,0.0958148,9.54316 -accelerometer: 9579870999,-0.0383259,-0.019163,9.54316 -accelerometer: 9579890957,-0.019163,4.79074,9.50483 -accelerometer: 9579910916,0,-0.0958148,9.40902 -accelerometer: 9579930935,-0.172467,0.0766519,9.61981 -accelerometer: 9579950924,-0.134141,0.0958148,9.50483 -accelerometer: 9579970944,0.019163,-0.0574889,9.48567 -accelerometer: 9579990902,0.0574889,0.019163,9.73479 -accelerometer: 9580010922,-0.0574889,0.019163,9.48567 -accelerometer: 9580030942,0.0574889,-0.134141,9.71563 -accelerometer: 9580050931,0.019163,4.80991,9.50483 -accelerometer: 9580070981,0.0574889,-0.134141,9.524 -accelerometer: 9580090970,0,0.0574889,9.54316 -accelerometer: 9580110928,-0.0766519,-0.134141,9.69646 -accelerometer: 9580130917,-0.229956,-0.766519,8.4892 -accelerometer: 9580150784,0.344933,0.32577,10.9229 -accelerometer: 9580170804,-0.114978,0.134141,9.58148 -accelerometer: 9580190823,-0.287445,-0.114978,8.6425 -accelerometer: 9580210965,0,0.134141,10.0989 -accelerometer: 9580230923,0.210793,0.0383259,10.1755 -accelerometer: 9580250973,0.0766519,-0.210793,9.42818 -accelerometer: 9580270993,-0.306608,0.153304,9.3132 -accelerometer: 9580290982,-0.0958148,0.210793,9.54316 -accelerometer: 9580311062,-0.0958148,0.019163,9.63897 -accelerometer: 9580330990,0.0766519,0.019163,9.73479 -accelerometer: 9580350644,0.0383259,0.0383259,9.58148 -accelerometer: 9580370663,0.0383259,-0.019163,9.60065 -accelerometer: 9580390805,-0.172467,0.0766519,9.35153 -accelerometer: 9580410763,0.229956,-0.114978,9.8306 -accelerometer: 9580430752,-0.344933,0.0766519,8.96827 -accelerometer: 9580450833,0.249119,0.19163,9.81144 -accelerometer: 9580470883,-0.134141,-0.0383259,9.17906 -accelerometer: 9580490872,0.0766519,0.19163,10.0031 -accelerometer: 9580510891,-0.114978,-0.0574889,9.40902 -accelerometer: 9580530728,0.0383259,0.134141,9.88809 -accelerometer: 9580550931,0.0383259,-0.210793,9.42818 -accelerometer: 9580570981,-0.0574889,0.134141,9.81144 -accelerometer: 9580590970,0,4.75242,9.61981 -accelerometer: 9580610959,0.114978,0.0383259,9.63897 -accelerometer: 9580630948,-0.019163,0,9.46651 -accelerometer: 9580650906,0,0.0383259,9.60065 -accelerometer: 9580670987,0.134141,0.0766519,9.6773 -accelerometer: 9580690976,0.0383259,0.229956,9.54316 -accelerometer: 9580710934,0.153304,0,9.58148 -accelerometer: 9580730954,-0.153304,-0.019163,9.40902 -accelerometer: 9580751095,-0.153304,-0.0958148,9.63897 -accelerometer: 9580770962,-0.019163,-0.0383259,9.42818 -accelerometer: 9580790982,0.0958148,-0.134141,9.46651 -accelerometer: 9580810971,-0.114978,0,9.54316 -accelerometer: 9580830990,0.019163,-0.019163,9.48567 -accelerometer: 9580851040,0,-0.019163,9.65814 -accelerometer: 9580870999,-0.0574889,-0.0383259,9.61981 -accelerometer: 9580890957,-0.32577,0.613215,2.41453 -accelerometer: 9580910916,0.364096,0.651541,8.25924 -accelerometer: 9580930874,-0.249119,0.364096,8.2784 -accelerometer: 9580950894,-0.153304,-0.383259,9.88809 -accelerometer: 9580971097,-0.268282,0.0383259,9.79228 -accelerometer: 9580990994,-0.0383259,-0.114978,9.524 -accelerometer: 9581011075,-0.019163,-0.0766519,9.60065 -accelerometer: 9581031186,0,0.114978,9.79228 -accelerometer: 9581050778,-0.0958148,0.019163,9.73479 -accelerometer: 9581070920,-0.114978,0.019163,9.44734 -accelerometer: 9581091275,-0.440748,0.210793,9.19823 -accelerometer: 9581110806,0.613215,0,9.77311 -accelerometer: 9581130795,-0.5174,0.0574889,9.33237 -accelerometer: 9581150784,0.19163,0.0383259,9.98391 -accelerometer: 9581170956,0.249119,-0.0574889,9.58148 -accelerometer: 9581190823,-0.287445,0.114978,9.23655 -accelerometer: 9581210965,0.32577,-0.134141,10.0031 -accelerometer: 9581230954,-0.19163,0.0958148,9.50483 -accelerometer: 9581250821,-0.114978,-0.0383259,9.65814 -accelerometer: 9581270932,0.134141,-0.0383259,9.75395 -accelerometer: 9581290951,-0.210793,-0.268282,9.10241 -accelerometer: 9581310940,0.134141,0.0958148,9.75395 -accelerometer: 9581330990,-0.0958148,-0.019163,9.40902 -accelerometer: 9581350766,0.0383259,-0.019163,9.50483 -accelerometer: 9581370968,0.114978,0.0383259,9.56232 -accelerometer: 9581390957,0,4.84823,9.38986 -accelerometer: 9581410946,0.210793,0.0958148,9.94558 -accelerometer: 9581430966,-0.229956,-0.019163,9.44734 -accelerometer: 9581450802,0.114978,-0.0958148,9.65814 -accelerometer: 9581470944,0.114978,-4.69493,9.63897 -accelerometer: 9581490964,0.0574889,-0.0574889,9.46651 -accelerometer: 9581511227,-0.0766519,4.86739,9.48567 -accelerometer: 9581531704,-0.0574889,0.0383259,9.44734 -accelerometer: 9581550839,-0.114978,-4.88656,9.71563 -accelerometer: 9581570950,-0.19163,0.019163,9.71563 -accelerometer: 9581590970,-0.114978,0.0574889,9.71563 -accelerometer: 9581611020,-0.0574889,4.86739,9.524 -accelerometer: 9581630978,-0.268282,-0.479074,12.1685 -accelerometer: 9581650845,0.651541,0.32577,11.5553 -accelerometer: 9581670559,0.229956,-0.268282,9.35153 -accelerometer: 9581690579,0.306608,-0.172467,9.54316 -accelerometer: 9581710812,0.0766519,-4.77158,9.54316 -accelerometer: 9581730771,-0.0383259,0.0574889,9.63897 -accelerometer: 9581750790,-0.134141,0.019163,9.23655 -accelerometer: 9581770810,0,-0.210793,9.46651 -accelerometer: 9581790829,0.0574889,-0.019163,9.40902 -accelerometer: 9581810818,-0.249119,0.0383259,9.48567 -accelerometer: 9581830716,0,0.0383259,9.79228 -accelerometer: 9581850857,-0.019163,-0.0383259,9.75395 -irProximity:9581860577,0.282353 -accelerometer: 9581870938,-0.0383259,0.0574889,9.54316 -accelerometer: 9581890988,0.287445,-0.019163,9.65814 -accelerometer: 9581910916,-0.0383259,0.0383259,9.56232 -accelerometer: 9581930966,0.134141,-0.19163,9.48567 -accelerometer: 9581950772,0.114978,-4.86739,9.71563 -irProximity:9581961468,0.286275 -accelerometer: 9581970975,-0.0574889,-0.0383259,9.524 -accelerometer: 9581990750,0.019163,0.019163,9.58148 -accelerometer: 9582011075,0.0383259,0.019163,9.65814 -accelerometer: 9582032589,-0.153304,0.0958148,9.33237 -accelerometer: 9582050778,-0.0958148,0,9.8306 -accelerometer: 9582072598,-0.114978,-0.0383259,9.69646 -accelerometer: 9582090909,0,-0.0766519,9.54316 -accelerometer: 9582111172,0.0383259,-0.0766519,9.6773 -accelerometer: 9582130856,0.019163,0.0766519,9.58148 -accelerometer: 9582150937,-0.0766519,-0.019163,9.63897 -accelerometer: 9582170926,0.153304,-0.114978,9.81144 -accelerometer: 9582190823,0,0,9.524 -accelerometer: 9582210995,-0.114978,0.0958148,9.44734 -accelerometer: 9582230984,0.019163,0,9.75395 -accelerometer: 9582250973,-2.01211,3.21938,-11.1337 -accelerometer: 9582270810,0.0766519,-0.364096,10.7696 -accelerometer: 9582290829,0.32577,-0.5174,7.87598 -accelerometer: 9582311062,-0.114978,-0.32577,8.96827 -accelerometer: 9582331021,0.0574889,-0.172467,9.42818 -accelerometer: 9582350979,-0.172467,0.0383259,9.88809 -accelerometer: 9582370968,0.0958148,0.134141,9.8306 -accelerometer: 9582390988,-0.134141,0.0766519,9.35153 -accelerometer: 9582410946,-0.153304,4.84823,9.6773 -accelerometer: 9582430996,-0.0766519,-0.114978,9.17906 -accelerometer: 9582451108,0.153304,0,9.77311 -accelerometer: 9582470913,-0.114978,0,9.37069 -accelerometer: 9582490964,0.0958148,-0.0766519,9.84977 -accelerometer: 9582510922,-0.268282,-4.90572,9.38986 -accelerometer: 9582530789,0.0766519,-4.90572,9.65814 -accelerometer: 9582550992,-0.153304,0.019163,9.54316 -accelerometer: 9582570920,-4.88656,0.0383259,9.50483 -accelerometer: 9582590970,0,-0.019163,9.56232 -accelerometer: 9582610928,0.0958148,-0.172467,9.61981 -accelerometer: 9582630948,-0.019163,-0.134141,9.60065 -accelerometer: 9582650967,-0.229956,4.80991,9.44734 -accelerometer: 9582670895,0.229956,-4.84823,9.61981 -accelerometer: 9582690976,-0.19163,-0.0383259,9.46651 -accelerometer: 9582710965,0.0958148,0.019163,9.65814 -accelerometer: 9582730984,-0.134141,4.80991,9.42818 -accelerometer: 9582750912,0.114978,0.0574889,9.69646 -accelerometer: 9582770840,-0.0766519,-0.0574889,9.37069 -accelerometer: 9582790921,0,-0.0574889,9.75395 -accelerometer: 9582811001,-0.172467,4.88656,9.38986 -accelerometer: 9582830990,0.019163,-0.0383259,9.6773 -accelerometer: 9582850949,-0.19163,0.0383259,9.46651 -accelerometer: 9582870907,0.0383259,-0.019163,9.75395 -accelerometer: 9582890957,-0.0383259,0,9.50483 -accelerometer: 9582910946,0,-4.86739,9.63897 -accelerometer: 9582930935,0.0574889,0,9.71563 -accelerometer: 9582950955,-0.0574889,0.019163,9.58148 -accelerometer: 9582970913,-0.0766519,-0.0383259,9.71563 -accelerometer: 9582990750,0.153304,0.019163,9.46651 -accelerometer: 9583010830,-0.0958148,-0.019163,9.54316 -accelerometer: 9583031003,-0.0383259,-0.0766519,9.54316 -accelerometer: 9583050870,-0.114978,0.0574889,9.6773 -accelerometer: 9583070736,-0.0574889,0.0766519,9.61981 -accelerometer: 9583090939,-0.0383259,0.019163,9.56232 -accelerometer: 9583111325,0,0.0766519,9.56232 -accelerometer: 9583130887,-0.0383259,-0.0383259,9.61981 -accelerometer: 9583150967,0.114978,-0.019163,9.524 -accelerometer: 9583170895,0.0574889,-0.0383259,9.48567 -accelerometer: 9583190762,-0.0574889,-0.0383259,9.40902 -accelerometer: 9583210934,0.0958148,0.019163,9.61981 -accelerometer: 9583230923,0.210793,-0.019163,9.63897 -accelerometer: 9583250943,-0.019163,-0.0574889,9.56232 -accelerometer: 9583271054,-0.0574889,0.0383259,9.37069 -accelerometer: 9583290768,0.0958148,-0.0958148,9.8306 -accelerometer: 9583310788,-0.249119,4.86739,9.79228 -accelerometer: 9583330746,0.0574889,-0.19163,9.58148 -accelerometer: 9583350796,0,-0.172467,9.40902 -accelerometer: 9583371060,-0.249119,0,9.6773 -accelerometer: 9583390957,-0.019163,-4.82907,9.50483 -accelerometer: 9583410916,0.172467,-0.114978,9.73479 -accelerometer: 9583430966,-0.249119,0.019163,9.63897 -accelerometer: 9583450955,-0.19163,0.153304,9.56232 -irProximity:9583472851,0.282353 -accelerometer: 9583471188,-0.268282,0.114978,9.60065 -accelerometer: 9583490964,0.172467,0.0766519,9.56232 -accelerometer: 9583510953,-0.114978,0,9.73479 -accelerometer: 9583530606,-0.019163,-0.0574889,9.65814 -accelerometer: 9583550656,-0.0958148,-0.019163,9.50483 -accelerometer: 9583570767,-0.249119,0.0958148,9.35153 -irProximity:9583573589,0.286275 -accelerometer: 9583590817,-0.268282,0.0383259,9.63897 -accelerometer: 9583610806,-0.153304,-0.0383259,9.63897 -accelerometer: 9583630795,0.019163,0.0958148,9.98391 -accelerometer: 9583650815,0.32577,-0.306608,8.98743 -accelerometer: 9583670865,-0.268282,0.249119,9.96474 -accelerometer: 9583691006,0.344933,-0.153304,9.56232 -accelerometer: 9583710934,-0.306608,4.82907,9.58148 -accelerometer: 9583730923,0.249119,-0.19163,9.77311 -accelerometer: 9583750973,-0.153304,-0.0383259,9.33237 -accelerometer: 9583770749,0.498237,-0.0958148,10.0606 -accelerometer: 9583790921,-0.0958148,4.86739,9.42818 -accelerometer: 9583810940,0.383259,0.019163,9.94558 -accelerometer: 9583830899,-0.210793,0.114978,9.44734 -accelerometer: 9583851040,0.210793,-4.82907,9.69646 -accelerometer: 9583870968,-0.134141,-0.0958148,9.40902 -accelerometer: 9583890988,-0.0383259,0,9.6773 -accelerometer: 9583910946,0.0383259,0.153304,9.42818 -accelerometer: 9583930966,0.0958148,-0.153304,9.77311 -accelerometer: 9583950985,0.114978,-0.0766519,9.56232 -accelerometer: 9583970791,-0.019163,-0.0958148,9.48567 -accelerometer: 9583990750,0.153304,0.172467,24.7777 -accelerometer: 9584010922,-0.019163,-0.574889,7.58854 -accelerometer: 9584030819,-0.134141,0.19163,10.348 -accelerometer: 9584050778,-0.0574889,0.287445,10.3863 -accelerometer: 9584070798,-0.0958148,-0.0383259,9.63897 -accelerometer: 9584091000,0,-0.172467,9.46651 -accelerometer: 9584111111,-0.114978,-0.114978,9.25571 -accelerometer: 9584130978,0,-0.19163,9.69646 -accelerometer: 9584150998,-0.574889,0.632378,9.58148 -accelerometer: 9584170834,-0.0574889,0.134141,9.73479 -accelerometer: 9584190884,-0.153304,-0.114978,9.33237 -accelerometer: 9584210965,0.172467,0.134141,9.92642 -accelerometer: 9584230984,-0.229956,-0.114978,9.35153 -accelerometer: 9584250973,-0.0574889,0.0383259,9.73479 -accelerometer: 9584270779,-0.019163,-0.0574889,9.56232 -accelerometer: 9584290921,0.0958148,4.69493,9.54316 -accelerometer: 9584311001,-0.114978,-0.172467,9.50483 -accelerometer: 9584330960,0.153304,0.114978,9.63897 -accelerometer: 9584350949,0.0574889,0.0958148,9.42818 -accelerometer: 9584370816,0.0766519,0.172467,9.73479 -accelerometer: 9584390927,-0.134141,-0.019163,9.65814 -accelerometer: 9584410916,-0.0383259,0,9.48567 -accelerometer: 9584430966,0.114978,0,9.54316 -accelerometer: 9584450924,0,4.82907,9.524 -accelerometer: 9584470791,0.0574889,-0.0383259,9.54316 -accelerometer: 9584490964,-0.0766519,0.0574889,9.46651 -accelerometer: 9584510922,0.134141,0.364096,32.6345 -accelerometer: 9584530881,-0.5174,-0.32577,6.55374 -accelerometer: 9584550778,1.7055,0.70903,8.83413 -accelerometer: 9584570767,0.153304,0.134141,10.4247 -accelerometer: 9584590817,0,0.134141,10.0222 -tap:9584605938,1 -accelerometer: 9584610837,-0.172467,0.0766519,9.42818 -accelerometer: 9584630765,-0.172467,-0.0766519,9.25571 -accelerometer: 9584650937,0.019163,-0.0766519,9.61981 -accelerometer: 9584670926,-0.402422,0.229956,9.19823 -accelerometer: 9584691037,0.0958148,4.88656,9.61981 -accelerometer: 9584711026,0.019163,-0.172467,9.6773 -accelerometer: 9584730954,-0.287445,-0.0383259,9.38986 -accelerometer: 9584750973,0.383259,-0.114978,9.71563 -accelerometer: 9584770962,-0.0958148,-0.0574889,9.524 -accelerometer: 9584790951,0.019163,0.268282,9.75395 -accelerometer: 9584811001,0.0958148,-0.0383259,9.73479 -accelerometer: 9584830990,-0.268282,-0.134141,9.48567 -accelerometer: 9584850949,0.0766519,0.153304,9.75395 -accelerometer: 9584870999,0.019163,0.0383259,9.81144 -accelerometer: 9584890927,-0.0766519,0.0766519,9.44734 -accelerometer: 9584910916,-0.0574889,0.019163,9.50483 -accelerometer: 9584930966,0.0766519,-4.90572,9.61981 -accelerometer: 9584950802,-0.0574889,0.0383259,9.38986 -accelerometer: 9584970974,-0.0383259,-0.0766519,9.54316 -accelerometer: 9584990750,0.0574889,-0.114978,9.60065 -accelerometer: 9585010830,-0.019163,0.019163,9.6773 -accelerometer: 9585031003,-0.019163,0,9.61981 -accelerometer: 9585050961,-0.0766519,-0.0958148,9.65814 -accelerometer: 9585070950,-0.0383259,0.0766519,9.60065 -accelerometer: 9585090939,-0.019163,0.019163,9.54316 -accelerometer: 9585110989,0.172467,-0.0766519,9.73479 -accelerometer: 9585130948,-0.0383259,-0.019163,9.48567 -accelerometer: 9585150998,0.0574889,-0.0574889,9.58148 -accelerometer: 9585170956,-0.0383259,-0.114978,9.65814 -accelerometer: 9585190854,-0.287445,-0.0958148,9.54316 -accelerometer: 9585210965,-0.134141,0,9.50483 -accelerometer: 9585230954,-0.0766519,0.134141,9.61981 -accelerometer: 9585250973,-0.0766519,4.88656,9.60065 -accelerometer: 9585270962,-0.0958148,4.88656,9.56232 -accelerometer: 9585290921,-0.019163,0.0383259,9.524 -accelerometer: 9585310940,0.19163,0.0383259,9.8306 -accelerometer: 9585330990,0.0766519,-0.114978,9.54316 -accelerometer: 9585350827,-0.32577,4.86739,9.25571 -accelerometer: 9585370938,0.498237,-0.019163,9.86893 -accelerometer: 9585390927,0.747356,-0.229956,9.46651 -accelerometer: 9585410916,0.0574889,0.0383259,9.63897 -accelerometer: 9585430905,-1.34141,0.0958148,9.48567 -accelerometer: 9585450894,-0.421585,0.114978,9.58148 -accelerometer: 9585470791,-0.651541,-0.0958148,9.35153 -accelerometer: 9585490841,-0.843171,0.019163,9.44734 -accelerometer: 9585510922,-0.632378,0.114978,10.0989 -accelerometer: 9585531094,-0.5174,-0.114978,9.42818 -accelerometer: 9585550961,0.172467,-0.364096,9.29404 -accelerometer: 9585570981,0.0958148,-0.670704,9.27488 -accelerometer: 9585590909,-0.689867,-0.804845,9.38986 -accelerometer: 9585610928,-0.402422,-0.440748,10.0414 -accelerometer: 9585630978,0.574889,0.0383259,9.61981 -accelerometer: 9585650967,1.24559,0.5174,9.48567 -accelerometer: 9585670956,0.632378,0.0766519,9.88809 -accelerometer: 9585690945,1.85881,-0.114978,9.40902 -accelerometer: 9585710965,0.747356,0.19163,10.7121 -accelerometer: 9585730954,2.08876,-0.287445,10.3097 -accelerometer: 9585751004,2.10793,0.172467,9.44734 -accelerometer: 9585770962,0.938986,-0.306608,9.81144 -accelerometer: 9585791073,0.210793,0.249119,9.08325 -accelerometer: 9585810971,0.268282,-1.47555,10.118 -accelerometer: 9585830990,0.747356,-0.440748,8.60417 -accelerometer: 9585850796,1.76299,-0.0958148,9.27488 -accelerometer: 9585871060,1.59053,-0.402422,9.37069 -irProximity:9585892437,0.290196 -accelerometer: 9585890927,2.26123,-0.421585,8.96827 -accelerometer: 9585910916,3.14273,-0.421585,7.49272 -accelerometer: 9585930935,3.29603,-1.3989,9.38986 -accelerometer: 9585950955,2.51035,-0.421585,8.62334 -accelerometer: 9585970944,2.68282,-0.651541,9.27488 -accelerometer: 9585990933,2.2229,-0.210793,9.6773 -irProximity:9585994305,0.301961 -accelerometer: 9586010861,2.68282,-1.11145,9.65814 -accelerometer: 9586031003,2.45286,-1.05396,9.524 -accelerometer: 9586050686,1.57136,-1.13062,9.92642 -accelerometer: 9586070889,0.594052,-0.402422,10.0989 -accelerometer: 9586090848,0.19163,0.019163,9.79228 -irProximity:9586095287,0.337255 -accelerometer: 9586111111,4.82907,-0.134141,9.96474 -accelerometer: 9586130917,-0.440748,-0.249119,10.8462 -proximity:9586144406,1 -accelerometer: 9586150937,-0.172467,-1.0348,10.233 -accelerometer: 9586170804,-0.498237,-0.651541,8.45087 -accelerometer: 9586190793,1.76299,0.287445,18.1473 -irProximity:9586196209,0.498039 -accelerometer: 9586210965,1.05396,-0.229956,14.1806 -accelerometer: 9586230954,1.07313,0.134141,8.24008 -accelerometer: 9586250943,0.804845,-0.0574889,9.33237 -accelerometer: 9586270962,-0.421585,-0.0574889,8.69999 -accelerometer: 9586290951,0.402422,0.268282,10.5396 -accelerometer: 9586310971,0.0383259,0,9.44734 -accelerometer: 9586330929,-0.0958148,0.172467,9.54316 -accelerometer: 9586350949,0.229956,-0.0766519,9.73479 -accelerometer: 9586370938,-0.344933,0.0383259,9.06409 -accelerometer: 9586390774,-0.0383259,0.019163,9.40902 -irProximity:9586397228,0.482353 -accelerometer: 9586410916,-0.153304,0.0766519,9.73479 -accelerometer: 9586430905,-0.19163,-0.0574889,9.37069 -accelerometer: 9586450924,0.019163,0.19163,9.46651 -accelerometer: 9586470975,-0.0958148,0.114978,9.75395 -accelerometer: 9586490933,-0.0574889,0,9.524 -accelerometer: 9586511380,-0.134141,0.0766519,9.46651 -accelerometer: 9586531003,-0.019163,0.114978,9.48567 -accelerometer: 9586551022,0.0766519,-4.90572,9.71563 -accelerometer: 9586570889,0.19163,-4.79074,9.60065 -accelerometer: 9586590787,0.114978,-0.0766519,9.44734 -irProximity:9586598125,0.509804 -accelerometer: 9586611081,-0.134141,0.172467,9.75395 -accelerometer: 9586630978,-0.19163,0.249119,9.56232 -accelerometer: 9586650937,-0.0383259,0.0383259,9.71563 -accelerometer: 9586670926,-0.268282,0.268282,9.61981 -accelerometer: 9586690976,-0.019163,-0.0383259,9.42818 -accelerometer: 9586710965,0.153304,0.019163,9.524 -accelerometer: 9586730954,0,0.19163,9.50483 -accelerometer: 9586750943,0.0574889,0.19163,9.56232 -accelerometer: 9586770932,-0.0766519,0.0574889,9.44734 -accelerometer: 9586790860,0.268282,-0.0766519,9.524 -irProximity:9586799084,0.505882 -accelerometer: 9586811032,-0.421585,0.19163,9.33237 -accelerometer: 9586831021,0.0766519,0.114978,9.50483 -accelerometer: 9586850552,-0.0574889,-0.0958148,9.54316 -accelerometer: 9586870602,-0.0958148,0.019163,9.81144 -accelerometer: 9586890805,0.114978,0.0958148,9.524 -accelerometer: 9586910763,-0.210793,0.268282,9.6773 -accelerometer: 9586930783,0.019163,0.0958148,9.63897 -accelerometer: 9586950802,-0.019163,0,9.61981 -accelerometer: 9586970883,0.153304,-0.0958148,9.6773 -accelerometer: 9586990628,-0.210793,0.0383259,9.50483 -irProximity:9586999859,0.501961 -accelerometer: 9587010769,0,0.0574889,9.71563 -accelerometer: 9587030575,-0.402422,0.0574889,9.56232 -accelerometer: 9587051022,1.01564,-0.670704,9.38986 -accelerometer: 9587071042,-0.689867,0.421585,9.98391 -accelerometer: 9587090878,-0.785682,0.364096,9.3132 -accelerometer: 9587110959,0.0574889,-0.0766519,9.56232 -accelerometer: 9587130948,0.0383259,-0.0766519,9.524 -accelerometer: 9587150967,-0.0574889,0.0766519,9.46651 -accelerometer: 9587170926,-0.0574889,0,9.73479 -accelerometer: 9587190793,-0.0383259,0.134141,9.50483 -irProximity:9587200909,0.494118 -accelerometer: 9587210965,0,0.0958148,9.71563 -accelerometer: 9587230984,0.114978,0.153304,9.61981 -accelerometer: 9587250943,0.172467,0.0574889,9.61981 -accelerometer: 9587270932,-0.019163,-0.019163,9.56232 -accelerometer: 9587290921,0.153304,-0.172467,9.61981 -accelerometer: 9587310971,-0.134141,0.0958148,9.65814 -accelerometer: 9587330990,-0.0766519,0.0383259,9.48567 -accelerometer: 9587350918,0.019163,0.019163,9.48567 -accelerometer: 9587370968,0.019163,0,9.40902 -accelerometer: 9587390835,0.268282,0.019163,9.73479 -irProximity:9587401775,0.486275 -accelerometer: 9587410916,0.0958148,0.0383259,9.58148 -accelerometer: 9587430935,-0.268282,4.79074,9.48567 -accelerometer: 9587450894,0.019163,0.114978,9.81144 -accelerometer: 9587470913,-0.0958148,0.0383259,9.37069 -accelerometer: 9587490750,0.249119,0.114978,9.6773 -accelerometer: 9587510922,0.0383259,4.88656,9.54316 -accelerometer: 9587531003,0,-0.229956,9.37069 -accelerometer: 9587550992,0.0766519,-0.0766519,9.524 -accelerometer: 9587570950,0,0.153304,9.69646 -accelerometer: 9587591000,-0.249119,4.77158,9.75395 -irProximity:9587602825,0.490196 -accelerometer: 9587610959,-0.0766519,0.153304,9.48567 -accelerometer: 9587630948,0,-0.134141,9.46651 -accelerometer: 9587650784,-0.0574889,0.0766519,9.58148 -accelerometer: 9587670804,-0.134141,0.172467,9.73479 -accelerometer: 9587690976,-0.0766519,-4.77158,9.38986 -accelerometer: 9587711087,-0.019163,-0.134141,9.63897 -accelerometer: 9587730954,0.019163,0.019163,9.48567 -accelerometer: 9587751004,4.75242,-0.0574889,9.54316 -accelerometer: 9587770962,-0.210793,4.88656,9.54316 -accelerometer: 9587790982,-0.019163,0.0958148,9.58148 -irProximity:9587803539,0.486275 -accelerometer: 9587811032,-0.019163,0.0574889,9.6773 -accelerometer: 9587830807,-0.0766519,-0.0958148,9.60065 -accelerometer: 9587850522,-0.229956,-0.019163,9.94558 -accelerometer: 9587870602,-0.172467,-0.114978,9.38986 -accelerometer: 9587890896,0.0958148,0.172467,9.84977 -accelerometer: 9587910916,-0.114978,-0.0766519,9.54316 -accelerometer: 9587930966,-0.019163,4.79074,9.79228 -accelerometer: 9587950924,0.0958148,0.0958148,9.56232 -accelerometer: 9587971005,0.0574889,0.019163,9.63897 -accelerometer: 9587991208,0.0574889,0.172467,9.35153 -accelerometer: 9588010769,0.153304,0.019163,9.77311 -accelerometer: 9588031003,0,0.0574889,9.60065 -accelerometer: 9588051022,0.019163,0.019163,9.48567 -accelerometer: 9588071011,0.019163,-0.114978,9.54316 -accelerometer: 9588091000,0.210793,4.80991,9.69646 -accelerometer: 9588110898,0.019163,0.134141,9.65814 -accelerometer: 9588130917,0.0383259,0.153304,9.8306 -accelerometer: 9588150815,0,-0.114978,9.54316 -accelerometer: 9588170956,0.0383259,0.0383259,9.46651 -accelerometer: 9588190915,-0.0383259,0.114978,9.50483 -accelerometer: 9588211056,0.0574889,-0.19163,9.50483 -accelerometer: 9588230893,0.0383259,0.114978,9.60065 -accelerometer: 9588250943,0.210793,-0.114978,9.60065 -accelerometer: 9588271054,0.172467,-0.0574889,9.54316 -accelerometer: 9588290921,-0.0383259,0.0766519,9.71563 -accelerometer: 9588311062,4.73325,-0.249119,10.8462 -accelerometer: 9588330899,-0.479074,0.364096,9.06409 -accelerometer: 9588350918,-0.210793,-0.114978,9.61981 -accelerometer: 9588370938,-0.402422,0.249119,9.50483 -accelerometer: 9588390927,-1.41806,-0.268282,9.29404 -irProximity:9588405773,0.490196 -accelerometer: 9588410916,0.459911,-0.287445,9.86893 -accelerometer: 9588430874,1.26476,0.70903,9.65814 -accelerometer: 9588450894,-0.862334,0.249119,8.22091 -accelerometer: 9588470669,-0.402422,0.134141,8.66166 -accelerometer: 9588490780,-0.306608,0.268282,9.21739 -accelerometer: 9588510891,-0.287445,0.0574889,8.92994 -accelerometer: 9588531125,-0.153304,0.0383259,9.35153 -accelerometer: 9588550747,-0.0958148,-0.114978,9.50483 -accelerometer: 9588570828,0.383259,-0.0574889,9.73479 -accelerometer: 9588590787,-0.613215,-0.977311,9.21739 -irProximity:9588606304,0.482353 -accelerometer: 9588610898,0.785682,-0.172467,14.3339 -accelerometer: 9588630917,5.03986,0.996474,4.27334 -accelerometer: 9588650631,0.229956,0.70903,12.8392 -accelerometer: 9588670865,-1.14978,-0.459911,8.81497 -accelerometer: 9588690945,-0.670704,0.421585,9.60065 -accelerometer: 9588710995,0,-0.153304,9.58148 -accelerometer: 9588731198,-0.019163,0.249119,9.48567 -accelerometer: 9588750912,-0.019163,-0.114978,9.61981 -accelerometer: 9588770993,0,0,9.56232 -accelerometer: 9588791104,0.0766519,0.0766519,9.6773 -irProximity:9588807232,0.478431 -accelerometer: 9588810818,0,-0.0574889,9.50483 -accelerometer: 9588830899,0.210793,-0.114978,9.524 -accelerometer: 9588850979,-0.0958148,4.84823,9.524 -accelerometer: 9588871029,0.0383259,-0.0574889,9.61981 -accelerometer: 9588891079,-0.114978,0.0958148,9.48567 -accelerometer: 9588913052,-0.0766519,-0.134141,9.524 -accelerometer: 9588930661,-0.019163,0.0574889,9.60065 -accelerometer: 9588950619,0.114978,0.306608,9.71563 -accelerometer: 9588970791,0.785682,0.402422,9.65814 -accelerometer: 9588991360,1.05396,0.402422,9.3132 diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_pickup.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_pickup.dat deleted file mode 100644 index 51cd0f3a..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_pickup.dat +++ /dev/null @@ -1,187 +0,0 @@ -irProximity:11429762653,0.290196 -orientation:11415310938,5 -accelerometer: 11429814295,-0.306608,-0.114978,9.92642 -accelerometer: 11429831079,-0.153304,-0.134141,10.0797 -accelerometer: 11429850794,-0.383259,0.0574889,10.0031 -irProximity:11429863544,0.294118 -accelerometer: 11429870538,-0.268282,-4.80991,9.61981 -proximity:11429874133,0 -accelerometer: 11429890802,-0.32577,0.172467,9.58148 -accelerometer: 11429910852,-0.536563,0.249119,9.42818 -accelerometer: 11429930811,-0.574889,0.364096,9.25571 -accelerometer: 11429950830,-0.421585,0.306608,9.40902 -accelerometer: 11429970819,-0.555726,0.268282,9.56232 -accelerometer: 11429990808,-0.459911,0.153304,9.6773 -accelerometer: 11430010797,-0.536563,0.0958148,9.63897 -accelerometer: 11430030786,-0.383259,0.0766519,9.92642 -accelerometer: 11430050836,-0.440748,0.0766519,9.54316 -accelerometer: 11430070795,-0.383259,0.153304,9.44734 -accelerometer: 11430090814,-0.479074,0.268282,9.524 -accelerometer: 11430110803,-0.19163,0.249119,9.40902 -accelerometer: 11430130823,-0.459911,0.153304,9.38986 -accelerometer: 11430150781,-0.421585,0.0958148,9.42818 -irProximity:11430166370,0.290196 -accelerometer: 11430170892,-0.651541,0.402422,9.79228 -accelerometer: 11430190820,-0.32577,0.210793,9.61981 -accelerometer: 11430210809,-0.613215,0.153304,9.61981 -accelerometer: 11430230798,-0.689867,0.421585,9.58148 -accelerometer: 11430251001,-0.421585,0.172467,9.56232 -irProximity:11430267139,0.294118 -accelerometer: 11430270990,-0.459911,0.0766519,9.42818 -accelerometer: 11430291010,-0.268282,0.114978,9.63897 -accelerometer: 11430310968,-0.459911,0.229956,9.48567 -accelerometer: 11430330957,-0.5174,0.0766519,9.44734 -accelerometer: 11430350916,-0.32577,0.0958148,9.60065 -accelerometer: 11430370905,-0.306608,0.383259,9.65814 -accelerometer: 11430390924,-0.5174,0.134141,9.60065 -accelerometer: 11430411066,-0.574889,0.421585,9.50483 -accelerometer: 11430430933,-0.344933,0.134141,9.50483 -accelerometer: 11430450952,-0.479074,0.19163,9.6773 -accelerometer: 11430470789,-0.249119,0.364096,9.58148 -accelerometer: 11430490900,-0.479074,0.229956,9.25571 -accelerometer: 11430510919,-0.594052,0.19163,9.38986 -accelerometer: 11430530939,-0.19163,0.0766519,9.25571 -accelerometer: 11430550958,-0.0958148,0.153304,9.79228 -accelerometer: 11430570947,0.210793,0.114978,9.81144 -accelerometer: 11430590967,0.594052,0.5174,9.12157 -accelerometer: 11430610895,-0.747356,0.90066,9.44734 -accelerometer: 11430630975,-1.80132,1.28392,9.44734 -accelerometer: 11430650934,-2.39537,2.0696,9.75395 -accelerometer: 11430670923,-3.29603,2.89361,11.1528 -accelerometer: 11430690942,-3.67929,2.85528,10.7313 -accelerometer: 11430710931,-2.9511,2.66365,10.4438 -accelerometer: 11430730920,-1.37973,0.977311,10.0797 -accelerometer: 11430750971,-0.344933,-0.440748,9.06409 -irProximity:11430770831,0.290196 -accelerometer: 11430774683,-0.172467,-1.24559,9.84977 -accelerometer: 11430790735,0.019163,-1.09229,8.69999 -accelerometer: 11430810846,-2.52951,0.306608,9.6773 -accelerometer: 11430830805,-3.89008,1.34141,13.7207 -accelerometer: 11430850794,0.0958148,1.85881,12.5901 -accelerometer: 11430870966,-2.39537,2.18458,12.1876 -accelerometer: 11430890772,-1.89713,0,12.8775 -accelerometer: 11430910822,-0.5174,0.172467,12.7625 -accelerometer: 11430930902,-0.651541,0.440748,11.3828 -accelerometer: 11430950922,-0.287445,1.60969,10.4438 -accelerometer: 11430970636,0.555726,1.80132,9.10241 -irProximity:11430972125,0.294118 -accelerometer: 11430990778,-0.440748,2.9511,5.57642 -accelerometer: 11431010828,-1.30308,4.36916,3.21938 -accelerometer: 11431030969,-0.249119,5.82554,3.66013 -orientation:11431030969,1 -accelerometer: 11431050653,0.019163,6.28545,3.08524 -accelerometer: 11431070734,0.344933,7.16695,3.50682 -accelerometer: 11431090936,0.728193,7.07114,4.23502 -accelerometer: 11431110956,0.306608,6.82202,3.75594 -accelerometer: 11431130945,0.268282,7.03281,4.59911 -accelerometer: 11431150964,-0.0574889,6.89867,5.34647 -accelerometer: 11431170770,0.019163,7.20528,5.55726 -accelerometer: 11431190912,-0.479074,7.10946,5.61475 -accelerometer: 11431210931,-0.632378,7.33942,5.97885 -accelerometer: 11431230951,-0.594052,7.51188,6.17048 -accelerometer: 11431251001,-0.344933,7.33942,6.38127 -accelerometer: 11431270776,-0.555726,7.64602,6.43876 -accelerometer: 11431290888,-0.306608,7.49272,6.74537 -accelerometer: 11431310877,-0.114978,7.58854,6.40043 -accelerometer: 11431330927,-0.0958148,7.51188,6.30462 -accelerometer: 11431350733,-0.210793,7.33942,6.07466 -accelerometer: 11431370752,-0.19163,7.33942,5.95968 -accelerometer: 11431390894,-0.268282,7.47356,6.07466 -accelerometer: 11431410944,-0.287445,7.32025,5.99801 -accelerometer: 11431430933,-0.229956,7.39691,6.07466 -accelerometer: 11431450922,-0.153304,7.18611,6.24713 -accelerometer: 11431470758,-0.19163,7.20528,6.07466 -accelerometer: 11431490900,-0.229956,7.51188,6.34294 -accelerometer: 11431510950,-0.210793,7.2436,6.22797 -accelerometer: 11431531000,-0.383259,7.35858,6.40043 -accelerometer: 11431550989,-0.402422,7.33942,6.63039 -accelerometer: 11431570764,-0.459911,7.55021,6.38127 -accelerometer: 11431590906,-0.383259,7.53105,6.36211 -accelerometer: 11431610986,-0.210793,7.28193,6.76453 -accelerometer: 11431631006,-0.172467,7.26277,6.61122 -accelerometer: 11431651025,-0.19163,7.10946,6.53457 -accelerometer: 11431670801,-0.134141,7.10946,6.47708 -accelerometer: 11431690973,-0.134141,7.03281,6.63039 -accelerometer: 11431710993,-0.210793,7.12862,6.36211 -accelerometer: 11431730920,-0.210793,7.12862,6.59206 -accelerometer: 11431754114,-0.229956,7.26277,6.5729 -accelerometer: 11431775476,-0.172467,7.20528,6.5729 -accelerometer: 11431790796,-0.153304,7.05197,6.34294 -accelerometer: 11431810816,-0.019163,7.28193,6.45792 -accelerometer: 11431830774,-0.229956,7.0903,6.34294 -accelerometer: 11431850824,-0.229956,7.12862,6.47708 -accelerometer: 11431870813,-0.0383259,7.0903,6.49625 -accelerometer: 11431890772,-0.229956,7.07114,6.38127 -accelerometer: 11431910822,-0.306608,7.32025,6.45792 -accelerometer: 11431930933,-0.0766519,7.28193,6.49625 -accelerometer: 11431950952,-0.153304,7.20528,6.61122 -accelerometer: 11431970819,-0.114978,7.16695,6.53457 -accelerometer: 11431990808,-0.19163,7.07114,6.49625 -accelerometer: 11432010950,-0.0766519,7.16695,6.59206 -accelerometer: 11432030939,-0.229956,7.03281,6.51541 -accelerometer: 11432050958,-0.287445,7.0903,6.49625 -accelerometer: 11432070795,-0.114978,7.01365,6.53457 -accelerometer: 11432090906,-0.134141,7.12862,6.43876 -accelerometer: 11432110956,-0.249119,7.01365,6.2088 -accelerometer: 11432130945,-0.210793,7.0903,6.64955 -accelerometer: 11432150995,-0.210793,6.84118,6.66871 -accelerometer: 11432170892,-0.0766519,6.95616,6.937 -accelerometer: 11432190942,-0.134141,7.03281,6.7262 -accelerometer: 11432210962,-0.344933,6.82202,6.55374 -accelerometer: 11432230798,-0.268282,7.01365,6.38127 -accelerometer: 11432250971,-0.421585,6.78369,6.51541 -accelerometer: 11432270960,0.114978,6.15131,6.70704 -accelerometer: 11432290918,-0.19163,6.40043,6.7262 -accelerometer: 11432310938,-0.364096,6.13215,6.80285 -accelerometer: 11432330957,0.114978,6.34294,7.05197 -accelerometer: 11432350916,0.344933,6.0555,7.41607 -orientation:11432350916,5 -accelerometer: 11432371027,0.0958148,5.78722,7.6077 -accelerometer: 11432390863,-0.153304,5.26982,7.79933 -accelerometer: 11432410913,0.134141,5.40396,8.01012 -accelerometer: 11432430963,0.114978,5.5381,7.85682 -accelerometer: 11432450922,-0.0766519,5.28898,7.79933 -accelerometer: 11432470819,0,4.96321,7.6077 -accelerometer: 11432490900,-0.019163,4.82907,7.83765 -accelerometer: 11432510950,-0.0766519,4.15836,7.89514 -accelerometer: 11432530939,0.32577,3.2577,7.95263 -accelerometer: 11432550928,0.172467,3.85176,7.68435 -accelerometer: 11432570917,-0.402422,2.87445,7.18611 -accelerometer: 11432590875,0.019163,1.93546,6.99448 -accelerometer: 11432610986,0.632378,1.41806,8.50836 -accelerometer: 11432630975,0.440748,1.01564,10.7504 -accelerometer: 11432650995,-0.134141,1.20727,10.5588 -accelerometer: 11432670953,-0.536563,1.3989,9.61981 -accelerometer: 11432690942,-0.459911,1.26476,9.54316 -accelerometer: 11432710962,-0.019163,1.32224,10.1947 -accelerometer: 11432730951,0.210793,1.22643,10.5588 -accelerometer: 11432750971,0.728193,0.536563,10.0031 -accelerometer: 11432774439,0.287445,0.651541,10.9421 -irProximity:11432786975,0.290196 -accelerometer: 11432790796,0.249119,0.172467,10.5396 -accelerometer: 11432810816,-0.0383259,0.32577,11.0379 -accelerometer: 11432830835,-0.229956,0.249119,10.5396 -accelerometer: 11432850763,-0.114978,-0.498237,10.0031 -accelerometer: 11432870813,-0.32577,0,10.0222 -accelerometer: 11432890802,-0.364096,4.84823,10.0031 -accelerometer: 11432910822,-0.306608,-0.402422,10.1372 -accelerometer: 11432930933,0.383259,-0.594052,10.0606 -accelerometer: 11432950952,0.32577,-0.689867,9.77311 -accelerometer: 11432970911,0.0574889,-0.459911,5.09735 -accelerometer: 11432990747,0.153304,-0.70903,9.75395 -accelerometer: 11433010858,0.306608,-0.804845,9.71563 -accelerometer: 11433030939,-0.153304,-0.824008,9.61981 -accelerometer: 11433050928,0.249119,-0.785682,9.50483 -accelerometer: 11433070947,0.134141,-1.01564,9.73479 -accelerometer: 11433090906,0.0766519,-0.804845,9.50483 -accelerometer: 11433110986,0.134141,-1.0348,9.61981 -accelerometer: 11433130975,0.0958148,-0.785682,8.75748 -accelerometer: 11433150995,-0.0766519,-0.766519,10.0222 -accelerometer: 11433170953,-0.0958148,-0.344933,10.0222 -accelerometer: 11433191004,-0.0574889,-0.498237,9.8306 -accelerometer: 11433210596,-0.153304,-0.862334,9.86893 -accelerometer: 11433230676,-0.268282,-0.824008,9.63897 -accelerometer: 11433250635,-0.172467,-0.728193,9.6773 -accelerometer: 11433270807,0.0383259,-1.11145,9.48567 -accelerometer: 11433290735,-0.210793,-0.632378,9.524 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_shake2.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_shake2.dat deleted file mode 100644 index 043eb3b7..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_shake2.dat +++ /dev/null @@ -1,195 +0,0 @@ -accelerometer: 11433310724,0.172467,-0.536563,9.60065 -orientation:11432350916,5 -accelerometer: 11433410822,0.249119,-0.459911,9.65814 -accelerometer: 11433430963,0.0766519,-0.440748,9.48567 -accelerometer: 11433450800,-0.019163,-0.364096,9.54316 -irProximity:11433458636,0.290196 -proximity:11433464374,0 -accelerometer: 11433470880,-0.0574889,-0.594052,9.56232 -accelerometer: 11433490930,-0.0383259,-0.689867,9.58148 -accelerometer: 11433510950,-4.84823,-0.651541,9.54316 -accelerometer: 11433530939,-0.0574889,-0.5174,9.50483 -accelerometer: 11433550928,0.0574889,-0.32577,9.65814 -irProximity:11433564960,0.294118 -accelerometer: 11433570917,-0.172467,-0.632378,9.54316 -accelerometer: 11433590997,-0.249119,-0.459911,9.6773 -accelerometer: 11433610956,-0.134141,-0.5174,14.4872 -accelerometer: 11433631006,0.019163,-0.574889,9.65814 -accelerometer: 11433650964,0.19163,-0.555726,9.73479 -irProximity:11433665851,0.290196 -accelerometer: 11433670801,0.0383259,-0.574889,9.3132 -accelerometer: 11433690973,-0.153304,-0.555726,9.35153 -accelerometer: 11433710993,-0.114978,-0.383259,9.61981 -accelerometer: 11433730951,0.153304,-0.402422,9.54316 -accelerometer: 11433750971,0.0574889,-0.498237,9.37069 -accelerometer: 11433772974,-0.114978,-0.479074,9.71563 -accelerometer: 11433790674,-0.0574889,-0.421585,9.524 -accelerometer: 11433810816,-0.0574889,-0.440748,9.524 -accelerometer: 11433830805,0.0766519,-0.498237,9.60065 -accelerometer: 11433850794,0.0766519,-0.479074,9.524 -accelerometer: 11433870722,0.19163,-0.632378,9.44734 -accelerometer: 11433890802,0.287445,-0.498237,9.6773 -accelerometer: 11433910822,0.0574889,-0.229956,9.42818 -accelerometer: 11433930963,0,-0.440748,9.42818 -accelerometer: 11433950952,0.114978,-0.574889,9.50483 -irProximity:11433968219,0.294118 -accelerometer: 11433970819,-0.0383259,-0.594052,9.524 -accelerometer: 11433990778,-0.0958148,-0.459911,9.54316 -accelerometer: 11434010706,0,-0.555726,9.86893 -accelerometer: 11434030908,-0.0383259,-0.364096,9.61981 -accelerometer: 11434050958,-0.0958148,-0.421585,9.61981 -irProximity:11434068988,0.290196 -accelerometer: 11434070947,0.229956,-0.306608,9.56232 -accelerometer: 11434090936,0.114978,-0.306608,9.46651 -accelerometer: 11434110925,-0.421585,-0.651541,9.46651 -accelerometer: 11434130945,0.306608,-0.402422,9.524 -accelerometer: 11434150995,0.919823,-0.440748,9.75395 -accelerometer: 11434170740,0.134141,-0.32577,9.69646 -accelerometer: 11434191004,0.153304,-0.0958148,9.71563 -accelerometer: 11434210962,0.479074,-0.268282,9.98391 -accelerometer: 11434230982,0.344933,-0.0958148,9.81144 -accelerometer: 11434250910,0.555726,-0.0958148,9.46651 -accelerometer: 11434271051,0.114978,0.651541,9.92642 -accelerometer: 11434290949,-0.919823,0.536563,9.3132 -accelerometer: 11434310968,-4.36916,4.54162,10.8846 -accelerometer: 11434330927,-3.4685,6.7262,9.86893 -accelerometer: 11434350946,-4.56079,2.64449,13.7207 -irProximity:11434370898,0.294118 -accelerometer: 11434370783,-2.93193,-1.80132,15.522 -accelerometer: 11434390924,-3.02775,-9.63897,17.1892 -accelerometer: 11434410974,0.555726,-4.52246,15.9436 -accelerometer: 11434430963,8.10594,-0.70903,10.0414 -accelerometer: 11434450983,12.0535,2.33788,3.79427 -accelerometer: 11434471063,16.0011,6.45792,-0.306608 -accelerometer: 11434490900,14.3147,9.42818,-4.77158 -accelerometer: 11434510919,-4.84823,8.01012,-5.6914 -accelerometer: 11434530969,-36.1222,-4.63744,0.153304 -accelerometer: 11434550958,-39.2458,-18.4348,17.1892 -accelerometer: 11434570551,-23.3022,-16.9784,33.6118 -accelerometer: 11434590967,5.42312,-9.02576,27.633 -accelerometer: 11434610712,35.1257,-1.41806,19.987 -accelerometer: 11434630914,39.2266,13.0691,6.74537 -accelerometer: 11434650781,39.2266,12.2643,-2.7403 -accelerometer: 11434670557,29.166,1.09229,-7.01365 -accelerometer: 11434690973,-9.40902,-12.3218,-6.32378 -accelerometer: 11434710779,-39.2458,-16.9209,2.93193 -accelerometer: 11434730982,-39.2458,-16.9017,15.7136 -accelerometer: 11434750971,-39.2458,-20.9643,26.8665 -accelerometer: 11434772913,-12.82,-8.96827,25.4867 -irProximity:11434774890,0.290196 -accelerometer: 11434790796,19.0288,-5.28898,17.0742 -accelerometer: 11434810816,39.2266,10.1947,8.92994 -accelerometer: 11434830835,39.2266,6.84118,1.34141 -accelerometer: 11434850824,39.2266,-0.651541,1.78216 -accelerometer: 11434870813,20.3127,-0.459911,-4.12004 -irProximity:11434875873,0.294118 -accelerometer: 11434890802,-10.7504,-8.92994,-2.70198 -accelerometer: 11434910822,-38.4218,-7.53105,3.52599 -accelerometer: 11434930963,-39.2458,-5.48061,14.8705 -accelerometer: 11434950952,-39.2458,-11.881,24.2028 -accelerometer: 11434970789,-21.0026,-10.5588,24.6436 -accelerometer: 11434990808,5.28898,-6.2088,19.1055 -accelerometer: 11435010828,29.5301,-1.64802,12.0535 -accelerometer: 11435030969,39.2266,8.60417,1.3989 -accelerometer: 11435050928,39.1499,-1.51387,-3.85176 -accelerometer: 11435070764,29.7409,-2.26123,-2.7403 -irProximity:11435077655,0.298039 -accelerometer: 11435090936,5.80638,-1.24559,-4.31167 -accelerometer: 11435110925,-19.3163,-5.03986,0.670704 -accelerometer: 11435130975,-39.0541,-2.31872,11.5361 -accelerometer: 11435150964,-36.218,-3.83259,20.2936 -accelerometer: 11435170801,-24.4328,-3.6218,24.107 -irProximity:11435178607,0.294118 -accelerometer: 11435190973,-6.66871,0.0383259,19.9103 -accelerometer: 11435210962,6.18964,2.60616,15.4262 -accelerometer: 11435230951,8.04845,7.14779,10.4821 -accelerometer: 11435250971,12.226,4.12004,4.86739 -accelerometer: 11435270776,7.41607,2.52951,4.10088 -accelerometer: 11435290888,5.94052,1.95462,4.25418 -orientation:11435290888,4 -accelerometer: 11435310968,2.41453,2.37621,5.72973 -accelerometer: 11435330896,-1.09229,0.555726,7.58854 -accelerometer: 11435350733,-1.14978,-0.268282,7.55021 -orientation:11435350733,5 -accelerometer: 11435370783,-1.22643,0.268282,7.87598 -irProximity:11435380481,0.298039 -accelerometer: 11435390955,-2.52951,0.0383259,9.04492 -accelerometer: 11435411005,-1.22643,-0.574889,10.9995 -accelerometer: 11435430963,-0.594052,0.364096,11.2487 -accelerometer: 11435450952,-0.0766519,1.3989,11.0379 -accelerometer: 11435470819,-0.19163,1.41806,10.5971 -irProximity:11435481189,0.294118 -accelerometer: 11435490930,-0.32577,1.51387,10.233 -accelerometer: 11435510919,-0.594052,1.37973,9.94558 -accelerometer: 11435530969,-0.172467,0.843171,10.0797 -accelerometer: 11435550928,0.306608,0.843171,10.2139 -accelerometer: 11435570917,0,0.938986,10.1372 -accelerometer: 11435590906,-0.210793,1.20727,10.463 -accelerometer: 11435611047,-0.344933,0.785682,9.8306 -accelerometer: 11435631006,-0.364096,0.766519,9.19823 -accelerometer: 11435650964,-0.364096,0.958148,9.524 -accelerometer: 11435670953,-0.459911,0.0958148,9.6773 -accelerometer: 11435690912,-0.287445,-0.287445,9.81144 -accelerometer: 11435710931,0.0766519,-0.594052,9.88809 -accelerometer: 11435730890,-0.0958148,-0.689867,8.92994 -accelerometer: 11435750971,-0.555726,-0.421585,8.1251 -accelerometer: 11435774011,-0.402422,-0.5174,8.73831 -accelerometer: 11435790796,-0.0958148,0.114978,9.81144 -accelerometer: 11435810816,0.249119,0.459911,10.8271 -accelerometer: 11435830743,0.651541,-0.249119,10.1755 -accelerometer: 11435850794,0,-0.632378,9.06409 -accelerometer: 11435870813,0.364096,-1.07313,9.35153 -accelerometer: 11435890802,-0.0574889,-1.68634,9.38986 -accelerometer: 11435910852,0.0958148,-1.7055,9.98391 -accelerometer: 11435930933,0.229956,-1.22643,10.118 -accelerometer: 11435950952,0.344933,-0.479074,10.0222 -accelerometer: 11435970941,0.498237,-0.747356,9.42818 -irProximity:11435984942,0.290196 -accelerometer: 11435990808,0,-0.670704,9.27488 -accelerometer: 11436010919,0.0766519,-0.785682,9.63897 -accelerometer: 11436030939,0.0766519,-0.938986,9.81144 -accelerometer: 11436050928,0.0766519,-1.09229,10.4438 -accelerometer: 11436070917,0,-0.670704,10.118 -irProximity:11436085742,0.294118 -accelerometer: 11436090967,0.421585,-0.766519,9.50483 -accelerometer: 11436110956,0.268282,-0.479074,9.25571 -accelerometer: 11436130975,0.364096,-0.785682,9.40902 -accelerometer: 11436150995,0.210793,-0.824008,9.8306 -accelerometer: 11436170984,-0.0383259,-0.804845,9.69646 -accelerometer: 11436190973,0.114978,-0.613215,9.73479 -accelerometer: 11436210962,0.210793,-0.977311,9.50483 -accelerometer: 11436230951,0.32577,-0.651541,9.84977 -accelerometer: 11436250940,0.268282,-0.766519,9.73479 -accelerometer: 11436270960,0.440748,-0.747356,9.6773 -accelerometer: 11436290888,0.19163,-0.785682,9.8306 -accelerometer: 11436310968,0.0574889,-0.938986,9.58148 -accelerometer: 11436330927,0.287445,-0.613215,9.38986 -accelerometer: 11436350946,0.114978,-0.594052,9.54316 -accelerometer: 11436370966,0.32577,-0.555726,9.50483 -accelerometer: 11436390863,0.268282,-0.632378,9.524 -accelerometer: 11436410913,0.172467,-0.632378,9.56232 -accelerometer: 11436430902,0.172467,-0.651541,9.54316 -accelerometer: 11436450891,0.0574889,-0.555726,9.69646 -accelerometer: 11436470758,0.0574889,-0.651541,9.71563 -irProximity:11436488848,0.290196 -accelerometer: 11436490930,0.0574889,-0.881497,9.46651 -accelerometer: 11436510919,0.0766519,-0.574889,9.48567 -accelerometer: 11436531000,0.249119,-0.632378,9.73479 -accelerometer: 11436550928,0.19163,-0.555726,9.60065 -accelerometer: 11436570947,0.344933,-0.632378,9.54316 -irProximity:11436589709,0.294118 -accelerometer: 11436590997,0.114978,-0.651541,9.61981 -accelerometer: 11436611444,0.287445,-0.613215,9.48567 -accelerometer: 11436630945,0.344933,-0.728193,9.71563 -accelerometer: 11436650934,0.402422,-0.594052,9.84977 -accelerometer: 11436670801,0,-0.32577,8.73831 -irProximity:11436690264,0.290196 -accelerometer: 11436690942,0.019163,-0.670704,9.38986 -accelerometer: 11436710931,0.153304,-0.670704,9.65814 -accelerometer: 11436730982,-0.114978,-0.651541,9.56232 -accelerometer: 11436750971,0.0766519,-0.555726,10.0606 -accelerometer: 11436772852,0.019163,-0.670704,9.77311 -irProximity:11436790789,0.294118 -accelerometer: 11436790704,-0.019163,-0.670704,9.79228 -accelerometer: 11436810907,0,-0.536563,9.71563 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_shakeDown.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_shakeDown.dat deleted file mode 100644 index 8cf7ae5d..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_shakeDown.dat +++ /dev/null @@ -1,204 +0,0 @@ -orientation:13225890802,5 -accelerometer: 13229240930,0.440748,0.0574889,9.17906 -accelerometer: 13229260828,0.153304,-0.0958148,9.8306 -irProximity:13229277799,0.290196 -accelerometer: 13229281213,-0.19163,0.268282,10.348 -proximity:13229284025,0 -accelerometer: 13229300958,-0.249119,0.632378,9.88809 -accelerometer: 13229320764,-0.5174,0.881497,9.19823 -accelerometer: 13229340814,-0.402422,1.1881,9.02576 -accelerometer: 13229360742,-0.249119,1.57136,9.98391 -irProximity:13229379392,0.294118 -accelerometer: 13229380853,-0.287445,1.45639,10.2714 -accelerometer: 13229400812,-0.402422,1.57136,9.25571 -accelerometer: 13229420770,-0.632378,1.47555,8.89162 -accelerometer: 13229440820,-0.651541,0.958148,9.54316 -accelerometer: 13229460809,-0.5174,1.0348,9.54316 -accelerometer: 13229480859,-0.440748,0.555726,9.77311 -accelerometer: 13229500787,0.402422,-0.843171,9.81144 -accelerometer: 13229520807,1.07313,-0.306608,9.71563 -accelerometer: 13229540827,-0.134141,0.632378,8.60417 -accelerometer: 13229560816,-1.47555,2.08876,9.524 -irProximity:13229580778,0.298039 -accelerometer: 13229581018,-1.01564,2.51035,9.58148 -accelerometer: 13229600671,-0.919823,1.99295,9.79228 -accelerometer: 13229620813,-0.766519,0.958148,8.68083 -accelerometer: 13229640772,-0.862334,0.114978,8.29757 -accelerometer: 13229660639,-0.938986,0.555726,8.31673 -accelerometer: 13229680902,-0.0574889,0.958148,7.83765 -accelerometer: 13229700800,2.31872,2.12709,13.3758 -accelerometer: 13229720819,2.18458,1.99295,10.6546 -accelerometer: 13229740717,1.76299,1.7055,8.81497 -accelerometer: 13229760736,2.54868,0.938986,9.08325 -accelerometer: 13229780573,2.45286,0.977311,9.1599 -irProximity:13229782651,0.301961 -accelerometer: 13229800775,1.24559,1.82048,10.2905 -accelerometer: 13229820764,1.28392,1.59053,9.33237 -accelerometer: 13229840814,2.12709,1.87797,8.7958 -accelerometer: 13229860834,2.14625,0.824008,8.98743 -accelerometer: 13229880823,1.9163,1.0348,9.48567 -irProximity:13229883390,0.294118 -accelerometer: 13229900781,2.10793,0.881497,10.0031 -accelerometer: 13229920801,1.68634,0.421585,9.75395 -accelerometer: 13229940820,1.32224,0.32577,9.6773 -accelerometer: 13229960779,1.85881,0.862334,10.1755 -accelerometer: 13229980524,1.30308,0.5174,9.54316 -accelerometer: 13230000818,1.68634,0.843171,9.65814 -accelerometer: 13230020837,1.59053,0.210793,9.10241 -accelerometer: 13230040796,1.64802,0.268282,9.29404 -accelerometer: 13230060785,1.05396,0.249119,9.81144 -accelerometer: 13230080805,1.13062,0.364096,9.71563 -accelerometer: 13230100794,1.37973,0.440748,9.81144 -accelerometer: 13230120813,1.1881,0.32577,9.56232 -accelerometer: 13230140772,0.824008,0.498237,9.27488 -accelerometer: 13230160822,0.862334,0.536563,9.63897 -accelerometer: 13230180841,0.843171,0.459911,8.91078 -accelerometer: 13230200739,1.0348,0.728193,9.29404 -accelerometer: 13230220819,0.70903,1.07313,9.71563 -accelerometer: 13230241022,0,0.919823,9.42818 -accelerometer: 13230260950,0.536563,1.36057,9.29404 -accelerometer: 13230280847,0.498237,1.16894,9.21739 -accelerometer: 13230300928,-0.268282,1.41806,8.96827 -accelerometer: 13230320917,0,1.5522,8.43171 -accelerometer: 13230340936,0.114978,1.41806,8.08677 -accelerometer: 13230360925,0.0766519,-0.70903,8.98743 -accelerometer: 13230380823,-0.134141,-3.06608,10.9229 -irProximity:13230387571,0.290196 -accelerometer: 13230400873,0.632378,-15.1962,14.6597 -accelerometer: 13230420953,-5.0207,-32.3854,19.2779 -accelerometer: 13230441004,-8.66166,-35.8348,19.1055 -accelerometer: 13230460931,-0.824008,-20.102,8.37422 -accelerometer: 13230480829,8.14426,4.61828,0.824008 -accelerometer: 13230500971,18.4731,36.1605,4.40748 -accelerometer: 13230520960,28.3804,39.2266,11.9769 -accelerometer: 13230540949,25.0077,39.2266,14.0273 -accelerometer: 13230560938,14.928,27.4989,12.9542 -accelerometer: 13230580805,3.56431,8.56585,12.7434 -irProximity:13230589383,0.294118 -accelerometer: 13230600916,-6.36211,-12.935,9.25571 -accelerometer: 13230620966,-9.44734,-31.5997,12.9925 -accelerometer: 13230641046,-9.0066,-39.2458,16.8251 -accelerometer: 13230661157,-7.37774,-39.2458,20.0445 -accelerometer: 13230680994,0.0766519,-38.2301,15.0621 -irProximity:13230690397,0.290196 -accelerometer: 13230701379,8.1251,-17.5724,7.99096 -accelerometer: 13230721368,11.5553,0.632378,8.25924 -accelerometer: 13230741480,14.3531,23.8579,10.118 -accelerometer: 13230761835,13.2224,38.9008,14.2764 -accelerometer: 13230781641,12.2451,39.2266,19.6037 -irProximity:13230791379,0.294118 -accelerometer: 13230800653,9.58148,39.2266,18.7797 -accelerometer: 13230821283,2.14625,26.5599,12.9542 -accelerometer: 13230841425,-4.59911,8.18259,6.11299 -accelerometer: 13230860803,-5.84471,-9.75395,0.728193 -accelerometer: 13230880853,-1.93546,-39.1691,1.45639 -irProximity:13230892423,0.290196 -accelerometer: 13230900781,-1.14978,-39.2458,15.3112 -accelerometer: 13230920770,4.06255,-39.2458,21.0793 -accelerometer: 13230940820,10.7313,-39.2458,9.63897 -accelerometer: 13230960809,14.5639,-15.1579,4.5033 -accelerometer: 13230980798,13.2799,6.18964,7.74184 -irProximity:13230993223,0.294118 -accelerometer: 13231000635,16.0969,35.6431,14.7746 -accelerometer: 13231020990,17.5533,39.2266,23.8387 -accelerometer: 13231040949,17.8216,39.2266,27.9588 -accelerometer: 13231060968,8.16343,39.2266,21.6542 -accelerometer: 13231080927,-1.1881,19.3929,11.2678 -accelerometer: 13231100946,-8.01012,-1.83965,2.62533 -accelerometer: 13231121027,-3.2577,-25.0843,2.37621 -accelerometer: 13231141016,0.498237,-39.2458,12.3218 -accelerometer: 13231161035,2.29956,-39.2458,23.7238 -accelerometer: 13231180994,8.52752,-39.2458,14.0465 -irProximity:13231194883,0.290196 -accelerometer: 13231201044,14.7746,-23.5321,1.82048 -accelerometer: 13231220575,15.3495,4.15836,1.13062 -accelerometer: 13231240595,17.1125,27.0389,7.62686 -accelerometer: 13231260797,19.0097,39.2074,14.7363 -accelerometer: 13231280939,16.3843,38.7475,24.5094 -irProximity:13231295713,0.294118 -accelerometer: 13231300958,9.94558,26.8282,19.8337 -accelerometer: 13231320947,2.62533,10.3672,16.6143 -accelerometer: 13231340936,-3.02775,-2.14625,13.165 -accelerometer: 13231361078,-5.88303,-10.233,9.90726 -accelerometer: 13231381067,-6.51541,-10.6738,10.3672 -accelerometer: 13231400995,-4.17753,-9.33237,6.89867 -accelerometer: 13231421014,-0.689867,-5.74889,7.64602 -accelerometer: 13231440973,0.306608,-4.36916,9.42818 -accelerometer: 13231461054,0.0574889,-2.7403,10.4438 -accelerometer: 13231480798,0.249119,-1.32224,10.5396 -accelerometer: 13231500910,-0.134141,-0.938986,9.12157 -accelerometer: 13231520960,-0.574889,0,7.99096 -accelerometer: 13231540918,4.79074,0.249119,8.02928 -accelerometer: 13231560938,0,0.938986,8.20175 -accelerometer: 13231580927,0.613215,0.0766519,8.96827 -accelerometer: 13231600885,1.05396,-0.440748,9.54316 -accelerometer: 13231620935,0.766519,0.229956,9.17906 -accelerometer: 13231640924,0.555726,-0.114978,9.63897 -accelerometer: 13231661005,0.459911,-0.153304,10.6354 -accelerometer: 13231680963,0.0958148,-0.881497,10.8654 -accelerometer: 13231700922,-0.114978,-1.47555,10.6354 -accelerometer: 13231720972,-0.249119,-2.20374,10.3097 -accelerometer: 13231740930,-0.19163,-2.35705,10.9612 -accelerometer: 13231760950,-0.383259,-1.97379,10.5013 -accelerometer: 13231780817,-0.862334,-2.03127,9.6773 -accelerometer: 13231800806,-0.594052,-1.45639,9.75395 -accelerometer: 13231820795,-0.651541,-1.36057,9.63897 -accelerometer: 13231840845,-0.5174,-1.16894,9.23655 -accelerometer: 13231860803,-0.0574889,-0.977311,9.10241 -accelerometer: 13231880823,4.73325,-1.28392,9.46651 -irProximity:13231900327,0.290196 -accelerometer: 13231900781,-0.594052,-1.26476,9.6773 -accelerometer: 13231920923,-0.153304,-1.07313,9.21739 -accelerometer: 13231940973,-0.287445,-0.824008,9.48567 -accelerometer: 13231960962,-0.0766519,-1.22643,10.2905 -accelerometer: 13231980920,-0.249119,-1.09229,10.2139 -accelerometer: 13232001032,-0.172467,-1.20727,9.88809 -accelerometer: 13232020929,0.134141,-0.881497,9.50483 -accelerometer: 13232040918,-0.210793,-0.459911,9.17906 -accelerometer: 13232060968,0.249119,-0.689867,9.19823 -accelerometer: 13232080927,0.0958148,-1.11145,9.88809 -accelerometer: 13232101068,0.114978,-1.26476,9.44734 -accelerometer: 13232120966,0.0766519,-0.728193,9.48567 -accelerometer: 13232140955,0.287445,-0.594052,9.524 -accelerometer: 13232160974,0.536563,-0.632378,9.61981 -accelerometer: 13232181085,0.364096,-0.670704,9.21739 -accelerometer: 13232200556,0.134141,-0.383259,8.73831 -accelerometer: 13232220758,0.306608,-0.536563,9.60065 -accelerometer: 13232240961,0.555726,-0.689867,9.60065 -accelerometer: 13232260919,0.651541,-0.555726,9.40902 -accelerometer: 13232281152,0.479074,-0.479074,9.44734 -accelerometer: 13232300714,0.594052,-0.785682,9.46651 -accelerometer: 13232320917,0.229956,-0.766519,9.65814 -accelerometer: 13232340967,0.574889,-0.479074,9.21739 -accelerometer: 13232360956,0.5174,-0.594052,9.77311 -accelerometer: 13232380945,0.344933,-0.632378,9.73479 -accelerometer: 13232400751,0.153304,-0.536563,9.56232 -irProximity:13232404264,0.294118 -accelerometer: 13232420892,0.306608,-0.498237,9.48567 -accelerometer: 13232441004,0.364096,-0.498237,9.46651 -accelerometer: 13232460993,0.440748,-0.421585,9.37069 -accelerometer: 13232480951,0.172467,-0.344933,9.79228 -accelerometer: 13232500787,0.306608,-0.536563,9.58148 -accelerometer: 13232520899,0.0383259,-0.459911,9.48567 -accelerometer: 13232540949,0.287445,-0.536563,9.77311 -accelerometer: 13232560968,0.383259,-0.574889,9.46651 -accelerometer: 13232580988,0.172467,-0.383259,9.50483 -accelerometer: 13232600794,0.0383259,-0.440748,9.54316 -accelerometer: 13232620935,0.134141,-0.364096,9.73479 -accelerometer: 13232640924,0.306608,-0.574889,9.61981 -accelerometer: 13232660974,0.287445,-0.632378,9.17906 -accelerometer: 13232680933,-0.594052,-0.594052,8.92994 -accelerometer: 13232700800,-0.689867,-0.0958148,9.42818 -irProximity:13232706907,0.290196 -accelerometer: 13232720941,0.268282,-0.670704,9.58148 -accelerometer: 13232740930,0.153304,-0.459911,9.88809 -accelerometer: 13232761011,0.229956,-0.536563,10.2905 -accelerometer: 13232780908,0.32577,-0.613215,9.96474 -accelerometer: 13232800806,0.383259,-0.268282,9.8306 -irProximity:13232807828,0.294118 -accelerometer: 13232820551,0.019163,-0.114978,9.84977 -accelerometer: 13232840845,-0.0383259,0.0383259,9.60065 -accelerometer: 13232860773,-0.766519,-0.0383259,9.1599 -accelerometer: 13232880792,-4.75242,-0.5174,8.47003 -accelerometer: 13232900781,0,-0.114978,9.77311 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_shakeLeft.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_shakeLeft.dat deleted file mode 100644 index a4360a7d..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_shakeLeft.dat +++ /dev/null @@ -1,196 +0,0 @@ -orientation:14224200525,5 -accelerometer: 14226290643,0.785682,1.49409e-39,9.04492 -accelerometer: 14226310632,0.459911,-0.632378,9.3132 -accelerometer: 14226330530,0.574889,-0.632378,9.46651 -accelerometer: 14226350671,-0.0766519,-0.536563,9.98391 -accelerometer: 14226370569,-0.459911,0.0383259,10.7313 -accelerometer: 14226390558,-0.306608,-0.287445,9.77311 -accelerometer: 14226418176,-0.0383259,4.80991,8.94911 -accelerometer: 14226430566,-0.0383259,0.574889,8.94911 -irProximity:14226432156,0.290196 -accelerometer: 14226450556,-0.287445,-0.229956,9.38986 -accelerometer: 14226470575,-0.229956,-0.344933,9.35153 -proximity:14226489895,0 -accelerometer: 14226490717,0.153304,-0.32577,9.17906 -accelerometer: 14226510675,0.574889,-0.364096,9.50483 -accelerometer: 14226530573,0.19163,-0.670704,10.1755 -accelerometer: 14226550684,-0.0766519,-0.747356,10.4821 -accelerometer: 14226570703,0.383259,-0.0766519,10.5205 -accelerometer: 14226590723,0.114978,0.344933,9.6773 -accelerometer: 14226610559,0.440748,0.594052,10.3097 -accelerometer: 14226630579,0.459911,-0.728193,10.1564 -accelerometer: 14226650568,-0.229956,-0.0958148,10.1755 -accelerometer: 14226670740,0,-0.0383259,9.50483 -accelerometer: 14226690668,-0.421585,0.114978,9.02576 -accelerometer: 14226710809,-0.479074,0.19163,9.02576 -accelerometer: 14226730615,-0.574889,0,9.06409 -accelerometer: 14226750635,-0.364096,-0.0383259,9.17906 -accelerometer: 14226770593,-0.440748,0.019163,9.06409 -accelerometer: 14226790674,-0.459911,0.0766519,9.38986 -accelerometer: 14226810724,-0.210793,0.0383259,9.8306 -accelerometer: 14226830682,-0.134141,0.134141,9.81144 -accelerometer: 14226850794,-0.32577,0.0766519,9.79228 -accelerometer: 14226870813,-0.364096,0,9.6773 -accelerometer: 14226890833,-0.32577,-0.344933,9.69646 -accelerometer: 14226910974,-0.440748,-0.344933,9.524 -accelerometer: 14226930780,-0.32577,-0.287445,9.6773 -accelerometer: 14226950922,-0.287445,-0.306608,9.60065 -accelerometer: 14226970972,-0.268282,-0.0574889,9.56232 -accelerometer: 14226990839,4.75242,-0.0383259,9.58148 -accelerometer: 14227010889,0.306608,-0.114978,9.79228 -accelerometer: 14227030817,0.019163,-0.210793,9.48567 -accelerometer: 14227050928,-0.19163,0.019163,9.42818 -accelerometer: 14227070978,-0.153304,-0.114978,9.21739 -accelerometer: 14227090967,-0.287445,-4.88656,9.1599 -accelerometer: 14227110986,-0.287445,-0.19163,9.23655 -accelerometer: 14227130823,-0.210793,0.0383259,9.63897 -accelerometer: 14227150934,-0.268282,0.229956,9.69646 -accelerometer: 14227170923,-0.287445,-4.86739,9.88809 -accelerometer: 14227190942,-0.19163,-0.019163,9.94558 -accelerometer: 14227210901,-0.0958148,-0.306608,9.75395 -accelerometer: 14227230859,-0.306608,-0.364096,9.61981 -irProximity:14227237728,0.294118 -accelerometer: 14227250971,-0.268282,-0.5174,9.71563 -accelerometer: 14227270960,0.019163,-0.19163,9.56232 -accelerometer: 14227290949,0.019163,-0.0574889,9.48567 -accelerometer: 14227310968,0.32577,-0.114978,9.73479 -accelerometer: 14227330805,0.287445,-0.306608,9.524 -irProximity:14227338680,0.290196 -accelerometer: 14227351038,0.32577,-0.383259,9.6773 -accelerometer: 14227370996,0.249119,-0.0766519,9.56232 -accelerometer: 14227390955,0.440748,-0.249119,9.54316 -accelerometer: 14227411005,0.306608,0.0766519,9.79228 -accelerometer: 14227430780,-0.402422,0.958148,9.79228 -accelerometer: 14227450891,-3.75594,4.23502,10.5971 -accelerometer: 14227470850,-17.1125,10.5205,13.4332 -accelerometer: 14227490930,-31.1398,-0.114978,15.3495 -accelerometer: 14227511347,-35.2024,-17.8599,15.1196 -accelerometer: 14227531549,-20.3127,-25.3909,12.3984 -accelerometer: 14227550775,13.165,-11.7469,11.6894 -accelerometer: 14227570978,39.2266,1.9163,13.2416 -accelerometer: 14227590967,39.2266,4.6566,21.3475 -accelerometer: 14227610803,39.2266,1.74383,11.6319 -accelerometer: 14227630823,39.2074,4.6566,6.89867 -accelerometer: 14227650995,27.0006,1.3989,3.69845 -accelerometer: 14227671014,11.6894,-9.19823,6.97532 -accelerometer: 14227691095,-10.7504,-16.7676,9.71563 -accelerometer: 14227711725,-38.92,-14.5639,14.4872 -accelerometer: 14227732202,-39.2458,-17.8982,19.3354 -irProximity:14227742184,0.294118 -accelerometer: 14227751917,-39.2458,-25.8892,20.2361 -accelerometer: 14227770837,-39.2458,-27.8246,14.4872 -accelerometer: 14227790796,-22.0374,-22.9572,5.21233 -accelerometer: 14227810846,22.9381,-7.87598,10.3097 -accelerometer: 14227830835,39.2266,7.2436,16.576 -accelerometer: 14227850824,39.2266,10.9804,27.4222 -accelerometer: 14227870691,39.2266,4.48413,21.9224 -accelerometer: 14227890741,39.2266,-0.32577,10.8462 -accelerometer: 14227910608,26.5407,-2.587,2.39537 -accelerometer: 14227930780,-3.92841,-9.48567,1.22643 -irProximity:14227943783,0.290196 -accelerometer: 14227950769,-39.2458,-3.2577,7.79933 -accelerometer: 14227970789,-39.2458,-22.2865,24.2412 -accelerometer: 14227990808,-39.2458,-31.3123,29.7409 -accelerometer: 14228010767,-39.2458,-30.1625,20.3894 -accelerometer: 14228030786,-4.08171,-22.5548,11.8619 -accelerometer: 14228050928,39.2266,-10.7696,10.1564 -accelerometer: 14228070978,39.2266,0.287445,17.17 -accelerometer: 14228090997,39.2266,1.64802,15.6753 -orientation:14228090997,4 -accelerometer: 14228110986,39.2266,-0.172467,9.3132 -accelerometer: 14228131006,39.2266,-0.421585,2.51035 -irProximity:14228145138,0.294118 -accelerometer: 14228150964,21.405,-7.4544,2.49119 -accelerometer: 14228171076,-10.9612,-12.3218,6.13215 -accelerometer: 14228191004,-39.2458,-12.7434,16.1544 -accelerometer: 14228210718,-39.2458,-25.161,28.1696 -accelerometer: 14228230524,-39.2458,-34.0526,27.4605 -irProximity:14228245907,0.290196 -accelerometer: 14228250787,-39.2458,-29.5493,19.5654 -accelerometer: 14228270807,-6.45792,-21.8841,9.3132 -accelerometer: 14228290827,34.34,-12.935,9.84977 -accelerometer: 14228310816,39.2266,-2.56784,18.2815 -accelerometer: 14228330805,39.2266,0.689867,19.8912 -accelerometer: 14228350824,39.2266,-1.07313,14.3147 -accelerometer: 14228370813,26.0425,1.82048,5.55726 -accelerometer: 14228390955,8.06761,5.55726,2.62533 -accelerometer: 14228411005,-6.87951,4.06255,6.49625 -accelerometer: 14228430841,-14.9663,-2.0696,10.7121 -irProximity:14228447414,0.294118 -accelerometer: 14228450952,-14.6788,-5.88303,12.2643 -accelerometer: 14228470789,-11.7277,-5.26982,11.4211 -accelerometer: 14228490991,-7.22444,-2.31872,10.3097 -accelerometer: 14228510980,-2.75947,0.958148,8.87245 -accelerometer: 14228531030,-1.53304,1.78216,8.52752 -orientation:14228531030,5 -irProximity:14228548183,0.290196 -accelerometer: 14228550745,-0.977311,1.34141,7.93347 -accelerometer: 14228570551,-1.45639,1.13062,8.45087 -accelerometer: 14228590814,-0.843171,0.0766519,8.45087 -accelerometer: 14228610986,-1.82048,0.632378,9.79228 -accelerometer: 14228630945,-0.613215,1.07313,9.65814 -accelerometer: 14228650934,-0.114978,1.13062,9.63897 -accelerometer: 14228670923,1.36057,0.862334,10.118 -accelerometer: 14228690942,1.66718,1.53304,10.7888 -accelerometer: 14228710901,0.996474,1.82048,10.118 -accelerometer: 14228730920,0.19163,2.77863,9.75395 -accelerometer: 14228750971,0.249119,1.7055,9.46651 -accelerometer: 14228770807,0.287445,0.785682,9.33237 -accelerometer: 14228790827,0.0574889,-0.19163,9.37069 -accelerometer: 14228810846,0.766519,-0.747356,9.94558 -accelerometer: 14228830805,0.938986,-0.32577,10.0606 -accelerometer: 14228850946,0.306608,0.134141,9.60065 -accelerometer: 14228870813,-0.229956,0.364096,9.40902 -accelerometer: 14228890833,0.0958148,0,9.71563 -accelerometer: 14228910944,0.613215,-0.364096,9.63897 -accelerometer: 14228930963,1.47555,-0.689867,9.54316 -accelerometer: 14228950922,1.93546,-0.249119,9.92642 -accelerometer: 14228970941,1.53304,0.498237,10.6354 -accelerometer: 14228990778,2.20374,0.613215,10.9037 -accelerometer: 14229010950,2.24207,-0.249119,10.118 -accelerometer: 14229030969,1.16894,-0.938986,9.38986 -accelerometer: 14229050897,0.70903,-0.70903,9.84977 -accelerometer: 14229070947,1.11145,-0.613215,10.1564 -accelerometer: 14229090967,0.785682,-0.0383259,10.0989 -accelerometer: 14229110956,0.70903,0.19163,9.69646 -accelerometer: 14229130945,0.364096,-0.306608,9.17906 -accelerometer: 14229150720,0.229956,-0.383259,9.50483 -accelerometer: 14229170923,0.670704,-0.728193,9.56232 -accelerometer: 14229190973,0.383259,-0.383259,9.50483 -accelerometer: 14229210931,0,-0.0958148,9.27488 -accelerometer: 14229230951,0.0383259,-0.306608,9.33237 -accelerometer: 14229250787,0.268282,-0.172467,9.0066 -accelerometer: 14229270960,0.114978,-0.249119,9.50483 -accelerometer: 14229290949,0.0958148,-0.19163,9.60065 -accelerometer: 14229310968,0.32577,-0.383259,9.42818 -accelerometer: 14229330988,-0.153304,4.77158,9.58148 -accelerometer: 14229350824,0.287445,-0.536563,9.63897 -accelerometer: 14229370935,0.134141,-0.364096,9.46651 -accelerometer: 14229390955,-0.0766519,-0.459911,9.29404 -accelerometer: 14229410944,0.0766519,-0.306608,9.77311 -accelerometer: 14229430780,0.32577,-0.306608,9.73479 -accelerometer: 14229450830,0.364096,-0.249119,9.65814 -accelerometer: 14229470850,0.383259,-0.019163,9.75395 -accelerometer: 14229490930,0.632378,-0.383259,9.63897 -accelerometer: 14229510950,0.19163,-0.0383259,9.54316 -accelerometer: 14229530969,0.210793,-0.019163,9.46651 -accelerometer: 14229550836,0.229956,-0.019163,9.54316 -accelerometer: 14229570978,0.0766519,-0.459911,9.33237 -accelerometer: 14229590967,0.32577,-0.32577,9.71563 -accelerometer: 14229610956,0,-0.249119,10.0414 -accelerometer: 14229631006,-0.019163,0.19163,9.79228 -accelerometer: 14229650781,0.210793,-0.574889,9.48567 -accelerometer: 14229673364,-0.306608,-0.555726,8.83413 -accelerometer: 14229690973,-0.19163,-0.229956,9.19823 -accelerometer: 14229710993,4.73325,-0.268282,9.44734 -accelerometer: 14229730920,0.0383259,-0.287445,9.73479 -accelerometer: 14229750879,0.0958148,-0.536563,9.65814 -accelerometer: 14229770624,0.019163,-0.555726,9.96474 -accelerometer: 14229790552,0.114978,-0.574889,9.96474 -accelerometer: 14229810816,0.229956,-0.459911,10.2139 -accelerometer: 14229830805,0.0766519,-0.555726,10.2139 -accelerometer: 14229850794,0.153304,-0.383259,9.73479 -accelerometer: 14229870783,-0.613215,0.229956,9.92642 -accelerometer: 14229890802,-0.402422,-0.594052,9.14074 -accelerometer: 14229910822,-0.0766519,-0.383259,8.69999 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_shakeRight.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_shakeRight.dat deleted file mode 100644 index 0558be5c..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_shakeRight.dat +++ /dev/null @@ -1,157 +0,0 @@ -orientation:12976390955,5 -accelerometer: 13000540674,-1.07313,0.306608,9.19823 -accelerometer: 13000560907,-1.11145,0.632378,9.61981 -accelerometer: 13000580957,-1.22643,0.114978,9.58148 -irProximity:13000597149,0.290196 -proximity:13000600537,0 -accelerometer: 13000601434,-1.3989,0.287445,9.524 -accelerometer: 13000620996,-1.24559,0.114978,9.61981 -accelerometer: 13000640955,-1.24559,0.344933,9.60065 -accelerometer: 13000660974,-1.24559,0.402422,9.50483 -accelerometer: 13000680933,-1.1881,0.498237,9.44734 -accelerometer: 13000701044,-0.958148,0.5174,9.27488 -accelerometer: 13000720972,-0.383259,0.0383259,9.21739 -accelerometer: 13000740961,-1.20727,0.459911,9.79228 -accelerometer: 13000760767,-1.01564,0.210793,9.79228 -accelerometer: 13000780817,-0.862334,0.421585,9.23655 -accelerometer: 13000800958,-1.0348,0.498237,9.23655 -accelerometer: 13000820795,-0.996474,0.32577,9.06409 -accelerometer: 13000840845,-1.09229,0.5174,8.87245 -accelerometer: 13000860773,-1.3989,-4.71409,9.65814 -accelerometer: 13000880792,-0.574889,-0.651541,10.7121 -accelerometer: 13000900568,-1.74383,0.134141,11.8236 -irProximity:13000901959,0.294118 -accelerometer: 13000920953,-1.82048,3.27687,8.18259 -accelerometer: 13000941003,-1.3989,1.01564,8.94911 -accelerometer: 13000960931,-1.57136,1.49471,9.04492 -accelerometer: 13000980920,-1.97379,0.19163,9.19823 -accelerometer: 13001002283,-2.16542,0.938986,9.54316 -accelerometer: 13001020990,-1.95462,1.74383,9.75395 -accelerometer: 13001040918,-1.59053,0.766519,9.42818 -accelerometer: 13001060938,-1.66718,0.574889,9.46651 -accelerometer: 13001080957,-1.37973,0.306608,9.08325 -accelerometer: 13001100763,-0.153304,1.22643,8.39338 -irProximity:13001103894,0.290196 -accelerometer: 13001120966,1.85881,0.479074,10.3288 -accelerometer: 13001140955,6.59206,-0.306608,12.5517 -accelerometer: 13001160944,14.1806,-1.09229,13.0883 -accelerometer: 13001180933,18.1282,-4.38832,16.4227 -accelerometer: 13001200769,17.8599,-5.72973,15.4645 -accelerometer: 13001220941,12.5517,-6.80285,13.6632 -accelerometer: 13001240961,-0.5174,-5.5381,8.56585 -accelerometer: 13001260919,-32.4046,3.43017,4.40748 -accelerometer: 13001280817,-39.2458,10.1372,7.761 -accelerometer: 13001300775,-39.2458,4.34999,14.1423 -accelerometer: 13001320947,-39.2458,-6.07466,16.1735 -accelerometer: 13001340967,-16.5185,-8.16343,13.0117 -accelerometer: 13001360925,14.2381,-9.06409,14.6788 -accelerometer: 13001381006,37.2911,-5.94052,11.8427 -accelerometer: 13001400781,39.2266,-0.479074,13.9506 -accelerometer: 13001420892,39.2266,-0.0766519,14.9471 -orientation:13001420892,4 -accelerometer: 13001441003,37.1187,-5.55726,11.4403 -accelerometer: 13001460931,23.8962,-8.98743,9.35153 -accelerometer: 13001480982,9.1599,-10.9995,8.62334 -accelerometer: 13001500787,-13.8357,-10.9995,8.33589 -accelerometer: 13001520990,-38.5559,7.01365,8.4892 -accelerometer: 13001540979,-39.2458,-0.114978,11.0379 -accelerometer: 13001560968,-39.2458,-9.6773,14.9854 -accelerometer: 13001580988,-39.2458,-13.3758,10.2714 -accelerometer: 13001600641,-15.8095,-15.0621,10.8462 -accelerometer: 13001620630,25.4676,-10.5588,17.1125 -accelerometer: 13001640833,39.2266,1.28392,24.4328 -accelerometer: 13001661005,39.2266,7.72268,25.3909 -accelerometer: 13001680933,39.2266,2.18458,21.1368 -accelerometer: 13001700769,32.6729,-5.72973,13.0691 -accelerometer: 13001720941,15.6561,-8.89162,7.58854 -accelerometer: 13001740930,-4.5033,-10.6163,3.31519 -accelerometer: 13001760706,-39.2458,-4.15836,0.70903 -accelerometer: 13001781000,-39.2458,-0.19163,5.86387 -accelerometer: 13001801569,-39.2458,-7.99096,13.3374 -accelerometer: 13001820734,-39.2458,-10.9804,16.3269 -accelerometer: 13001840814,-17.4575,-12.1493,14.6213 -accelerometer: 13001860803,16.2502,-8.69999,16.1927 -accelerometer: 13001880914,39.2266,8.41254,32.1938 -accelerometer: 13001900781,39.2266,6.66871,17.2083 -accelerometer: 13001920923,39.2266,3.29603,21.405 -accelerometer: 13001940973,37.3678,-2.14625,10.5013 -accelerometer: 13001960962,20.102,-8.98743,9.50483 -accelerometer: 13001980951,1.09229,-10.7696,7.26277 -accelerometer: 13002000971,-23.8196,-7.01365,5.34647 -irProximity:13002011944,0.294118 -accelerometer: 13002020960,-39.2458,-2.10793,7.35858 -accelerometer: 13002040949,-39.2458,-6.22797,12.82 -accelerometer: 13002060999,-39.2458,-10.7888,16.2885 -accelerometer: 13002080988,-28.0163,-9.79228,13.9506 -accelerometer: 13002100946,-1.72467,-5.49977,13.0117 -irProximity:13002112744,0.290196 -accelerometer: 13002120966,19.4887,0.459911,14.0656 -accelerometer: 13002140924,25.5059,4.59911,13.7015 -accelerometer: 13002160944,22.4015,3.75594,13.2608 -accelerometer: 13002181055,15.5028,1.66718,10.8846 -accelerometer: 13002200983,8.81497,-0.0574889,9.21739 -irProximity:13002213543,0.294118 -accelerometer: 13002221002,3.6218,-0.210793,6.78369 -accelerometer: 13002240930,0.479074,1.66718,6.17048 -accelerometer: 13002260950,-1.01564,1.74383,7.6077 -orientation:13002260950,5 -accelerometer: 13002281030,-2.75947,1.34141,9.3132 -accelerometer: 13002300958,-3.58348,0.70903,10.6546 -accelerometer: 13002320917,-3.2577,0.019163,11.3636 -accelerometer: 13002340936,-2.93193,0.651541,11.1145 -accelerometer: 13002360986,-2.587,0.268282,9.96474 -accelerometer: 13002380975,-2.18458,0.229956,9.69646 -accelerometer: 13002400934,-1.20727,0.785682,10.2139 -accelerometer: 13002420862,-0.689867,0.919823,9.65814 -accelerometer: 13002440942,-0.766519,0.594052,9.29404 -accelerometer: 13002460901,-0.881497,0.594052,9.77311 -accelerometer: 13002480982,-1.22643,0.210793,9.69646 -accelerometer: 13002500971,-1.07313,0.383259,9.17906 -irProximity:13002515942,0.290196 -accelerometer: 13002520960,-1.34141,0.498237,9.38986 -accelerometer: 13002540918,-1.36057,0.479074,9.33237 -accelerometer: 13002560938,-1.32224,1.01564,9.37069 -accelerometer: 13002581018,-0.919823,0.32577,9.44734 -accelerometer: 13002600916,-0.785682,0.421585,9.75395 -accelerometer: 13002620905,-0.977311,0.249119,9.33237 -accelerometer: 13002640955,-1.09229,0.268282,9.50483 -accelerometer: 13002661005,-1.05396,-0.0958148,9.63897 -accelerometer: 13002680933,-1.3989,-0.134141,9.88809 -accelerometer: 13002700983,-1.53304,-0.364096,9.86893 -accelerometer: 13002720880,-1.62885,-0.0958148,9.61981 -accelerometer: 13002740900,-1.72467,-0.19163,9.60065 -accelerometer: 13002760828,-1.68634,-0.383259,9.38986 -accelerometer: 13002780969,-1.60969,-0.0766519,9.14074 -accelerometer: 13002800806,-1.37973,0.0958148,9.17906 -accelerometer: 13002820825,-1.14978,0.210793,9.42818 -accelerometer: 13002840814,-1.11145,-0.0574889,9.08325 -accelerometer: 13002860803,-1.01564,-0.0383259,9.21739 -accelerometer: 13002880853,-0.785682,-0.0766519,9.02576 -accelerometer: 13002900964,-0.881497,0.114978,9.63897 -irProximity:13002918926,0.294118 -accelerometer: 13002920984,-0.824008,-0.210793,9.81144 -accelerometer: 13002940973,-1.0348,-0.0574889,9.48567 -accelerometer: 13002960962,-1.14978,4.73325,9.524 -accelerometer: 13002980951,-0.996474,0.0958148,9.77311 -accelerometer: 13003001001,-1.07313,-0.114978,9.63897 -irProximity:13003019726,0.290196 -accelerometer: 13003020990,-0.977311,0,9.25571 -accelerometer: 13003040949,-1.16894,0.0383259,9.63897 -accelerometer: 13003060999,-1.09229,0.114978,9.6773 -accelerometer: 13003080927,-0.938986,0.0574889,9.6773 -accelerometer: 13003100946,-0.594052,0.402422,9.524 -accelerometer: 13003121057,-0.996474,-0.268282,9.42818 -accelerometer: 13003140894,-1.97379,-0.229956,8.33589 -accelerometer: 13003161005,-1.5522,-0.134141,8.85329 -accelerometer: 13003181024,-0.90066,0.229956,10.0797 -accelerometer: 13003201013,-1.05396,0.19163,9.42818 -accelerometer: 13003221063,-0.594052,-0.019163,9.61981 -accelerometer: 13003241144,-1.01564,0.210793,10.1755 -accelerometer: 13003260645,-0.747356,-0.0766519,10.2139 -accelerometer: 13003280756,-0.804845,-0.0958148,9.84977 -accelerometer: 13003300806,-0.804845,-0.134141,9.69646 -accelerometer: 13003320856,-0.728193,0.249119,9.6773 -accelerometer: 13003340814,-1.01564,0.268282,9.25571 -accelerometer: 13003360803,-1.05396,0.134141,9.02576 -accelerometer: 13003380823,-0.594052,0.134141,9.63897 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_shakeUp.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_shakeUp.dat deleted file mode 100644 index f2ae47d6..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_shakeUp.dat +++ /dev/null @@ -1,228 +0,0 @@ -orientation:13221790765,5 -accelerometer: 13223252588,-1.57136,0.862334,9.14074 -accelerometer: 13223270960,-0.996474,0.574889,9.17906 -accelerometer: 13223290949,-1.47555,0.555726,9.44734 -irProximity:13223310423,0.290196 -accelerometer: 13223311029,-1.24559,0.938986,9.08325 -proximity:13223316618,0 -accelerometer: 13223330957,-1.30308,0.804845,9.63897 -accelerometer: 13223350916,-1.32224,1.0348,9.63897 -accelerometer: 13223370966,-0.632378,0.594052,9.60065 -accelerometer: 13223390955,-0.498237,0.498237,9.54316 -accelerometer: 13223410700,-0.536563,0.747356,9.69646 -accelerometer: 13223430902,0.0958148,0.536563,9.27488 -accelerometer: 13223450891,0.0574889,0.153304,8.73831 -accelerometer: 13223470758,-0.919823,0.689867,8.35505 -accelerometer: 13223490900,-0.479074,0.613215,9.94558 -accelerometer: 13223510767,-0.498237,0.19163,8.39338 -accelerometer: 13223530939,-0.479074,1.72467,9.1599 -accelerometer: 13223550958,-1.87797,1.76299,9.42818 -accelerometer: 13223570947,-1.53304,2.10793,8.68083 -accelerometer: 13223590997,-0.249119,0.881497,7.62686 -accelerometer: 13223610803,0.0766519,1.09229,6.2088 -accelerometer: 13223630914,-0.0766519,4.38832,15.407 -accelerometer: 13223650964,-0.747356,3.81343,11.881 -accelerometer: 13223670923,0.0574889,1.41806,9.63897 -accelerometer: 13223690942,-1.13062,3.29603,9.1599 -accelerometer: 13223710779,-0.268282,6.13215,8.77664 -irProximity:13223714994,0.294118 -accelerometer: 13223730920,0.268282,-0.402422,10.3863 -accelerometer: 13223750971,0.210793,0.804845,9.08325 -accelerometer: 13223770929,-0.536563,1.68634,9.54316 -accelerometer: 13223790826,0.153304,0.402422,9.88809 -accelerometer: 13223810816,0.229956,1.43722,9.8306 -irProximity:13223815702,0.290196 -accelerometer: 13223830835,-0.0958148,1.05396,9.19823 -accelerometer: 13223850794,-0.249119,0.594052,8.68083 -accelerometer: 13223870783,0.210793,0.421585,8.96827 -accelerometer: 13223890833,-0.19163,0.440748,9.02576 -accelerometer: 13223910822,-0.249119,0.440748,9.75395 -accelerometer: 13223930750,-0.0958148,0.766519,9.42818 -accelerometer: 13223950922,-0.0574889,0.632378,8.6425 -accelerometer: 13223970941,4.79074,0.574889,9.92642 -accelerometer: 13223990778,0.344933,0.70903,9.84977 -accelerometer: 13224010797,0.32577,0.824008,9.33237 -irProximity:13224017393,0.294118 -accelerometer: 13224030969,-0.0383259,0.824008,9.46651 -accelerometer: 13224050928,0.536563,0.90066,9.50483 -accelerometer: 13224070917,0.210793,0.70903,9.63897 -accelerometer: 13224090997,0.440748,0.498237,9.1599 -accelerometer: 13224110803,0.632378,1.47555,9.6773 -irProximity:13224118284,0.290196 -accelerometer: 13224130975,0.804845,0.402422,9.84977 -accelerometer: 13224150964,0.574889,0.383259,9.524 -accelerometer: 13224171014,0.536563,0.843171,9.50483 -accelerometer: 13224190942,0.229956,0.613215,9.77311 -accelerometer: 13224210809,0.019163,0.5174,9.94558 -accelerometer: 13224230890,0.134141,0.574889,9.79228 -accelerometer: 13224250940,-0.134141,0.459911,9.40902 -accelerometer: 13224270990,-0.306608,0.670704,9.33237 -accelerometer: 13224290918,-0.32577,0.536563,9.71563 -accelerometer: 13224310785,0.229956,-2.18458,9.23655 -irProximity:13224320066,0.294118 -accelerometer: 13224330927,0.402422,-1.11145,9.38986 -accelerometer: 13224350916,-0.287445,0.5174,9.61981 -accelerometer: 13224370935,0.421585,1.60969,10.1372 -accelerometer: 13224390802,0.977311,1.87797,10.3863 -accelerometer: 13224410761,0.785682,1.95462,10.233 -accelerometer: 13224430872,0.479074,0.019163,9.81144 -accelerometer: 13224450891,-0.0574889,0.766519,9.29404 -accelerometer: 13224470819,-0.32577,0.689867,9.40902 -accelerometer: 13224490900,-0.229956,0.919823,9.02576 -accelerometer: 13224510919,0.19163,0.459911,9.63897 -accelerometer: 13224530908,0.153304,0.459911,9.60065 -accelerometer: 13224550928,-0.0574889,0.210793,9.54316 -accelerometer: 13224570978,0.153304,0.498237,9.81144 -accelerometer: 13224590997,0.229956,0.268282,9.96474 -accelerometer: 13224610986,0.134141,0.32577,9.73479 -irProximity:13224622526,0.290196 -accelerometer: 13224630975,0.0574889,0.32577,9.50483 -accelerometer: 13224650995,0.268282,0.766519,10.0797 -accelerometer: 13224670984,0.383259,0.498237,10.5396 -accelerometer: 13224690942,0.32577,0.613215,10.0797 -accelerometer: 13224710931,0.843171,0.364096,10.0414 -irProximity:13224723356,0.294118 -accelerometer: 13224730920,0.651541,0.402422,9.98391 -accelerometer: 13224750940,0.0383259,0.153304,9.86893 -accelerometer: 13224770837,0.249119,0.19163,10.0222 -accelerometer: 13224790796,0.134141,0.0383259,9.60065 -accelerometer: 13224810816,0.019163,-0.229956,9.84977 -accelerometer: 13224830805,-0.344933,-0.344933,9.3132 -accelerometer: 13224850794,-0.459911,-0.383259,9.79228 -accelerometer: 13224870783,-0.249119,-0.172467,9.60065 -accelerometer: 13224890802,-0.574889,-0.0574889,9.1599 -accelerometer: 13224910791,-0.268282,1.11145,9.524 -accelerometer: 13224930963,0.229956,4.63744,10.2714 -accelerometer: 13224950952,-0.5174,12.9542,11.881 -accelerometer: 13224970972,-1.76299,28.3037,13.6249 -accelerometer: 13224993433,-0.536563,37.157,13.9123 -accelerometer: 13225012933,2.18458,31.868,10.7121 -irProximity:13225025663,0.290196 -accelerometer: 13225030817,2.60616,17.3042,5.40396 -accelerometer: 13225050836,3.71762,-10.7696,6.43876 -accelerometer: 13225070795,10.1372,-39.2458,6.26629 -accelerometer: 13225090814,0.344933,-39.2458,21.6733 -accelerometer: 13225110803,-3.16189,-39.2458,14.0081 -accelerometer: 13225130853,11.6319,-28.0163,-12.8584 -accelerometer: 13225150995,11.2295,-6.63039,-4.06255 -accelerometer: 13225170984,7.47356,2.47202,2.12709 -accelerometer: 13225191004,3.83259,16.9401,3.81343 -accelerometer: 13225210993,2.28039,33.6693,6.24713 -irProximity:13225226896,0.294118 -accelerometer: 13225230982,7.30109,39.2266,9.75395 -accelerometer: 13225252191,11.6319,39.2266,7.41607 -accelerometer: 13225270929,11.3636,39.2266,2.587 -accelerometer: 13225290827,5.36563,35.1832,-1.62885 -accelerometer: 13225310846,-1.05396,9.12157,-3.87092 -irProximity:13225327665,0.290196 -accelerometer: 13225330682,-3.7751,-20.696,-1.47555 -accelerometer: 13225350702,12.0918,-39.2458,2.83612 -accelerometer: 13225370813,6.53457,-39.2458,38.5559 -accelerometer: 13225390802,10.9612,-39.2458,19.757 -accelerometer: 13225410822,19.2971,-21.1176,-10.578 -accelerometer: 13225430750,12.4559,-4.33083,-0.019163 -accelerometer: 13225450800,6.76453,8.18259,2.12709 -accelerometer: 13225470819,-2.52951,29.7601,1.93546 -accelerometer: 13225490991,-7.43523,39.2266,3.23854 -accelerometer: 13225510950,-3.67929,39.2266,2.587 -accelerometer: 13225530969,2.12709,39.2266,0.364096 -accelerometer: 13225550989,0.632378,39.2266,-0.70903 -orientation:13225550989,1 -accelerometer: 13225570764,-2.18458,16.1544,-1.49471 -accelerometer: 13225591058,-0.344933,-15.292,3.4685 -accelerometer: 13225610986,13.4907,-39.2458,9.69646 -irProximity:13225630125,0.294118 -accelerometer: 13225630914,11.3828,-39.2458,32.7687 -accelerometer: 13225651025,10.8079,-39.2458,30.8907 -orientation:13225651025,2 -accelerometer: 13225670923,19.0863,-23.5896,-11.0379 -accelerometer: 13225691034,13.3183,-1.16894,-4.38832 -accelerometer: 13225711023,5.49977,5.174,-1.49471 -irProximity:13225730589,0.290196 -accelerometer: 13225730646,-0.459911,11.3445,-0.268282 -accelerometer: 13225750818,-3.75594,14.1998,0.843171 -accelerometer: 13225770837,-2.587,15.522,2.91277 -accelerometer: 13225790827,-1.62885,15.2154,3.64096 -orientation:13225790827,1 -accelerometer: 13225810785,-1.80132,13.3949,2.87445 -irProximity:13225831510,0.294118 -accelerometer: 13225831079,-0.90066,10.8846,6.68788 -accelerometer: 13225850763,-0.421585,7.85682,8.96827 -accelerometer: 13225870813,-0.0766519,5.15484,9.75395 -accelerometer: 13225890802,0.440748,3.21938,10.2905 -orientation:13225890802,5 -accelerometer: 13225910791,0.919823,1.5522,11.3445 -accelerometer: 13225930689,0.996474,0.134141,12.1493 -irProximity:13225932798,0.290196 -accelerometer: 13225951013,0.383259,-0.0383259,11.2295 -accelerometer: 13225970972,0.0766519,0.019163,11.1528 -accelerometer: 13225990808,-0.287445,0.268282,11.7277 -accelerometer: 13226010980,-0.90066,0.459911,9.27488 -accelerometer: 13226030817,-0.536563,1.68634,9.29404 -accelerometer: 13226050958,0.0383259,0.824008,9.04492 -accelerometer: 13226070947,-0.0574889,0.421585,9.58148 -accelerometer: 13226090967,0.19163,0.632378,10.0989 -accelerometer: 13226110925,0.19163,0.210793,9.61981 -accelerometer: 13226130823,0.651541,-0.19163,9.6773 -accelerometer: 13226150903,0.958148,-0.70903,10.0606 -accelerometer: 13226171137,1.45639,-1.26476,10.9612 -accelerometer: 13226190942,0.958148,-1.83965,10.3672 -accelerometer: 13226210962,1.1881,-1.89713,10.233 -accelerometer: 13226230798,1.14978,-1.83965,10.1564 -accelerometer: 13226250940,1.5522,-1.43722,10.4055 -accelerometer: 13226270899,1.68634,-1.07313,10.7313 -accelerometer: 13226290918,1.51387,-1.7055,9.6773 -accelerometer: 13226310968,1.78216,-1.30308,9.40902 -accelerometer: 13226330743,1.37973,-1.80132,9.63897 -accelerometer: 13226350855,1.13062,-1.59053,10.0606 -accelerometer: 13226370905,0.785682,-1.34141,10.1947 -accelerometer: 13226390894,0.862334,-0.843171,10.1947 -accelerometer: 13226410974,0.689867,-0.824008,9.10241 -accelerometer: 13226430811,1.13062,-0.862334,8.98743 -accelerometer: 13226450861,1.28392,-1.01564,9.61981 -accelerometer: 13226470819,1.3989,-1.26476,10.4821 -accelerometer: 13226490930,1.09229,-0.728193,11.4978 -accelerometer: 13226510950,0.824008,-0.594052,10.5205 -accelerometer: 13226530817,0.5174,-0.977311,8.92994 -irProximity:13226538206,0.294118 -accelerometer: 13226550958,0.229956,-0.919823,7.761 -accelerometer: 13226570947,-1.1881,-0.19163,8.4892 -accelerometer: 13226590936,-0.632378,-0.574889,9.23655 -accelerometer: 13226610803,-0.383259,-0.824008,9.56232 -accelerometer: 13226631159,-0.344933,-0.555726,9.48567 -irProximity:13226639158,0.290196 -accelerometer: 13226650964,-0.421585,-0.632378,9.21739 -accelerometer: 13226670953,-0.344933,-0.632378,9.56232 -accelerometer: 13226690942,-0.19163,-0.459911,9.88809 -accelerometer: 13226710962,-0.0766519,-0.689867,9.79228 -accelerometer: 13226730768,-0.172467,-0.747356,9.50483 -irProximity:13226740079,0.294118 -accelerometer: 13226750940,-0.210793,-0.594052,9.37069 -accelerometer: 13226770837,-0.32577,0.0383259,9.77311 -accelerometer: 13226790765,-0.134141,-0.249119,9.88809 -accelerometer: 13226810785,0.229956,-0.249119,9.98391 -accelerometer: 13226831079,0.0383259,-0.134141,9.54316 -irProximity:13226840940,0.290196 -accelerometer: 13226850702,-0.402422,4.69493,9.50483 -accelerometer: 13226870752,-0.019163,-0.383259,9.50483 -accelerometer: 13226890802,-0.229956,-0.229956,9.65814 -accelerometer: 13226910852,-0.0574889,-0.5174,9.8306 -accelerometer: 13226930963,-0.19163,-0.19163,9.88809 -accelerometer: 13226950922,-0.019163,-0.306608,9.56232 -accelerometer: 13226970972,-0.229956,0.19163,10.0606 -accelerometer: 13226990778,-0.306608,-0.210793,9.48567 -accelerometer: 13227010858,-0.249119,-0.364096,9.48567 -accelerometer: 13227030786,0.134141,-0.498237,9.50483 -accelerometer: 13227050897,-0.651541,-0.574889,7.81849 -accelerometer: 13227070947,-0.421585,0.019163,9.44734 -accelerometer: 13227091028,-0.32577,0.210793,9.77311 -accelerometer: 13227110986,-0.210793,-0.344933,9.90726 -accelerometer: 13227131006,-0.689867,0.210793,10.0414 -accelerometer: 13227151025,-0.229956,-0.498237,10.0414 -accelerometer: 13227170984,-0.440748,-0.229956,10.1564 -accelerometer: 13227190790,-0.0383259,-0.210793,9.94558 -accelerometer: 13227210993,-0.268282,-0.0958148,9.81144 -accelerometer: 13227230585,-0.670704,0.306608,9.0066 -accelerometer: 13227250818,-1.16894,-0.114978,8.2784 -accelerometer: 13227270593,-0.459911,-0.153304,9.3132 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_slam.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_slam.dat deleted file mode 100644 index 0ec937c1..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_slam.dat +++ /dev/null @@ -1,595 +0,0 @@ -orientation:292851575,5 -irProximity:294683453,0.376471 -accelerometer: 294751325,-0.19163,4.31167,9.42818 -accelerometer: 294851270,0.0766519,4.44581,9.37069 -accelerometer: 294951276,0.938986,5.30814,8.31673 -accelerometer: 295051252,0.364096,5.48061,8.62334 -accelerometer: 295151227,-0.824008,5.86387,7.30109 -orientation:295251264,1 -accelerometer: 295251264,-1.95462,7.70351,5.90219 -accelerometer: 295351239,-0.172467,7.43523,6.36211 -accelerometer: 295451276,-0.5174,7.66519,7.01365 -accelerometer: 295551221,-0.229956,7.68435,5.40396 -accelerometer: 295651258,-0.843171,9.42818,4.31167 -accelerometer: 295751264,0.958148,9.46651,4.90572 -accelerometer: 295851026,1.37973,9.96474,3.71762 -accelerometer: 295951276,2.4337,10.4055,5.67224 -accelerometer: 296051282,0.843171,13.0691,5.23149 -accelerometer: 296151288,-0.19163,9.21739,4.69493 -accelerometer: 296251325,-0.747356,9.46651,2.98942 -accelerometer: 296351270,-0.651541,10.5971,1.16894 -accelerometer: 296451032,-1.64802,9.38986,1.22643 -accelerometer: 296551221,-5.6914,6.43876,0.383259 -orientation:296651227,3 -accelerometer: 296651227,-7.47356,4.59911,-0.249119 -accelerometer: 296751203,-6.99448,4.1392,-0.306608 -accelerometer: 296851331,-7.01365,1.41806,-0.229956 -accelerometer: 296951246,-12.8009,-38.92,4.54162 -accelerometer: 297051343,39.2266,-39.2458,38.7284 -accelerometer: 297151258,39.2266,-2.51035,33.037 -accelerometer: 297251264,15.2729,-2.83612,4.1392 -orientation:297351270,4 -accelerometer: 297351270,14.2956,-3.43017,3.52599 -accelerometer: 297451246,14.9854,1.59053,2.18458 -accelerometer: 297551221,12.1302,4.5033,2.28039 -accelerometer: 297651258,-0.785682,2.98942,-0.421585 -accelerometer: 297751264,-4.36916,2.98942,1.5522 -accelerometer: 297851239,-7.9718,2.01211,0.90066 -accelerometer: 297951032,-7.58854,6.86034,-1.20727 -orientation:298051191,1 -accelerometer: 298051191,-6.0555,8.56585,0.153304 -accelerometer: 298151288,-6.36211,7.2436,0.670704 -accelerometer: 298251233,-5.78722,7.6077,0.594052 -accelerometer: 298351331,-5.44228,8.18259,0.670704 -accelerometer: 298451246,-5.49977,8.31673,0.90066 -accelerometer: 298551191,-6.24713,7.81849,1.28392 -accelerometer: 298651227,-6.13215,7.58854,0.804845 -accelerometer: 298751294,-5.97885,7.58854,0.670704 -accelerometer: 298851239,-5.72973,7.79933,0.824008 -accelerometer: 298951337,-6.30462,8.2784,0.881497 -accelerometer: 299051221,-6.64955,7.72268,0.498237 -accelerometer: 299151227,-6.53457,7.14779,0.402422 -accelerometer: 299251264,-7.47356,1.28392,0.0574889 -accelerometer: 299351239,-7.56937,-5.95968,1.43722 -accelerometer: 299451246,-12.5901,-30.8524,13.7398 -accelerometer: 299551252,39.2266,-17.9174,-7.51188 -accelerometer: 299651258,15.1962,-5.25065,1.57136 -accelerometer: 299751264,22.7656,-1.47555,3.52599 -accelerometer: 299851239,18.3773,-0.881497,4.23502 -accelerometer: 299951276,3.43017,0.613215,1.72467 -accelerometer: 300051008,-2.35705,1.99295,0.268282 -accelerometer: 300151258,-5.67224,3.21938,-0.306608 -orientation:300251050,3 -accelerometer: 300251050,-7.22444,5.174,0 -accelerometer: 300351209,-5.67224,8.08677,0.229956 -orientation:300451337,1 -accelerometer: 300451337,-4.46497,9.14074,0.70903 -accelerometer: 300551160,-4.84823,8.73831,0.670704 -accelerometer: 300651044,-5.09735,8.06761,0.555726 -accelerometer: 300751233,-4.71409,8.69999,0.632378 -accelerometer: 300851270,-5.34647,8.01012,0.594052 -accelerometer: 300951246,-5.32731,8.29757,0.344933 -accelerometer: 301051648,-5.42312,7.83765,0.728193 -accelerometer: 301151471,-5.15484,7.79933,0.268282 -accelerometer: 301251264,-5.5381,8.14426,0.210793 -accelerometer: 301351209,-5.63391,7.85682,0.268282 -accelerometer: 301451520,-5.09735,8.52752,0.383259 -accelerometer: 301551221,-5.34647,8.06761,-0.19163 -accelerometer: 301651258,-5.174,8.1251,0.766519 -accelerometer: 301751050,-5.28898,7.95263,-0.172467 -accelerometer: 301851300,-5.95968,8.56585,0.249119 -accelerometer: 301951215,-5.23149,8.20175,-0.172467 -accelerometer: 302051252,-5.55726,8.22091,-0.459911 -accelerometer: 302151014,-5.63391,7.70351,-0.019163 -accelerometer: 302251233,-5.80638,6.59206,0.268282 -accelerometer: 302351270,-7.39691,-3.4685,0.689867 -accelerometer: 302451276,-21.5583,-38.6134,7.14779 -accelerometer: 302551191,39.2266,-39.2458,27.3456 -accelerometer: 302651258,18.1665,-10.6354,4.38832 -accelerometer: 302751172,21.3284,-4.75242,2.41453 -accelerometer: 302851270,13.3566,-5.55726,4.1392 -accelerometer: 302951307,12.7434,-0.90066,2.2229 -accelerometer: 303051221,-1.3989,-0.574889,1.32224 -accelerometer: 303151319,-9.14074,1.36057,0.958148 -orientation:303251264,3 -accelerometer: 303251264,-10.463,1.87797,1.0348 -accelerometer: 303351239,-7.14779,7.26277,1.09229 -accelerometer: 303451276,-6.78369,6.99448,1.66718 -accelerometer: 303551252,-6.51541,7.33942,1.64802 -accelerometer: 303651197,-6.0555,6.53457,1.3989 -orientation:303751233,1 -accelerometer: 303751233,-5.5381,6.97532,1.09229 -accelerometer: 303851239,-5.71057,8.91078,0.689867 -accelerometer: 303951246,-5.30814,8.68083,2.08876 -accelerometer: 304051252,-5.42312,7.41607,1.72467 -accelerometer: 304151227,-5.59559,7.58854,2.01211 -accelerometer: 304251020,-5.174,8.04845,1.05396 -accelerometer: 304351239,-5.49977,8.45087,1.1881 -accelerometer: 304451307,-5.5381,7.79933,1.51387 -accelerometer: 304551221,-5.05902,8.10594,0.977311 -accelerometer: 304651319,-5.80638,8.20175,1.0348 -accelerometer: 304751233,-5.34647,8.08677,1.05396 -accelerometer: 304851026,-5.6914,7.81849,1.22643 -accelerometer: 304951276,-5.46145,8.06761,1.37973 -accelerometer: 305051282,-6.01717,7.89514,1.3989 -accelerometer: 305151258,-5.5381,8.18259,0.90066 -accelerometer: 305251325,-5.51894,7.93347,0.90066 -accelerometer: 305351239,-5.61475,8.35505,1.07313 -accelerometer: 305451276,-5.86387,7.66519,0.287445 -accelerometer: 305551252,-6.40043,5.84471,1.1881 -accelerometer: 305651227,-7.51188,-2.87445,0.747356 -accelerometer: 305751264,33.1328,-39.2458,15.6561 -accelerometer: 305851239,38.0193,-24.7202,7.32025 -accelerometer: 305951276,18.4731,-7.30109,15.5795 -accelerometer: 306051252,16.7293,-7.33942,3.96673 -accelerometer: 306151227,12.1876,-3.66013,2.7403 -accelerometer: 306251233,7.03281,-1.62885,0.19163 -accelerometer: 306351026,-8.45087,-0.632378,1.11145 -accelerometer: 306451246,-11.4403,-0.287445,2.05044 -accelerometer: 306551252,-9.33237,4.06255,0.440748 -accelerometer: 306651258,-6.70704,8.43171,-0.632378 -accelerometer: 306751325,-6.87951,6.55374,0.824008 -accelerometer: 306851239,-7.05197,6.11299,1.37973 -accelerometer: 306951032,-6.51541,6.937,0.747356 -accelerometer: 307051252,-6.55374,6.76453,1.36057 -accelerometer: 307151258,-6.99448,7.12862,1.64802 -accelerometer: 307251233,-6.11299,7.30109,0.824008 -accelerometer: 307351362,-7.05197,7.47356,0.670704 -accelerometer: 307451276,-6.11299,6.74537,0.804845 -accelerometer: 307551008,-6.40043,7.55021,0.958148 -accelerometer: 307651227,-6.49625,7.22444,1.30308 -accelerometer: 307751233,-6.24713,7.43523,1.28392 -accelerometer: 307851270,-6.43876,7.6077,1.20727 -accelerometer: 307951307,-6.11299,7.47356,1.09229 -accelerometer: 308051221,-6.32378,7.32025,1.45639 -accelerometer: 308151258,-6.18964,7.74184,1.09229 -accelerometer: 308251233,-6.26629,7.81849,0.862334 -accelerometer: 308351270,-6.24713,7.12862,1.07313 -accelerometer: 308451032,-7.14779,2.45286,1.59053 -accelerometer: 308551252,-8.2784,-8.18259,4.44581 -accelerometer: 308651258,-10.9229,-32.5004,7.78017 -accelerometer: 308751203,25.9467,-8.18259,30.335 -accelerometer: 308851362,19.1821,-1.05396,11.2487 -accelerometer: 308951276,15.5603,-5.59559,6.76453 -accelerometer: 309051191,3.18105,-0.613215,2.24207 -accelerometer: 309151044,0.824008,1.99295,1.01564 -accelerometer: 309251264,1.64802,4.92488,1.89713 -accelerometer: 309351270,0.594052,6.15131,3.12356 -accelerometer: 309451337,2.26123,5.65308,5.72973 -accelerometer: 309551252,6.40043,7.39691,7.87598 -accelerometer: 309651227,7.03281,5.95968,10.4438 -accelerometer: 309751264,1.82048,5.07819,7.85682 -accelerometer: 309851239,2.77863,5.94052,5.63391 -irProximity:309952678,0.392157 -orientation:309951215,5 -accelerometer: 309951215,1.76299,5.65308,7.20528 -irProximity:310053966,0.466667 -accelerometer: 310051008,2.2229,5.63391,7.12862 -accelerometer: 310151258,3.06608,5.88303,6.99448 -irProximity:310254985,0.580392 -accelerometer: 310251264,3.16189,6.38127,8.01012 -accelerometer: 310351270,2.03127,4.73325,6.86034 -irProximity:310456065,0.513726 -accelerometer: 310451246,1.28392,4.36916,6.76453 -accelerometer: 310551038,2.10793,2.56784,8.66166 -irProximity:310657115,0.505882 -accelerometer: 310651227,1.5522,-0.268282,7.85682 -accelerometer: 310751233,1.64802,-0.574889,11.3636 -accelerometer: 310851239,0.0574889,-0.19163,9.63897 -irProximity:310857982,0.52549 -accelerometer: 310951368,0.114978,0.632378,8.4892 -accelerometer: 311051252,0.268282,1.14978,9.71563 -irProximity:311058879,0.521569 -accelerometer: 311151014,1.43722,0.019163,9.79228 -accelerometer: 311251264,1.83965,1.05396,9.63897 -irProximity:311260173,0.631373 -accelerometer: 311351300,0.881497,0.785682,9.88809 -accelerometer: 311451246,-0.287445,-0.364096,7.01365 -irProximity:311461559,0.639216 -accelerometer: 311551313,-0.153304,0.0766519,9.23655 -accelerometer: 311651227,-0.249119,0.287445,9.79228 -irProximity:311662608,0.384314 -accelerometer: 311751294,-0.0766519,0.5174,9.73479 -accelerometer: 311851270,-0.0766519,0.210793,9.56232 -irProximity:311865062,0.376471 -accelerometer: 311951307,0.134141,0.440748,9.50483 -accelerometer: 312051221,-0.0958148,0.249119,9.35153 -accelerometer: 312151258,-0.0383259,0.0958148,9.61981 -accelerometer: 312251264,-0.114978,0.114978,9.33237 -accelerometer: 312351239,0.383259,0.0574889,9.84977 -accelerometer: 312451276,-0.172467,0.306608,9.42818 -accelerometer: 312551221,0.0766519,0.134141,9.65814 -accelerometer: 312651014,-0.019163,0.383259,9.524 -accelerometer: 312751264,0.019163,0.153304,9.56232 -accelerometer: 312851270,-0.0958148,0.306608,9.73479 -accelerometer: 312951246,0.019163,0.153304,9.6773 -accelerometer: 313051282,-0.153304,0.249119,9.40902 -accelerometer: 313151258,0.134141,0.249119,9.50483 -accelerometer: 313251020,0.114978,0.0383259,9.6773 -accelerometer: 313351270,-0.172467,0.364096,9.25571 -accelerometer: 313451307,-0.229956,0.210793,9.46651 -accelerometer: 313551282,-0.210793,0.5174,9.37069 -accelerometer: 313651136,-0.19163,0.114978,9.38986 -accelerometer: 313751264,0.153304,-0.019163,9.58148 -accelerometer: 313851270,-0.210793,0.344933,9.54316 -accelerometer: 313951276,-0.0383259,0.114978,9.42818 -accelerometer: 314051252,-0.0766519,0.594052,9.77311 -accelerometer: 314151258,0.19163,0.172467,9.65814 -accelerometer: 314251264,-0.249119,0.287445,9.42818 -accelerometer: 314351239,0.019163,0.153304,9.48567 -accelerometer: 314451276,-0.32577,0.134141,9.524 -accelerometer: 314551221,0.0958148,-0.019163,9.54316 -accelerometer: 314651227,0.210793,0.153304,9.65814 -accelerometer: 314751020,-0.268282,0.153304,9.61981 -accelerometer: 314851270,-0.0958148,0.153304,9.48567 -accelerometer: 314951307,-0.0958148,0.306608,9.524 -accelerometer: 315051252,0.114978,0.229956,9.29404 -accelerometer: 315151319,0.249119,0.134141,9.73479 -accelerometer: 315251203,0.153304,0,9.63897 -accelerometer: 315351026,-0.0383259,0.114978,9.61981 -accelerometer: 315451276,0.0574889,0.19163,9.58148 -accelerometer: 315551252,-0.172467,0.306608,9.54316 -accelerometer: 315651593,-0.153304,0.364096,9.46651 -accelerometer: 315751386,-0.249119,0.0958148,9.61981 -accelerometer: 315851270,-0.019163,0.479074,9.21739 -accelerometer: 315951276,-0.0574889,0,9.44734 -accelerometer: 316051343,-0.0574889,0.306608,9.33237 -accelerometer: 316151258,-0.268282,0,9.58148 -accelerometer: 316251264,-0.0574889,0.498237,9.6773 -accelerometer: 316351239,0.019163,-0.785682,9.73479 -accelerometer: 316451246,-0.0574889,0.19163,9.61981 -accelerometer: 316551252,-0.019163,0.0958148,9.60065 -accelerometer: 316651258,-0.172467,0.728193,9.54316 -accelerometer: 316751233,0.134141,0.344933,9.54316 -accelerometer: 316851026,-0.134141,0.0958148,9.524 -accelerometer: 316951276,0.0958148,0.383259,9.81144 -accelerometer: 317051252,-0.0574889,0.153304,9.44734 -accelerometer: 317151258,-0.134141,0.153304,9.29404 -accelerometer: 317251294,-0.19163,0.421585,9.81144 -accelerometer: 317351270,-0.32577,0.5174,9.524 -accelerometer: 317451032,-0.172467,0.287445,9.48567 -accelerometer: 317551313,0.114978,0.287445,9.44734 -accelerometer: 317651227,0.134141,0.114978,9.33237 -accelerometer: 317751264,-0.0958148,0.364096,9.60065 -accelerometer: 317851331,-0.0958148,0.0766519,9.35153 -accelerometer: 317951276,-0.172467,0.402422,9.524 -accelerometer: 318051313,-0.019163,0.134141,9.33237 -accelerometer: 318151258,0.114978,0.134141,9.77311 -accelerometer: 318251233,0.0574889,0,9.88809 -accelerometer: 318351270,0.0574889,0.364096,9.77311 -accelerometer: 318451276,-0.172467,0.134141,9.61981 -accelerometer: 318551252,-0.210793,0.364096,9.65814 -accelerometer: 318651258,-0.134141,0.249119,9.58148 -accelerometer: 318751264,-0.0574889,0.019163,9.27488 -accelerometer: 318851026,-0.0383259,0.19163,9.58148 -accelerometer: 318951276,-0.0958148,0.134141,9.63897 -accelerometer: 319051252,0.172467,0.229956,9.61981 -accelerometer: 319151258,-0.0958148,0.210793,9.50483 -accelerometer: 319251233,0.134141,0.172467,9.56232 -accelerometer: 319351331,-0.210793,0.19163,9.40902 -accelerometer: 319451276,-0.0766519,0.114978,9.42818 -accelerometer: 319550977,0.0766519,0.249119,9.44734 -accelerometer: 319650953,-0.421585,0.210793,9.42818 -accelerometer: 319751264,0.019163,0,9.37069 -accelerometer: 319851270,-0.229956,0.440748,9.40902 -accelerometer: 319951337,-0.229956,0.114978,9.42818 -accelerometer: 320051252,0.114978,-0.019163,9.21739 -accelerometer: 320151258,-0.0574889,0.32577,9.23655 -accelerometer: 320251264,0.114978,0.0383259,9.54316 -accelerometer: 320351270,-0.172467,-0.0383259,9.50483 -accelerometer: 320451276,0.0574889,-0.019163,9.77311 -accelerometer: 320551282,-0.0383259,0.153304,9.65814 -accelerometer: 320651197,-0.172467,0.229956,9.61981 -accelerometer: 320751355,-0.019163,0.249119,9.46651 -accelerometer: 320851270,-0.172467,0.364096,9.25571 -accelerometer: 320951246,-0.172467,0.306608,9.48567 -accelerometer: 321051008,0.0383259,0.32577,9.27488 -accelerometer: 321151014,0,0.0958148,9.524 -accelerometer: 321251264,-0.0574889,-0.0958148,9.40902 -accelerometer: 321351270,-0.134141,0.134141,9.61981 -accelerometer: 321451185,0.32577,-0.0766519,9.58148 -accelerometer: 321551221,-0.210793,0.210793,9.44734 -accelerometer: 321651014,-0.32577,0.32577,9.524 -accelerometer: 321751264,-0.153304,0.134141,9.6773 -accelerometer: 321851239,0.114978,0.172467,9.1599 -accelerometer: 321951276,-0.019163,0.32577,9.58148 -accelerometer: 322051313,0.0766519,0.268282,9.44734 -accelerometer: 322151258,-0.5174,0.306608,9.50483 -accelerometer: 322251233,-0.0766519,0.0383259,9.48567 -accelerometer: 322351270,-0.172467,0.249119,9.46651 -accelerometer: 322451246,-0.0958148,0.364096,9.25571 -accelerometer: 322551252,-0.0766519,0.0383259,9.56232 -accelerometer: 322651227,-0.19163,0.19163,9.63897 -accelerometer: 322751233,-0.229956,0.0574889,9.44734 -accelerometer: 322851270,0.0383259,0.268282,9.6773 -accelerometer: 322951246,-0.0958148,0.0958148,9.60065 -accelerometer: 323051008,-0.0383259,1.30308,9.48567 -accelerometer: 323151014,-0.0766519,0.210793,9.65814 -accelerometer: 323251264,0.019163,-0.153304,9.69646 -accelerometer: 323351239,-0.268282,0.019163,9.44734 -accelerometer: 323451276,-0.229956,0.32577,9.35153 -accelerometer: 323551313,-0.019163,0.229956,9.21739 -accelerometer: 323651258,0.0574889,0.344933,9.73479 -accelerometer: 323751020,-0.0574889,0.19163,9.48567 -accelerometer: 323851270,-0.0766519,0.402422,9.38986 -accelerometer: 323951246,0.0574889,0.153304,9.35153 -accelerometer: 324051252,0.0766519,0.153304,9.58148 -accelerometer: 324151319,0,0.172467,9.48567 -accelerometer: 324251294,-0.210793,0.306608,9.35153 -accelerometer: 324351270,-0.153304,0.0766519,9.58148 -accelerometer: 324451276,0.229956,0.210793,9.48567 -accelerometer: 324551221,0.019163,0.210793,9.63897 -accelerometer: 324651258,0.019163,0.268282,9.37069 -accelerometer: 324751264,-0.210793,0.0766519,9.35153 -accelerometer: 324851270,-0.0383259,0.344933,9.58148 -accelerometer: 324951276,0.0383259,0.249119,9.58148 -accelerometer: 325051252,0.114978,0.0574889,9.65814 -accelerometer: 325151258,-0.134141,0.134141,9.37069 -accelerometer: 325251020,-0.287445,0.344933,9.0066 -accelerometer: 325351270,0.019163,0.5174,9.37069 -accelerometer: 325451307,-0.0574889,0.344933,9.60065 -accelerometer: 325551252,0.019163,0.0383259,9.54316 -accelerometer: 325651319,-0.0958148,0.229956,9.6773 -accelerometer: 325751264,0.019163,0.459911,9.58148 -accelerometer: 325851026,0.0383259,-0.0383259,9.524 -accelerometer: 325951276,-0.114978,0.287445,9.61981 -accelerometer: 326051313,0.0958148,0.172467,9.46651 -accelerometer: 326151258,-0.0383259,0.306608,9.6773 -accelerometer: 326251355,-0.19163,0.210793,9.40902 -accelerometer: 326351270,-0.153304,-0.019163,9.60065 -accelerometer: 326451276,-0.0766519,0.153304,9.40902 -accelerometer: 326551221,-0.249119,0.287445,9.54316 -accelerometer: 326651258,0,0.153304,9.38986 -accelerometer: 326751294,0.134141,0.344933,9.56232 -accelerometer: 326851270,-0.229956,0.421585,9.46651 -accelerometer: 326951093,-0.229956,0.19163,9.54316 -accelerometer: 327051252,-0.364096,0.574889,9.50483 -accelerometer: 327151258,-0.0574889,0.249119,9.79228 -accelerometer: 327251264,-0.268282,0.0766519,9.3132 -accelerometer: 327351026,-0.0766519,0.0574889,9.42818 -accelerometer: 327451246,0.134141,0.19163,9.63897 -accelerometer: 327551252,-0.249119,0.440748,9.54316 -accelerometer: 327651227,-0.268282,0.306608,9.40902 -accelerometer: 327751142,0.0574889,0.0383259,9.56232 -accelerometer: 327851270,-0.306608,0.421585,9.69646 -accelerometer: 327951062,0,0.287445,9.61981 -accelerometer: 328051252,-0.210793,0.364096,9.44734 -accelerometer: 328151258,0.019163,0.153304,9.63897 -accelerometer: 328251264,-0.153304,0.153304,9.3132 -accelerometer: 328351362,0,0.172467,9.61981 -accelerometer: 328451276,-0.0958148,0.134141,9.56232 -accelerometer: 328551221,-0.0766519,0.383259,9.69646 -accelerometer: 328651258,-0.0958148,0.114978,9.33237 -accelerometer: 328751477,0.0958148,0.383259,9.8306 -accelerometer: 328851117,-0.0958148,0.153304,9.29404 -accelerometer: 328951246,-0.0766519,0.172467,9.61981 -accelerometer: 329051252,-0.210793,0.268282,9.60065 -accelerometer: 329151227,0.019163,0.114978,9.92642 -accelerometer: 329251264,-0.134141,0.229956,9.54316 -accelerometer: 329351239,-0.229956,0.229956,9.61981 -accelerometer: 329451032,-0.268282,0.421585,9.19823 -accelerometer: 329551252,-0.153304,0.0383259,9.60065 -accelerometer: 329651258,-0.0574889,0.268282,9.61981 -accelerometer: 329751264,-0.0766519,0.364096,9.48567 -accelerometer: 329851331,-0.114978,0.383259,9.524 -accelerometer: 329951276,-0.19163,0.287445,8.87245 -irProximity:329965036,0.443137 -accelerometer: 330051252,0.249119,-1.28392,10.8079 -irProximity:330066538,0.486275 -accelerometer: 330151258,-2.10793,-5.05902,15.2346 -accelerometer: 330251233,-0.0958148,-3.94757,13.6824 -irProximity:330267557,0.4 -accelerometer: 330351239,-1.1881,5.46145,3.89008 -irProximity:330368875,0.407843 -accelerometer: 330451368,-2.16542,7.85682,7.56937 -irProximity:330470224,0.392157 -accelerometer: 330551252,-0.862334,11.7277,4.12004 -irProximity:330571543,0.376471 -accelerometer: 330651227,5.26982,6.91783,9.98391 -accelerometer: 330751264,6.36211,8.04845,7.58854 -accelerometer: 330851270,0.555726,5.09735,5.28898 -accelerometer: 330951246,-1.97379,4.44581,6.89867 -accelerometer: 331051252,-6.80285,2.01211,4.69493 -orientation:331151319,3 -accelerometer: 331151319,-8.71915,2.31872,5.00153 -accelerometer: 331251050,-9.42818,0.70903,4.21585 -accelerometer: 331351270,-5.78722,-1.1881,1.66718 -accelerometer: 331451246,-6.36211,-10.7313,4.25418 -accelerometer: 331551069,-14.7555,-39.2458,9.3132 -accelerometer: 331651258,39.2266,-20.8876,19.7379 -accelerometer: 331751233,24.5861,-2.89361,-4.75242 -accelerometer: 331851270,12.4943,-8.52752,8.92994 -accelerometer: 331951337,12.5326,-5.03986,2.47202 -accelerometer: 332051252,12.9733,-0.479074,2.79779 -accelerometer: 332151014,7.30109,0.747356,0.90066 -accelerometer: 332251325,4.56079,3.60264,2.16542 -accelerometer: 332351300,-2.18458,5.19316,1.53304 -accelerometer: 332451276,-5.57642,4.42665,0.555726 -accelerometer: 332551313,-8.35505,5.80638,-0.824008 -accelerometer: 332651258,-7.64602,6.91783,0.172467 -accelerometer: 332751233,-5.99801,6.70704,0.747356 -accelerometer: 332851270,-8.1251,6.01717,-0.0958148 -accelerometer: 332951246,-7.99096,5.63391,0.728193 -accelerometer: 333051191,-6.82202,6.03634,0.632378 -accelerometer: 333151227,-8.10594,4.00506,0.804845 -accelerometer: 333251325,-10.0031,-2.97026,0.249119 -accelerometer: 333351270,-10.3672,-21.2517,5.23149 -accelerometer: 333451246,35.1832,-32.7304,-13.7207 -accelerometer: 333551252,20.0828,-10.5205,12.1302 -accelerometer: 333651014,17.3042,-6.03634,-3.73678 -accelerometer: 333751233,10.4055,-4.79074,2.51035 -accelerometer: 333851270,13.05,-0.958148,0.919823 -orientation:333951276,4 -accelerometer: 333951276,12.3218,-0.19163,0.498237 -accelerometer: 334051313,6.09382,4.27334,-1.36057 -accelerometer: 334151258,-0.728193,2.75947,-1.24559 -accelerometer: 334251111,-5.61475,2.47202,1.24559 -accelerometer: 334351239,-8.50836,4.1392,-0.574889 -accelerometer: 334451307,-6.03634,9.19823,0.0383259 -accelerometer: 334551252,-7.81849,7.74184,0.958148 -accelerometer: 334651166,-5.42312,7.20528,0.881497 -orientation:334751264,1 -accelerometer: 334751264,-5.34647,8.16343,1.45639 -accelerometer: 334851178,-5.67224,8.35505,1.78216 -accelerometer: 334951276,-6.28545,7.2436,1.59053 -accelerometer: 335051252,-6.66871,6.82202,1.5522 -accelerometer: 335151258,-3.66013,9.02576,0.536563 -accelerometer: 335251996,-5.6914,7.26277,0.938986 -accelerometer: 335351270,-6.91783,4.48413,0.766519 -accelerometer: 335451276,-7.78017,-14.7172,-0.0766519 -accelerometer: 335551252,22.2865,-39.2458,-3.33436 -accelerometer: 335651258,39.2266,-24.1837,-3.69845 -accelerometer: 335751020,18.9905,-2.64449,-1.53304 -accelerometer: 335851270,15.2729,-4.23502,0.306608 -accelerometer: 335951093,14.9471,-3.56431,2.97026 -accelerometer: 336051252,13.759,-2.33788,0.670704 -accelerometer: 336151319,16.9592,4.23502,-1.09229 -accelerometer: 336251111,-4.23502,-0.728193,1.09229 -accelerometer: 336351026,-7.0903,-0.172467,-0.364096 -accelerometer: 336451276,-8.58501,4.98237,-0.287445 -accelerometer: 336551252,-7.89514,5.48061,2.29956 -orientation:336651227,3 -accelerometer: 336651227,-7.66519,5.48061,0.728193 -accelerometer: 336751294,-8.54668,5.30814,0.402422 -accelerometer: 336851270,-8.02928,5.46145,0.440748 -accelerometer: 336951276,-7.74184,5.71057,1.51387 -accelerometer: 337051038,-7.761,5.32731,0.479074 -accelerometer: 337151227,-8.37422,5.11651,1.43722 -accelerometer: 337251233,-7.56937,6.70704,0.728193 -accelerometer: 337351270,-9.02576,4.77158,0.402422 -accelerometer: 337451246,-8.98743,-0.766519,1.09229 -accelerometer: 337551252,-8.69999,-7.37774,0.670704 -accelerometer: 337651197,-4.54162,-21.1176,4.88656 -accelerometer: 337751447,39.2266,-39.2458,5.30814 -accelerometer: 337851056,17.3617,-4.86739,7.28193 -accelerometer: 337951276,15.4837,-3.9859,-2.49119 -accelerometer: 338051221,12.8584,-4.02422,0.785682 -accelerometer: 338151136,25.4484,7.26277,2.85528 -accelerometer: 338251386,6.34294,-0.210793,-0.919823 -accelerometer: 338351270,1.14978,2.0696,1.1881 -accelerometer: 338451032,-4.71409,3.87092,-0.172467 -accelerometer: 338551221,-4.34999,6.0555,1.01564 -accelerometer: 338651288,-4.59911,7.55021,3.52599 -accelerometer: 338751264,-1.51387,8.39338,4.42665 -accelerometer: 338851392,-0.651541,10.0606,-1.11145 -accelerometer: 338951246,0.229956,11.6894,-4.04339 -accelerometer: 339051252,3.4685,9.37069,-3.02775 -orientation:339151258,1 -accelerometer: 339151258,3.27687,9.02576,-1.5522 -accelerometer: 339251264,1.64802,9.10241,0.306608 -accelerometer: 339351270,1.45639,9.40902,-0.019163 -accelerometer: 339451276,1.26476,9.84977,-0.19163 -accelerometer: 339551221,-0.134141,12.0918,1.32224 -accelerometer: 339651258,-1.01564,11.9769,4.34999 -accelerometer: 339751233,-2.89361,12.9158,4.77158 -accelerometer: 339851270,-2.05044,10.0031,3.96673 -accelerometer: 339951032,-1.1881,7.93347,3.92841 -accelerometer: 340051221,2.03127,6.40043,1.82048 -accelerometer: 340151227,2.01211,8.6425,2.54868 -accelerometer: 340251264,5.71057,7.0903,1.9163 -accelerometer: 340351331,7.33942,4.88656,-0.5174 -irProximity:340381173,0.380392 -orientation:340451246,4 -accelerometer: 340451246,9.29404,4.92488,-1.24559 -accelerometer: 340551008,7.28193,6.91783,1.26476 -accelerometer: 340651258,9.04492,6.13215,-0.421585 -accelerometer: 340751233,9.40902,6.45792,-1.85881 -accelerometer: 340851239,6.937,6.15131,-1.28392 -accelerometer: 340951368,7.51188,6.30462,-1.16894 -irProximity:340986917,0.376471 -accelerometer: 341051221,7.83765,5.95968,-0.785682 -accelerometer: 341151258,5.92136,8.81497,-4.34999 -accelerometer: 341251233,6.95616,7.28193,-3.23854 -accelerometer: 341351300,7.35858,6.18964,-1.82048 -accelerometer: 341451215,7.89514,6.07466,-0.19163 -accelerometer: 341551221,8.37422,1.64802,1.43722 -accelerometer: 341651258,12.3601,-8.81497,4.54162 -accelerometer: 341751233,0.306608,-33.3052,7.14779 -accelerometer: 341851209,-39.2458,-13.874,7.20528 -accelerometer: 341951246,-22.2099,-4.96321,-2.05044 -accelerometer: 342051038,-10.1755,-6.13215,0.862334 -accelerometer: 342151410,-11.6319,-4.10088,0.479074 -accelerometer: 342251264,-15.2154,0.881497,-0.229956 -accelerometer: 342351239,-8.7958,1.82048,-0.632378 -accelerometer: 342451337,-0.651541,2.29956,-0.919823 -accelerometer: 342551221,6.95616,4.23502,0.32577 -accelerometer: 342651014,6.45792,5.80638,-0.229956 -accelerometer: 342751233,7.12862,7.10946,0.249119 -accelerometer: 342851300,6.53457,7.16695,-0.364096 -accelerometer: 342951276,6.87951,7.33942,-0.249119 -accelerometer: 343051313,7.28193,7.07114,0.0766519 -accelerometer: 343151227,6.97532,6.84118,0.306608 -accelerometer: 343251264,7.6077,6.91783,-0.0766519 -accelerometer: 343351300,7.41607,6.55374,-0.19163 -accelerometer: 343451276,8.56585,4.21585,0.785682 -accelerometer: 343551252,8.4892,-7.32025,3.00859 -accelerometer: 343651258,3.96673,-24.9502,3.89008 -accelerometer: 343751233,-28.4953,-30.45,-2.70198 -accelerometer: 343851239,-19.7762,-5.61475,-0.287445 -accelerometer: 343951246,-11.6511,-4.29251,0.32577 -orientation:344051252,3 -accelerometer: 344051252,-10.6929,-4.19669,0.459911 -accelerometer: 344151166,-13.3374,-3.33436,1.30308 -accelerometer: 344251233,-14.1614,0.0383259,-0.172467 -accelerometer: 344351300,-8.16343,1.78216,-1.32224 -accelerometer: 344451276,-2.24207,3.83259,-0.498237 -accelerometer: 344551313,9.12157,0.536563,0.70903 -orientation:344651258,4 -accelerometer: 344651258,9.25571,2.18458,0.440748 -irProximity:344728036,0.380392 -accelerometer: 344751050,8.39338,4.75242,0.0383259 -accelerometer: 344851270,8.7958,5.67224,-0.0766519 -accelerometer: 344951307,8.45087,5.55726,-0.019163 -accelerometer: 345051252,8.20175,5.6914,-0.421585 -accelerometer: 345151319,7.99096,5.57642,-0.344933 -accelerometer: 345251233,8.68083,5.0207,-0.0958148 -accelerometer: 345351239,9.25571,3.87092,0.0766519 -accelerometer: 345451276,10.2714,0.287445,1.09229 -irProximity:345536569,0.376471 -accelerometer: 345551252,0.574889,-24.4903,3.00859 -accelerometer: 345651258,-6.26629,-39.2458,1.9163 -irProximity:345738778,0.384314 -accelerometer: 345751294,-39.2458,-33.7843,5.19316 -irProximity:345840157,0.392157 -accelerometer: 345851331,-14.0848,-11.6702,0.402422 -irProximity:345941506,0.380392 -accelerometer: 345951062,-9.73479,-6.38127,-0.172467 -irProximity:346043160,0.376471 -accelerometer: 346051038,-12.8967,-5.80638,0.862334 -accelerometer: 346151349,-15.5412,-2.89361,-0.919823 -accelerometer: 346251020,-7.93347,3.06608,-0.70903 -accelerometer: 346351239,-0.421585,1.74383,-0.19163 -accelerometer: 346451276,4.21585,2.68282,-0.210793 -accelerometer: 346551252,7.89514,5.46145,0.421585 -accelerometer: 346651349,7.01365,6.03634,0.172467 -accelerometer: 346751477,7.89514,6.18964,0.287445 -accelerometer: 346851392,7.56937,5.94052,-0.32577 -accelerometer: 346951215,7.39691,6.86034,-0.134141 -accelerometer: 347051313,7.49272,7.26277,-0.536563 -accelerometer: 347151258,8.08677,6.13215,0.229956 -accelerometer: 347251355,8.37422,5.76805,-0.19163 -accelerometer: 347351270,8.91078,1.78216,0.536563 -accelerometer: 347451307,10.7888,-4.77158,3.2577 -accelerometer: 347551221,7.37774,-30.0092,8.1251 -accelerometer: 347651258,-39.2458,-27.3072,7.39691 -accelerometer: 347751203,-25.3909,-5.44228,-0.210793 -irProximity:347762338,0.392157 -accelerometer: 347851300,-17.2467,-6.68788,1.22643 -irProximity:347863381,0.388235 -accelerometer: 347951276,-12.226,-1.7055,-0.0574889 -irProximity:347964425,0.376471 -accelerometer: 348051252,-9.96474,-0.632378,1.43722 -accelerometer: 348151197,-0.268282,1.1881,2.72114 -accelerometer: 348251264,4.10088,1.99295,2.12709 -accelerometer: 348351026,5.78722,3.71762,0.747356 -accelerometer: 348451276,3.21938,4.48413,2.66365 -accelerometer: 348551252,-1.37973,5.0207,7.70351 -accelerometer: 348651258,-0.19163,4.94405,12.111 -accelerometer: 348751325,-0.5174,5.80638,8.60417 -orientation:348851270,5 -accelerometer: 348851270,0,4.48413,8.69999 -accelerometer: 348952070,-2.28039,4.5033,8.14426 -accelerometer: 349051221,-0.728193,4.73325,9.35153 -accelerometer: 349150922,-2.52951,3.90925,9.92642 -accelerometer: 349251081,-2.97026,3.87092,7.85682 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_tiltedtwist.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_tiltedtwist.dat deleted file mode 100644 index f3ec2e92..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_tiltedtwist.dat +++ /dev/null @@ -1,260 +0,0 @@ -orientation:6291210832,5 -accelerometer: 6292150682,0.402422,1.99295,9.23655 -accelerometer: 6292171190,0.0574889,2.08876,9.27488 -accelerometer: 6292190996,-0.0958148,2.12709,9.08325 -accelerometer: 6292210649,0.0383259,2.05044,9.19823 -accelerometer: 6292231401,0.0574889,2.39537,9.1599 -irProximity:6292235233,0.294118 -accelerometer: 6292250658,-0.0958148,1.85881,9.10241 -proximity:6292264896,0 -accelerometer: 6292271013,-0.287445,1.82048,9.25571 -accelerometer: 6292290971,-0.019163,1.85881,9.38986 -accelerometer: 6292310899,0.172467,1.87797,9.56232 -accelerometer: 6292330736,-0.0383259,1.7055,9.37069 -accelerometer: 6292350969,0.153304,1.7055,9.42818 -accelerometer: 6292370897,-0.019163,1.83965,9.56232 -accelerometer: 6292390886,0.0766519,1.85881,9.50483 -accelerometer: 6292411028,0.210793,1.78216,9.65814 -accelerometer: 6292430895,0,1.80132,9.54316 -accelerometer: 6292450945,0.19163,2.01211,9.63897 -accelerometer: 6292470934,0.268282,1.87797,9.8306 -accelerometer: 6292490892,0.0574889,1.95462,9.42818 -accelerometer: 6292510942,0,2.10793,9.48567 -accelerometer: 6292530779,0.172467,2.33788,9.61981 -accelerometer: 6292550890,-0.0574889,2.87445,9.42818 -accelerometer: 6292571062,0.210793,2.72114,9.98391 -accelerometer: 6292591142,0.249119,2.77863,10.0989 -accelerometer: 6292610918,0.479074,3.12356,10.578 -accelerometer: 6292630785,0.114978,3.00859,10.4821 -accelerometer: 6292650926,0.114978,3.08524,10.3672 -accelerometer: 6292670885,0.19163,3.50682,10.4055 -accelerometer: 6292690904,0.268282,4.12004,10.5205 -accelerometer: 6292710893,0.555726,4.25418,10.3863 -accelerometer: 6292731065,0.5174,4.21585,10.0797 -accelerometer: 6292751146,0.536563,4.79074,9.73479 -accelerometer: 6292770921,0.766519,5.05902,9.61981 -accelerometer: 6292790971,0.268282,4.80991,8.96827 -accelerometer: 6292810869,0.134141,5.15484,8.20175 -accelerometer: 6292830888,0.153304,5.55726,7.66519 -irProximity:6292845401,0.298039 -accelerometer: 6292851061,0.364096,5.6914,7.83765 -accelerometer: 6292871324,0.134141,5.65308,7.81849 -accelerometer: 6292891008,-0.153304,6.18964,7.10946 -accelerometer: 6292910967,0.210793,5.99801,6.74537 -accelerometer: 6292930864,0.0766519,6.30462,5.88303 -accelerometer: 6292950975,-0.172467,6.36211,6.36211 -accelerometer: 6292970934,0.306608,6.74537,6.70704 -accelerometer: 6292990740,0.210793,6.78369,6.36211 -accelerometer: 6293010912,0.344933,6.7262,5.67224 -accelerometer: 6293030901,0.114978,7.03281,5.5381 -orientation:6293030901,1 -accelerometer: 6293050951,0.019163,6.99448,5.63391 -accelerometer: 6293071184,-0.229956,7.03281,5.00153 -accelerometer: 6293090959,-0.19163,7.6077,5.15484 -accelerometer: 6293110948,0.306608,7.53105,4.88656 -accelerometer: 6293130907,0.249119,7.33942,4.73325 -accelerometer: 6293150774,0.153304,7.22444,4.56079 -accelerometer: 6293170885,-0.0958148,7.83765,4.5033 -accelerometer: 6293190935,-0.229956,7.55021,4.57995 -accelerometer: 6293210954,-0.172467,7.43523,4.88656 -accelerometer: 6293231401,0.0766519,7.66519,5.07819 -accelerometer: 6293250963,-0.019163,7.72268,4.77158 -accelerometer: 6293270860,-0.019163,7.81849,5.05902 -accelerometer: 6293290941,0.0766519,7.79933,5.51894 -accelerometer: 6293310899,-0.019163,7.87598,5.28898 -accelerometer: 6293330705,0.0574889,7.95263,5.28898 -accelerometer: 6293350786,0.019163,7.99096,5.6914 -accelerometer: 6293371111,-0.019163,7.99096,5.57642 -accelerometer: 6293391130,-0.172467,7.89514,5.48061 -accelerometer: 6293410967,0,8.37422,5.57642 -accelerometer: 6293430956,0,7.95263,5.61475 -irProximity:6293451419,0.301961 -accelerometer: 6293451433,0.287445,8.06761,5.72973 -accelerometer: 6293470934,0.019163,8.10594,5.55726 -accelerometer: 6293490892,0.153304,8.31673,5.99801 -accelerometer: 6293510912,0.114978,7.9718,5.78722 -accelerometer: 6293531114,-0.019163,7.74184,5.48061 -irProximity:6293553165,0.298039 -accelerometer: 6293552599,-0.172467,8.04845,5.59559 -accelerometer: 6293570970,0.0574889,8.24008,5.65308 -accelerometer: 6293590990,-0.019163,7.87598,5.11651 -accelerometer: 6293610918,0.0383259,7.9718,5.61475 -accelerometer: 6293630907,-0.153304,8.04845,5.72973 -accelerometer: 6293650713,0.114978,7.93347,5.80638 -irProximity:6293654789,0.301961 -accelerometer: 6293670885,0.268282,8.14426,5.6914 -accelerometer: 6293691026,4.82907,7.93347,5.51894 -accelerometer: 6293711076,0.0574889,7.91431,5.86387 -accelerometer: 6293730852,-0.134141,7.72268,5.78722 -accelerometer: 6293750688,-0.0958148,7.9718,5.19316 -accelerometer: 6293770952,-0.0574889,8.33589,5.36563 -accelerometer: 6293790971,0,8.14426,5.23149 -accelerometer: 6293810899,0.210793,7.85682,5.36563 -accelerometer: 6293830919,0.0958148,7.99096,5.21233 -accelerometer: 6293850908,0.689867,8.18259,5.174 -accelerometer: 6293871141,1.34141,7.49272,5.25065 -accelerometer: 6293890947,2.03127,7.93347,4.86739 -accelerometer: 6293910906,2.70198,7.37774,3.56431 -accelerometer: 6293930895,4.19669,7.81849,3.1044 -accelerometer: 6293950762,4.31167,7.761,2.60616 -irProximity:6293959507,0.294118 -accelerometer: 6293970964,6.32378,8.04845,1.05396 -accelerometer: 6293990740,7.33942,9.61981,2.28039 -accelerometer: 6294011064,7.01365,9.23655,1.41806 -accelerometer: 6294031145,6.55374,8.45087,-0.344933 -accelerometer: 6294050768,5.61475,7.79933,-0.574889 -accelerometer: 6294070970,5.15484,8.83413,-0.268282 -accelerometer: 6294090929,3.92841,7.89514,-1.78216 -accelerometer: 6294110887,2.37621,7.83765,-2.33788 -accelerometer: 6294130785,2.97026,8.68083,-1.68634 -accelerometer: 6294150743,2.9511,8.75748,-2.62533 -accelerometer: 6294170885,3.1044,8.43171,-3.43017 -accelerometer: 6294191362,3.73678,9.0066,-3.81343 -accelerometer: 6294210954,4.46497,9.19823,-3.89008 -accelerometer: 6294230882,4.5033,8.92994,-3.90925 -accelerometer: 6294251177,3.87092,8.69999,-4.40748 -accelerometer: 6294270860,4.34999,8.85329,-4.23502 -accelerometer: 6294290971,4.29251,8.94911,-3.56431 -accelerometer: 6294310899,4.21585,9.06409,-3.08524 -accelerometer: 6294331072,4.06255,8.50836,-3.23854 -accelerometer: 6294351152,4.00506,8.75748,-2.7403 -accelerometer: 6294370958,4.12004,8.89162,-1.5522 -accelerometer: 6294390917,4.75242,9.10241,-0.632378 -accelerometer: 6294410906,4.75242,8.89162,-0.70903 -accelerometer: 6294430895,5.25065,8.54668,0.0383259 -accelerometer: 6294450945,5.90219,8.69999,1.14978 -accelerometer: 6294470934,6.03634,8.14426,2.39537 -accelerometer: 6294491075,6.17048,7.64602,3.73678 -accelerometer: 6294511125,5.90219,7.68435,4.33083 -accelerometer: 6294530870,5.13568,7.18611,4.36916 -accelerometer: 6294550920,3.18105,7.91431,4.06255 -irProximity:6294567813,0.301961 -accelerometer: 6294570970,1.89713,8.69999,2.89361 -accelerometer: 6294590898,0.632378,7.20528,3.89008 -accelerometer: 6294610918,-0.134141,7.2436,5.03986 -accelerometer: 6294630907,-0.555726,7.39691,6.7262 -accelerometer: 6294651048,-0.632378,7.58854,7.41607 -irProximity:6294669376,0.298039 -accelerometer: 6294671129,-0.632378,7.37774,6.43876 -accelerometer: 6294690935,-0.613215,7.10946,4.69493 -accelerometer: 6294710893,-1.13062,7.22444,4.59911 -accelerometer: 6294730943,-1.07313,7.39691,6.24713 -accelerometer: 6294750902,-0.766519,7.32025,5.76805 -accelerometer: 6294771105,-0.785682,6.97532,6.26629 -accelerometer: 6294790910,-0.728193,7.2436,6.13215 -accelerometer: 6294811052,-0.536563,7.30109,5.84471 -accelerometer: 6294831163,-0.498237,7.28193,6.34294 -accelerometer: 6294851061,-0.114978,7.9718,7.12862 -accelerometer: 6294871080,-0.114978,7.26277,5.90219 -accelerometer: 6294890917,-0.421585,7.56937,5.99801 -accelerometer: 6294910906,-0.440748,7.55021,5.99801 -accelerometer: 6294930895,0.0574889,6.87951,6.03634 -accelerometer: 6294950945,-0.306608,7.4544,6.937 -accelerometer: 6294970689,-0.364096,7.37774,5.86387 -irProximity:6294974216,0.301961 -accelerometer: 6294990892,-0.498237,7.74184,6.07466 -accelerometer: 6295010973,-0.19163,7.47356,6.30462 -accelerometer: 6295030901,-0.0574889,7.53105,6.82202 -accelerometer: 6295050890,0.0766519,7.43523,6.82202 -accelerometer: 6295070726,-0.364096,7.47356,6.49625 -accelerometer: 6295090898,0.0383259,7.55021,6.74537 -accelerometer: 6295110918,0.172467,7.58854,6.82202 -accelerometer: 6295131059,0.153304,7.28193,6.5729 -accelerometer: 6295150896,0.0574889,7.12862,6.84118 -accelerometer: 6295170854,-0.383259,7.37774,6.41959 -accelerometer: 6295191026,0.0766519,7.18611,6.17048 -accelerometer: 6295210924,-0.19163,7.28193,6.51541 -accelerometer: 6295231127,-0.344933,7.32025,6.45792 -accelerometer: 6295251054,-0.459911,7.47356,6.95616 -accelerometer: 6295270921,-0.440748,7.51188,6.76453 -irProximity:6295277225,0.298039 -accelerometer: 6295291063,-0.364096,7.18611,6.13215 -accelerometer: 6295311083,-0.0958148,7.56937,6.45792 -accelerometer: 6295330705,0.114978,7.32025,6.78369 -accelerometer: 6295350939,-0.019163,7.18611,6.22797 -accelerometer: 6295370744,-0.5174,7.01365,5.92136 -irProximity:6295378910,0.301961 -accelerometer: 6295390947,-0.114978,7.01365,6.63039 -accelerometer: 6295410936,-0.134141,7.03281,6.59206 -accelerometer: 6295430895,0.0574889,7.01365,6.66871 -accelerometer: 6295451067,0.364096,7.18611,6.80285 -accelerometer: 6295470934,0.651541,6.70704,6.74537 -irProximity:6295480533,0.298039 -accelerometer: 6295490953,-0.0574889,7.37774,6.97532 -accelerometer: 6295510942,0.0574889,7.05197,6.51541 -accelerometer: 6295530901,-0.287445,7.18611,6.68788 -accelerometer: 6295550890,0.019163,6.99448,6.84118 -accelerometer: 6295570757,0.019163,7.41607,6.937 -irProximity:6295582218,0.301961 -accelerometer: 6295590898,0.0766519,7.0903,6.80285 -accelerometer: 6295611070,0.364096,7.39691,6.55374 -accelerometer: 6295631151,0.402422,7.16695,6.34294 -accelerometer: 6295650957,0.32577,7.20528,6.5729 -accelerometer: 6295670915,0.364096,6.99448,6.97532 -irProximity:6295683841,0.298039 -accelerometer: 6295690965,-0.019163,6.97532,6.55374 -accelerometer: 6295710893,-0.268282,7.26277,6.18964 -accelerometer: 6295730943,-0.440748,6.937,6.28545 -accelerometer: 6295750932,-0.19163,7.2436,6.53457 -accelerometer: 6295771074,-0.0574889,7.22444,6.61122 -accelerometer: 6295791185,0,7.30109,6.24713 -accelerometer: 6295810960,-0.0383259,7.01365,6.53457 -accelerometer: 6295830949,-0.0958148,6.97532,6.70704 -accelerometer: 6295850908,-0.0958148,7.12862,6.41959 -accelerometer: 6295870897,-0.019163,7.16695,6.78369 -accelerometer: 6295890947,0.114978,7.22444,6.74537 -accelerometer: 6295910906,0.019163,7.39691,6.53457 -accelerometer: 6295931078,-0.32577,7.12862,6.15131 -accelerometer: 6295951128,-0.364096,7.12862,5.95968 -accelerometer: 6295970964,-0.344933,7.35858,6.24713 -accelerometer: 6295990679,-0.172467,7.26277,6.64955 -accelerometer: 6296010698,-0.249119,7.22444,6.86034 -accelerometer: 6296030687,-0.0383259,6.78369,6.87951 -accelerometer: 6296050707,-0.344933,7.07114,6.937 -accelerometer: 6296070635,-0.153304,6.63039,6.61122 -accelerometer: 6296090776,-0.268282,6.89867,6.91783 -accelerometer: 6296110857,-0.440748,7.12862,6.43876 -accelerometer: 6296130907,-0.306608,7.37774,6.2088 -accelerometer: 6296150835,0.0574889,6.99448,6.87951 -accelerometer: 6296170976,-0.153304,7.43523,6.70704 -accelerometer: 6296191759,-0.114978,7.43523,6.40043 -accelerometer: 6296211595,-0.0958148,7.01365,6.40043 -accelerometer: 6296231706,-0.0958148,7.10946,6.49625 -accelerometer: 6296251787,-0.0574889,7.01365,6.78369 -accelerometer: 6296271532,0.0574889,6.68788,6.937 -accelerometer: 6296292192,0.0766519,6.84118,6.89867 -accelerometer: 6296312029,0.114978,7.58854,7.03281 -accelerometer: 6296332018,-0.632378,6.80285,5.42312 -accelerometer: 6296350664,-1.07313,6.97532,5.99801 -accelerometer: 6296370531,-0.479074,7.03281,6.91783 -accelerometer: 6296390642,-0.0383259,6.63039,7.64602 -accelerometer: 6296411058,-0.114978,6.61122,7.18611 -accelerometer: 6296431139,0.019163,6.41959,7.18611 -accelerometer: 6296450914,0.268282,6.64955,7.18611 -accelerometer: 6296470903,-0.153304,6.80285,7.07114 -accelerometer: 6296490801,0.0574889,6.84118,6.89867 -accelerometer: 6296510912,-0.172467,6.76453,6.61122 -accelerometer: 6296530901,-0.0383259,6.74537,6.84118 -accelerometer: 6296550890,-0.114978,6.49625,7.05197 -accelerometer: 6296571062,-0.421585,6.68788,6.95616 -accelerometer: 6296590990,-0.229956,6.64955,7.03281 -accelerometer: 6296610948,-0.114978,6.5729,7.18611 -accelerometer: 6296630937,-0.210793,6.55374,7.12862 -accelerometer: 6296650865,-0.32577,6.59206,7.03281 -accelerometer: 6296670885,-0.0958148,6.53457,7.18611 -accelerometer: 6296690599,-0.249119,6.64955,7.16695 -accelerometer: 6296710924,-0.172467,6.5729,7.16695 -accelerometer: 6296731065,0.0766519,6.55374,7.28193 -accelerometer: 6296751146,-0.153304,7.05197,7.32025 -accelerometer: 6296770921,0.0383259,7.03281,6.86034 -accelerometer: 6296790788,-0.689867,7.28193,6.03634 -accelerometer: 6296810930,-0.632378,6.68788,6.70704 -accelerometer: 6296832842,-0.996474,6.09382,6.63039 -accelerometer: 6296851854,-0.689867,6.89867,7.14779 -accelerometer: 6296870744,-0.5174,6.97532,7.01365 -accelerometer: 6296891527,-0.019163,6.95616,7.33942 -accelerometer: 6296911760,0.153304,6.74537,6.99448 -accelerometer: 6296930986,-0.19163,7.0903,7.22444 -accelerometer: 6296952196,-0.32577,7.20528,6.15131 -accelerometer: 6296971361,-0.670704,6.63039,5.95968 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_turnover.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_turnover.dat deleted file mode 100644 index 7f66e0b7..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_turnover.dat +++ /dev/null @@ -1,252 +0,0 @@ -accelerometer: 11443330713,-0.364096,0.728193,9.88809 -irProximity:11443345721,0.294118 -accelerometer: 11443351709,0.249119,0.728193,10.0222 -orientation:11441670740,5 -accelerometer: 11443451807,-0.134141,0.670704,9.44734 -accelerometer: 11443470850,-0.0574889,1.05396,9.44734 -irProximity:11443472979,0.294118 -proximity:11443485430,0 -accelerometer: 11443490747,-0.0958148,0.785682,9.29404 -accelerometer: 11443510950,-0.0958148,0.938986,9.35153 -accelerometer: 11443530969,0,1.0348,9.60065 -accelerometer: 11443550958,-0.0958148,0.824008,9.58148 -accelerometer: 11443570764,-0.0574889,0.977311,9.40902 -accelerometer: 11443590906,0.172467,1.09229,9.6773 -accelerometer: 11443610803,0.32577,0.728193,9.86893 -accelerometer: 11443630914,0.0574889,1.1881,9.48567 -accelerometer: 11443650964,0.0383259,0.938986,9.58148 -accelerometer: 11443670923,-0.019163,1.13062,9.44734 -accelerometer: 11443690942,0.19163,1.16894,9.58148 -accelerometer: 11443710993,0.134141,1.36057,9.54316 -accelerometer: 11443730951,0.421585,1.47555,9.38986 -accelerometer: 11443750971,0.344933,1.47555,9.21739 -accelerometer: 11443770929,0.114978,1.24559,9.56232 -accelerometer: 11443790674,0.0383259,1.14978,9.38986 -accelerometer: 11443810816,0.153304,1.41806,9.48567 -accelerometer: 11443830805,0.134141,1.34141,9.44734 -accelerometer: 11443850824,0.0766519,1.3989,9.58148 -accelerometer: 11443870813,-0.0574889,1.1881,9.48567 -accelerometer: 11443890802,0.210793,1.34141,9.63897 -accelerometer: 11443910852,0.0574889,1.24559,9.524 -accelerometer: 11443930811,0.0574889,1.22643,9.60065 -accelerometer: 11443950922,0.114978,1.37973,9.6773 -accelerometer: 11443970941,0.210793,1.59053,9.6773 -accelerometer: 11443990808,0.114978,1.45639,9.58148 -accelerometer: 11444010919,0.0383259,1.43722,9.44734 -accelerometer: 11444030969,0.32577,1.78216,9.524 -accelerometer: 11444050958,0.0958148,1.66718,9.46651 -accelerometer: 11444070947,0.249119,1.49471,9.524 -accelerometer: 11444090936,0.172467,0.996474,9.63897 -accelerometer: 11444110986,0.0574889,1.43722,9.69646 -accelerometer: 11444130975,0.134141,0.996474,9.50483 -accelerometer: 11444150964,0.19163,1.1881,9.06409 -accelerometer: 11444171014,0.479074,0.613215,9.08325 -accelerometer: 11444190912,0.344933,1.74383,9.86893 -accelerometer: 11444210962,-0.114978,2.4337,10.0989 -accelerometer: 11444230920,0.229956,1.95462,9.44734 -accelerometer: 11444250971,-0.172467,1.76299,9.02576 -accelerometer: 11444270929,-0.5174,1.41806,9.19823 -accelerometer: 11444290888,-0.881497,1.5522,9.35153 -accelerometer: 11444310999,-0.498237,1.11145,9.17906 -accelerometer: 11444330988,0.210793,1.30308,10.4055 -accelerometer: 11444350946,0.0766519,1.07313,10.578 -accelerometer: 11444370966,-0.19163,1.24559,10.1372 -accelerometer: 11444390894,-0.479074,1.7055,8.94911 -accelerometer: 11444410913,-0.785682,1.57136,9.21739 -accelerometer: 11444430750,-0.344933,0.938986,9.21739 -accelerometer: 11444450861,-0.287445,1.16894,9.21739 -accelerometer: 11444470819,-0.498237,1.37973,9.37069 -irProximity:11444487597,0.290196 -accelerometer: 11444490991,-0.555726,1.51387,9.92642 -accelerometer: 11444510980,-1.01564,1.07313,9.46651 -accelerometer: 11444530939,-0.90066,0.421585,9.524 -accelerometer: 11444550928,-1.13062,0.402422,9.58148 -accelerometer: 11444570947,-1.26476,0.5174,9.69646 -accelerometer: 11444590936,-1.28392,0.536563,9.524 -accelerometer: 11444610986,-0.938986,1.26476,10.0222 -accelerometer: 11444630884,-1.1881,0.383259,9.8306 -accelerometer: 11444650751,-1.01564,0.919823,9.71563 -accelerometer: 11444670770,-0.843171,1.22643,9.84977 -accelerometer: 11444690881,-0.613215,1.64802,9.84977 -accelerometer: 11444710962,-0.536563,1.30308,9.79228 -accelerometer: 11444730920,-0.747356,0.843171,9.524 -accelerometer: 11444750971,-0.479074,1.36057,9.75395 -accelerometer: 11444770929,-0.306608,0.938986,14.698 -accelerometer: 11444790796,-0.114978,0.919823,10.0606 -accelerometer: 11444810816,-0.32577,0.977311,9.75395 -accelerometer: 11444830835,-0.19163,1.30308,9.73479 -accelerometer: 11444850763,0.229956,2.0696,9.79228 -accelerometer: 11444870844,0.613215,2.45286,10.463 -irProximity:11444890490,0.294118 -accelerometer: 11444890894,0.479074,3.06608,11.0379 -accelerometer: 11444910791,1.49471,3.69845,11.057 -accelerometer: 11444930780,0.440748,2.68282,11.3062 -accelerometer: 11444950891,0.843171,3.08524,10.5205 -accelerometer: 11444970941,0.90066,2.93193,9.50483 -irProximity:11444991106,0.290196 -accelerometer: 11444990656,2.20374,3.87092,7.761 -accelerometer: 11445010828,3.48766,3.89008,6.32378 -accelerometer: 11445030939,3.9859,3.56431,4.15836 -accelerometer: 11445050958,4.54162,4.00506,2.9511 -accelerometer: 11445070917,5.59559,4.67576,1.66718 -accelerometer: 11445090814,5.65308,4.02422,0.766519 -irProximity:11445092760,0.294118 -orientation:11445090814,4 -accelerometer: 11445110956,4.31167,2.89361,-1.9163 -accelerometer: 11445130975,2.93193,2.28039,-4.25418 -accelerometer: 11445150995,3.06608,1.41806,-5.42312 -orientation:11445150995,6 -accelerometer: 11445170984,2.81696,0.364096,-7.14779 -accelerometer: 11445190820,3.29603,-0.344933,-7.53105 -irProximity:11445193621,0.4 -accelerometer: 11445210962,3.14273,-0.574889,-9.3132 -accelerometer: 11445230951,6.15131,4.25418,-13.4141 -accelerometer: 11445251001,2.10793,-0.440748,-15.3879 -proximity:11445262567,1 -accelerometer: 11445271570,2.01211,0.249119,-10.9995 -accelerometer: 11445290857,0.574889,0.824008,-10.4247 -irProximity:11445294543,0.705882 -accelerometer: 11445310816,1.49471,0.344933,-9.81144 -accelerometer: 11445330805,2.2229,0.574889,-10.0606 -accelerometer: 11445350763,1.99295,-0.0574889,-9.69646 -accelerometer: 11445370935,1.30308,-4.79074,-9.33237 -accelerometer: 11445390955,0.919823,0.421585,-9.79228 -accelerometer: 11445410944,0.938986,0.229956,-10.1372 -accelerometer: 11445430994,0.555726,0.114978,-10.2139 -accelerometer: 11445450983,1.22643,0.344933,-9.90726 -accelerometer: 11445470850,0.881497,0.0958148,-10.1947 -accelerometer: 11445490869,0.728193,0.19163,-10.2522 -irProximity:11445495501,0.721569 -accelerometer: 11445510980,0.785682,0.32577,-9.65814 -accelerometer: 11445530969,0.728193,0.306608,-9.04492 -accelerometer: 11445550653,0.938986,0.402422,-9.33237 -accelerometer: 11445570764,0.728193,0.134141,-9.14074 -accelerometer: 11445590936,0.90066,0.287445,-9.37069 -accelerometer: 11445610956,1.07313,0.268282,-9.3132 -accelerometer: 11445630975,1.01564,0.19163,-9.54316 -accelerometer: 11445650964,0.938986,0.114978,-9.524 -accelerometer: 11445670770,0.862334,0.0958148,-9.69646 -accelerometer: 11445690759,0.862334,0.153304,-9.69646 -irProximity:11445696306,0.72549 -accelerometer: 11445710809,1.36057,-4.77158,-9.69646 -accelerometer: 11445730920,0.862334,0.134141,-9.50483 -accelerometer: 11445750940,0.689867,0.0383259,-9.50483 -accelerometer: 11445771143,1.11145,-4.90572,-9.6773 -accelerometer: 11445790765,0.881497,-0.0383259,-9.73479 -accelerometer: 11445810754,0.728193,0.0383259,-9.58148 -accelerometer: 11445830835,0.996474,0.19163,-9.56232 -accelerometer: 11445850794,0.90066,0.0574889,-9.63897 -accelerometer: 11445870844,1.1881,0.134141,-9.54316 -accelerometer: 11445890650,1.13062,0.229956,-9.35153 -irProximity:11445897234,0.721569 -accelerometer: 11445910852,1.09229,0.0766519,-9.23655 -accelerometer: 11445930933,0.747356,0.172467,-9.14074 -accelerometer: 11445950922,0.689867,0.440748,-9.60065 -accelerometer: 11445970941,0.862334,0.479074,-9.54316 -accelerometer: 11445990961,1.01564,0.172467,-9.69646 -accelerometer: 11446010736,0.881497,0.172467,-10.0414 -accelerometer: 11446030817,0.996474,0.114978,-10.233 -accelerometer: 11446050958,1.72467,0.172467,-9.88809 -accelerometer: 11446070978,2.16542,0.766519,-9.44734 -accelerometer: 11446090936,2.64449,0.344933,-9.12157 -irProximity:11446098192,0.686275 -accelerometer: 11446110895,3.21938,0.383259,-8.69999 -accelerometer: 11446130914,4.61828,1.16894,-8.31673 -accelerometer: 11446150903,5.6914,1.43722,-7.30109 -accelerometer: 11446171045,6.36211,2.41453,-6.11299 -accelerometer: 11446190942,7.33942,3.08524,-4.12004 -orientation:11446190942,4 -accelerometer: 11446210962,8.18259,3.87092,-1.76299 -accelerometer: 11446230951,9.23655,4.31167,-0.881497 -accelerometer: 11446251001,9.44734,5.05902,0.459911 -accelerometer: 11446270960,8.75748,4.61828,2.7403 -accelerometer: 11446290796,7.58854,3.69845,4.44581 -irProximity:11446299120,0.298039 -accelerometer: 11446310938,5.48061,2.85528,6.34294 -accelerometer: 11446330835,4.00506,2.10793,8.06761 -orientation:11446330835,5 -proximity:11446341150,0 -accelerometer: 11446350916,1.97379,2.18458,9.27488 -accelerometer: 11446370935,1.30308,1.1881,9.54316 -accelerometer: 11446390802,0.804845,1.26476,9.90726 -accelerometer: 11446410913,0.651541,1.62885,10.4247 -accelerometer: 11446430933,0.0958148,1.76299,10.0031 -accelerometer: 11446450891,-0.268282,1.49471,9.92642 -accelerometer: 11446470789,-0.249119,1.09229,10.1372 -accelerometer: 11446490747,-0.919823,1.30308,9.71563 -irProximity:11446500933,0.294118 -accelerometer: 11446510950,-1.89713,1.3989,9.33237 -accelerometer: 11446530969,-1.80132,0.824008,9.75395 -accelerometer: 11446550958,-1.3989,-0.0574889,9.75395 -accelerometer: 11446570947,-0.90066,-0.498237,9.23655 -accelerometer: 11446590967,-0.824008,-0.134141,8.43171 -accelerometer: 11446610895,-1.34141,-0.229956,9.21739 -accelerometer: 11446630914,-0.536563,-0.249119,9.17906 -accelerometer: 11446650934,-0.881497,-0.402422,9.23655 -accelerometer: 11446670770,-0.996474,-0.689867,8.92994 -accelerometer: 11446691065,-1.0348,-0.862334,9.02576 -irProximity:11446702532,0.290196 -accelerometer: 11446710993,-0.90066,-0.881497,10.2714 -accelerometer: 11446730951,-0.574889,-0.958148,10.4821 -accelerometer: 11446750940,-0.996474,-1.3989,9.37069 -accelerometer: 11446770960,-1.26476,-1.43722,9.1599 -accelerometer: 11446790796,-0.996474,-1.3989,9.38986 -accelerometer: 11446810816,-0.306608,-1.14978,9.60065 -accelerometer: 11446830835,0.172467,-0.824008,10.0031 -accelerometer: 11446850824,0.172467,-0.919823,9.75395 -accelerometer: 11446870844,-0.0958148,-1.47555,9.17906 -accelerometer: 11446890802,0.19163,-1.36057,9.33237 -accelerometer: 11446910791,0.651541,-1.16894,9.73479 -accelerometer: 11446930963,0.938986,-1.13062,10.233 -accelerometer: 11446950952,0.804845,-1.43722,9.79228 -accelerometer: 11446970972,0.383259,-1.14978,9.38986 -accelerometer: 11446990808,0.670704,-0.977311,10.0414 -accelerometer: 11447010828,1.11145,-0.766519,9.81144 -accelerometer: 11447030939,1.16894,-0.747356,14.4489 -accelerometer: 11447050928,0.670704,-0.440748,9.8306 -accelerometer: 11447070947,0.70903,-0.498237,9.88809 -accelerometer: 11447090967,0.498237,-0.785682,9.50483 -accelerometer: 11447110925,0.440748,-0.651541,9.27488 -accelerometer: 11447130975,0.383259,-0.766519,9.6773 -accelerometer: 11447150934,0.114978,-0.5174,9.60065 -accelerometer: 11447170923,0.210793,-0.70903,9.42818 -accelerometer: 11447190942,0.0766519,-0.785682,8.98743 -accelerometer: 11447210901,0.172467,-0.594052,9.79228 -accelerometer: 11447230951,0.268282,-0.804845,9.61981 -accelerometer: 11447250940,0,-0.938986,9.48567 -accelerometer: 11447270929,0.0574889,-0.938986,9.58148 -accelerometer: 11447290918,0,-0.555726,9.86893 -irProximity:11447306658,0.294118 -accelerometer: 11447310968,0.153304,-0.843171,9.61981 -accelerometer: 11447330927,-0.153304,-0.766519,9.58148 -accelerometer: 11447350733,-0.0574889,-0.977311,9.8306 -accelerometer: 11447370935,-0.0958148,-0.747356,9.58148 -accelerometer: 11447390924,0.134141,-0.383259,9.71563 -irProximity:11447407457,0.290196 -accelerometer: 11447410974,-0.019163,-0.383259,9.63897 -accelerometer: 11447430902,-0.0383259,-0.728193,9.46651 -accelerometer: 11447450891,-0.0958148,-0.804845,9.50483 -accelerometer: 11447470758,-0.0383259,-0.70903,9.35153 -accelerometer: 11447490961,-0.306608,-0.555726,9.23655 -accelerometer: 11447510919,-0.172467,-0.632378,9.23655 -accelerometer: 11447531000,-0.134141,-0.594052,9.37069 -accelerometer: 11447550958,-0.306608,-0.785682,9.38986 -accelerometer: 11447570978,-0.0958148,-0.766519,9.48567 -accelerometer: 11447590997,-0.249119,-0.785682,9.38986 -accelerometer: 11447610925,0,-0.70903,9.6773 -accelerometer: 11447630914,0.0958148,-0.651541,9.50483 -accelerometer: 11447650964,-0.0766519,-0.958148,9.33237 -accelerometer: 11447670953,0.0766519,-0.747356,9.77311 -accelerometer: 11447690942,0.114978,-0.747356,9.90726 -accelerometer: 11447711054,0,-0.804845,9.73479 -accelerometer: 11447730920,-0.287445,-1.01564,9.42818 -accelerometer: 11447750940,-0.498237,-0.651541,9.19823 -accelerometer: 11447773554,-0.459911,-0.344933,9.60065 -accelerometer: 11447790857,-0.210793,-0.32577,9.6773 -accelerometer: 11447810816,-0.479074,-0.766519,9.98391 -accelerometer: 11447830805,-0.249119,-0.670704,10.0989 -accelerometer: 11447850763,-0.421585,-0.5174,9.61981 -accelerometer: 11447870813,-0.651541,-0.383259,9.12157 -accelerometer: 11447890772,-0.287445,-0.229956,9.23655 -accelerometer: 11447910974,-0.172467,-0.670704,9.3132 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_twist.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_twist.dat deleted file mode 100644 index cde7bb72..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_twist.dat +++ /dev/null @@ -1,361 +0,0 @@ -irProximity:11952268937,0.294118 -orientation:11949151148,5 -irProximity:11952369798,0.290196 -accelerometer: 11952370691,0.383259,2.45286,9.23655 -accelerometer: 11952390833,0.383259,2.56784,9.06409 -accelerometer: 11952410913,0.670704,2.62533,8.81497 -accelerometer: 11952430872,0.670704,2.81696,8.92994 -accelerometer: 11952450891,0.594052,2.64449,9.37069 -proximity:11949132684,0 -accelerometer: 11952475122,0.459911,2.31872,9.54316 -irProximity:11952477403,0.290196 -accelerometer: 11952490930,0.651541,2.49119,9.75395 -accelerometer: 11952510950,0.613215,2.70198,9.69646 -accelerometer: 11952530939,0.306608,2.45286,9.54316 -accelerometer: 11952550958,0.32577,2.18458,9.33237 -accelerometer: 11952570795,0,2.24207,8.92994 -accelerometer: 11952590936,0.0574889,2.31872,9.06409 -accelerometer: 11952610956,0.383259,2.24207,9.33237 -accelerometer: 11952631036,0.364096,2.39537,9.50483 -accelerometer: 11952650934,0.229956,2.49119,9.38986 -accelerometer: 11952670801,0.0574889,2.587,9.40902 -accelerometer: 11952690942,0.114978,2.35705,9.29404 -accelerometer: 11952710962,0.19163,1.97379,9.61981 -accelerometer: 11952730951,-0.0383259,1.59053,9.27488 -accelerometer: 11952750971,0.249119,2.08876,9.27488 -accelerometer: 11952770837,0.268282,2.35705,9.27488 -accelerometer: 11952790735,0.651541,2.29956,9.524 -accelerometer: 11952810816,0.32577,2.52951,9.14074 -accelerometer: 11952830774,0.459911,2.20374,9.06409 -accelerometer: 11952850763,0.728193,2.49119,9.48567 -accelerometer: 11952870813,0.613215,2.77863,9.46651 -accelerometer: 11952890802,0.747356,2.47202,9.42818 -accelerometer: 11952910822,1.1881,2.08876,9.1599 -accelerometer: 11952930963,1.41806,1.51387,8.91078 -accelerometer: 11952950983,0.862334,1.57136,8.47003 -accelerometer: 11952970972,0.536563,1.51387,8.73831 -accelerometer: 11952990808,0.70903,1.68634,8.98743 -accelerometer: 11953010828,0.70903,1.87797,9.3132 -accelerometer: 11953030969,0.249119,3.35352,9.79228 -accelerometer: 11953050958,0.594052,3.4685,10.0031 -accelerometer: 11953070947,0.670704,2.10793,9.63897 -accelerometer: 11953090936,0.862334,1.37973,9.58148 -accelerometer: 11953110956,0.632378,1.41806,9.84977 -accelerometer: 11953130975,0.574889,1.11145,9.61981 -accelerometer: 11953150995,0.0958148,0.479074,9.1599 -accelerometer: 11953170953,0.229956,1.01564,8.1251 -accelerometer: 11953190912,0.938986,1.57136,7.66519 -accelerometer: 11953210962,1.51387,1.97379,8.1251 -accelerometer: 11953231012,1.24559,1.83965,7.91431 -accelerometer: 11953250971,0.728193,1.01564,7.43523 -accelerometer: 11953270960,0.651541,0.824008,8.02928 -accelerometer: 11953290918,0.90066,1.11145,8.98743 -accelerometer: 11953310999,1.85881,0.306608,9.58148 -accelerometer: 11953330957,2.05044,-1.45639,11.1528 -accelerometer: 11953350977,1.07313,-1.78216,11.4211 -accelerometer: 11953370966,1.20727,-2.93193,11.0379 -accelerometer: 11953390894,-0.172467,-2.12709,11.7086 -accelerometer: 11953410913,-0.785682,-2.52951,11.1337 -accelerometer: 11953430902,-0.728193,-2.52951,10.3863 -accelerometer: 11953450922,-0.919823,-2.52951,10.1947 -accelerometer: 11953470789,-0.210793,-3.21938,9.46651 -accelerometer: 11953490717,-0.440748,-2.29956,9.33237 -accelerometer: 11953510889,-0.594052,-2.16542,9.46651 -accelerometer: 11953530969,-0.383259,-1.95462,9.08325 -accelerometer: 11953550958,-0.594052,-1.62885,9.29404 -accelerometer: 11953570947,-0.421585,-1.43722,9.35153 -accelerometer: 11953590936,-0.364096,-1.05396,8.7958 -accelerometer: 11953610925,0.0574889,-1.0348,8.83413 -accelerometer: 11953630945,0.383259,-1.05396,8.89162 -accelerometer: 11953650934,0.249119,-1.36057,9.08325 -accelerometer: 11953670923,0.287445,-0.996474,9.04492 -accelerometer: 11953690912,1.22643,-0.881497,9.08325 -accelerometer: 11953710931,1.1881,-0.996474,9.27488 -accelerometer: 11953730920,0.766519,-1.11145,8.91078 -accelerometer: 11953750971,2.10793,-0.594052,8.20175 -accelerometer: 11953770868,2.20374,-0.766519,8.08677 -accelerometer: 11953790796,1.74383,-0.747356,6.82202 -accelerometer: 11953810846,3.39185,-0.402422,5.92136 -accelerometer: 11953830805,3.79427,1.13062,4.67576 -accelerometer: 11953850794,8.2784,1.09229,4.21585 -accelerometer: 11953870813,10.2714,2.20374,1.80132 -accelerometer: 11953890772,12.7434,2.56784,-0.996474 -accelerometer: 11953911340,12.3601,2.4337,-2.39537 -orientation:11953911340,4 -accelerometer: 11953930994,12.3026,2.33788,-1.95462 -accelerometer: 11953950983,12.1493,1.26476,0.0574889 -accelerometer: 11953970972,10.118,-0.268282,-0.862334 -irProximity:11953989915,0.298039 -accelerometer: 11953990839,8.6425,0.440748,-3.96673 -accelerometer: 11954010980,9.35153,1.22643,-5.63391 -accelerometer: 11954030969,9.71563,1.47555,-6.64955 -accelerometer: 11954050989,9.3132,1.36057,-6.99448 -accelerometer: 11954070978,8.35505,0.843171,-5.97885 -irProximity:11954090623,0.294118 -accelerometer: 11954090875,8.20175,0.670704,-6.09382 -accelerometer: 11954110956,8.50836,1.37973,-6.5729 -accelerometer: 11954130975,9.10241,1.66718,-6.66871 -accelerometer: 11954150995,9.04492,1.80132,-6.26629 -accelerometer: 11954171167,8.71915,0.594052,-5.44228 -accelerometer: 11954191095,9.23655,1.14978,-3.71762 -accelerometer: 11954211023,9.96474,1.59053,-3.20022 -accelerometer: 11954230982,9.98391,1.07313,-3.23854 -accelerometer: 11954251001,10.578,2.05044,-1.60969 -accelerometer: 11954270960,11.9385,2.29956,0.268282 -accelerometer: 11954290643,12.1493,1.60969,0.459911 -irProximity:11954291917,0.301961 -accelerometer: 11954311029,11.4595,0.747356,0 -accelerometer: 11954330988,10.6546,1.53304,1.53304 -accelerometer: 11954350946,9.94558,1.85881,2.51035 -accelerometer: 11954370752,8.52752,0.249119,3.43017 -accelerometer: 11954390619,5.09735,1.22643,4.90572 -irProximity:11954392350,0.294118 -accelerometer: 11954410913,1.74383,0.421585,6.43876 -accelerometer: 11954430902,-0.0383259,-0.90066,6.64955 -orientation:11954430902,5 -accelerometer: 11954450983,-0.958148,-1.34141,7.87598 -accelerometer: 11954470758,-0.766519,-0.804845,8.29757 -accelerometer: 11954490747,-0.90066,-0.249119,9.19823 -irProximity:11954493302,0.290196 -accelerometer: 11954510950,-0.958148,0.0958148,9.58148 -accelerometer: 11954530969,-1.34141,0.172467,9.90726 -accelerometer: 11954550989,-1.43722,-0.0766519,10.348 -accelerometer: 11954570947,-1.11145,0.210793,10.6354 -accelerometer: 11954590814,-0.766519,0.153304,10.1947 -accelerometer: 11954611353,-1.0348,-0.19163,9.25571 -accelerometer: 11954631006,-0.574889,-0.019163,9.06409 -accelerometer: 11954650934,-0.249119,-0.479074,8.2784 -accelerometer: 11954670953,-0.172467,-0.172467,9.29404 -accelerometer: 11954690820,-0.32577,0.134141,9.35153 -accelerometer: 11954710962,-0.402422,-4.80991,8.7958 -accelerometer: 11954730951,-0.210793,0.210793,9.524 -accelerometer: 11954750971,-0.172467,0.172467,9.44734 -accelerometer: 11954770868,-0.134141,0.0958148,9.50483 -accelerometer: 11954790765,-0.287445,0.134141,9.60065 -accelerometer: 11954810846,-0.383259,-0.0574889,9.86893 -accelerometer: 11954830774,-0.0383259,-0.19163,10.0414 -accelerometer: 11954850794,-0.229956,-0.19163,9.63897 -accelerometer: 11954870874,-0.364096,0.0766519,9.50483 -accelerometer: 11954890833,-0.114978,0.153304,9.56232 -accelerometer: 11954910822,-0.402422,0.0574889,9.71563 -accelerometer: 11954930963,-0.19163,-0.306608,9.81144 -accelerometer: 11954950922,-0.344933,-4.90572,9.54316 -accelerometer: 11954970972,-0.0383259,-0.019163,9.79228 -accelerometer: 11954990778,-0.114978,0.019163,9.65814 -accelerometer: 11955010858,-0.287445,-0.153304,9.40902 -accelerometer: 11955030969,-0.402422,0.019163,9.56232 -accelerometer: 11955050989,-0.32577,-0.019163,9.524 -accelerometer: 11955070917,-0.0766519,-4.86739,9.48567 -accelerometer: 11955090784,-0.249119,0.019163,9.60065 -accelerometer: 11955110925,-0.402422,0.114978,9.42818 -accelerometer: 11955130945,-0.536563,0.0383259,9.50483 -accelerometer: 11955150964,-0.5174,-0.019163,9.524 -accelerometer: 11955170953,-0.479074,-0.153304,9.46651 -accelerometer: 11955190790,-0.364096,-0.0574889,9.38986 -accelerometer: 11955210931,-0.0574889,0.0383259,9.6773 -accelerometer: 11955230951,-0.249119,-0.114978,9.63897 -accelerometer: 11955250971,-0.344933,-4.82907,9.524 -accelerometer: 11955270960,-0.306608,-0.153304,9.37069 -accelerometer: 11955290765,-0.364096,-0.019163,9.44734 -accelerometer: 11955310938,-0.402422,0.0766519,9.58148 -accelerometer: 11955330988,-0.440748,4.84823,9.50483 -accelerometer: 11955350916,-0.421585,-0.210793,9.54316 -accelerometer: 11955370966,-0.689867,-0.153304,9.50483 -accelerometer: 11955390802,-0.594052,-0.019163,9.44734 -accelerometer: 11955410883,-0.344933,-0.019163,9.38986 -accelerometer: 11955430902,-0.440748,-0.0958148,9.54316 -accelerometer: 11955450891,-0.498237,-0.0574889,9.46651 -accelerometer: 11955470758,-0.479074,-0.172467,9.65814 -accelerometer: 11955490778,-0.498237,-0.0958148,9.58148 -accelerometer: 11955510858,-0.402422,-0.019163,9.54316 -accelerometer: 11955530969,-0.670704,4.79074,9.25571 -accelerometer: 11955550928,-0.459911,0.019163,9.58148 -accelerometer: 11955570947,-0.364096,-0.0383259,9.25571 -accelerometer: 11955590936,-0.287445,-0.114978,9.60065 -accelerometer: 11955610895,-0.498237,-0.0574889,9.56232 -accelerometer: 11955630945,-0.5174,-0.0958148,9.56232 -accelerometer: 11955650903,-0.402422,-0.114978,9.524 -accelerometer: 11955670801,-0.364096,-0.019163,9.56232 -accelerometer: 11955690973,-0.19163,-0.19163,9.69646 -accelerometer: 11955710931,-0.306608,-0.0958148,9.60065 -accelerometer: 11955730951,-0.5174,-0.019163,9.48567 -accelerometer: 11955751001,-0.229956,-0.0958148,9.50483 -accelerometer: 11955770837,-0.440748,-0.210793,9.48567 -accelerometer: 11955790765,-0.402422,-4.79074,9.54316 -accelerometer: 11955810816,-0.19163,-0.153304,9.38986 -accelerometer: 11955830805,-0.498237,-0.268282,9.35153 -accelerometer: 11955850824,-0.536563,-0.19163,9.35153 -accelerometer: 11955870813,-0.5174,-0.0958148,9.58148 -accelerometer: 11955890772,-0.287445,-0.32577,9.48567 -accelerometer: 11955910761,-0.613215,-0.172467,9.19823 -accelerometer: 11955930963,-0.364096,-0.440748,9.38986 -accelerometer: 11955950952,-0.5174,-0.268282,9.58148 -accelerometer: 11955970972,-0.555726,-0.134141,9.60065 -accelerometer: 11955990839,-0.555726,-0.249119,9.40902 -accelerometer: 11956010767,-0.268282,-0.32577,9.56232 -accelerometer: 11956030939,-0.479074,-0.172467,9.42818 -accelerometer: 11956050958,-0.555726,-0.0958148,9.42818 -accelerometer: 11956070947,-0.249119,-0.344933,9.42818 -accelerometer: 11956090936,-0.479074,-0.19163,9.65814 -accelerometer: 11956110773,-0.344933,-0.134141,9.33237 -accelerometer: 11956130853,-0.440748,-0.114978,9.44734 -accelerometer: 11956150964,-0.402422,-0.32577,9.71563 -accelerometer: 11956170923,-0.574889,-0.459911,9.44734 -accelerometer: 11956190973,-0.402422,-0.0958148,9.73479 -accelerometer: 11956210931,-0.5174,4.75242,9.40902 -accelerometer: 11956230951,-0.498237,-0.153304,9.38986 -accelerometer: 11956251001,-0.402422,-0.287445,9.46651 -accelerometer: 11956270929,-0.32577,-0.287445,9.50483 -accelerometer: 11956290918,-0.402422,-0.19163,9.60065 -accelerometer: 11956310907,-0.364096,-0.019163,9.58148 -accelerometer: 11956330927,-0.536563,-0.114978,9.50483 -accelerometer: 11956350977,-0.32577,-0.172467,9.61981 -accelerometer: 11956370935,-0.536563,-0.32577,9.524 -accelerometer: 11956390955,-0.421585,-0.019163,9.38986 -accelerometer: 11956410883,-0.594052,-0.210793,9.37069 -accelerometer: 11956430933,-0.594052,-0.229956,9.54316 -accelerometer: 11956450891,-0.5174,-0.268282,9.58148 -accelerometer: 11956470789,-0.613215,-0.268282,9.38986 -accelerometer: 11956490930,-0.344933,-0.287445,9.524 -accelerometer: 11956510889,-0.498237,-0.153304,9.50483 -accelerometer: 11956530969,-0.459911,-0.287445,9.60065 -accelerometer: 11956550958,-0.689867,-0.306608,9.44734 -accelerometer: 11956570947,-0.536563,-0.210793,9.524 -accelerometer: 11956590967,-0.594052,-0.114978,9.3132 -accelerometer: 11956610895,-0.459911,0.0574889,9.35153 -accelerometer: 11956630975,-0.5174,4.77158,9.19823 -accelerometer: 11956650934,-0.172467,-0.0574889,8.2784 -accelerometer: 11956670953,0.0766519,-0.153304,8.20175 -accelerometer: 11956690973,0.268282,0.32577,8.4892 -accelerometer: 11956711054,0.689867,-0.0766519,8.4892 -accelerometer: 11956730920,1.80132,0.268282,8.16343 -accelerometer: 11956750910,4.67576,1.09229,8.02928 -accelerometer: 11956770715,7.43523,1.22643,6.99448 -accelerometer: 11956790674,8.2784,1.59053,4.90572 -accelerometer: 11956810541,9.14074,1.30308,1.57136 -accelerometer: 11956830499,8.62334,1.43722,-1.16894 -accelerometer: 11956850671,8.68083,2.28039,-2.87445 -orientation:11956850671,4 -accelerometer: 11956870691,9.46651,0.766519,-2.83612 -accelerometer: 11956890680,11.5744,1.53304,-2.39537 -irProximity:11956911820,0.294118 -accelerometer: 11956910913,12.3601,2.41453,-2.18458 -accelerometer: 11956930689,11.3445,1.57136,-3.94757 -accelerometer: 11956950678,8.77664,0.459911,-6.30462 -accelerometer: 11956970697,8.10594,0.862334,-7.07114 -accelerometer: 11956990686,9.42818,1.68634,-6.34294 -accelerometer: 11957010584,9.73479,1.59053,-5.19316 -accelerometer: 11957030786,10.0606,0.689867,-5.15484 -accelerometer: 11957050775,9.21739,0.229956,-5.46145 -accelerometer: 11957070764,9.84977,1.32224,-4.61828 -accelerometer: 11957090784,11.4786,2.51035,-2.20374 -accelerometer: 11957110742,12.0152,2.28039,-0.574889 -irProximity:11957113084,0.313726 -accelerometer: 11957130853,10.4055,1.41806,0.766519 -accelerometer: 11957150964,10.8654,1.9163,1.80132 -accelerometer: 11957170984,10.5205,2.12709,2.41453 -accelerometer: 11957190942,9.94558,1.97379,2.56784 -accelerometer: 11957210809,8.60417,1.34141,2.51035 -irProximity:11957213944,0.294118 -accelerometer: 11957230951,6.82202,1.43722,3.54515 -accelerometer: 11957250971,4.06255,1.41806,4.79074 -accelerometer: 11957270990,2.03127,0.689867,6.28545 -accelerometer: 11957290979,0.938986,0,7.33942 -orientation:11957290979,5 -accelerometer: 11957310846,0.268282,-4.88656,8.24008 -irProximity:11957314866,0.290196 -accelerometer: 11957330957,0.670704,-0.651541,8.56585 -accelerometer: 11957350946,0.536563,-0.229956,10.6163 -accelerometer: 11957370966,0.0574889,-0.153304,10.4821 -accelerometer: 11957390955,-0.344933,-0.0766519,9.96474 -accelerometer: 11957410822,-0.632378,-0.249119,9.58148 -accelerometer: 11957430902,-1.43722,-0.0958148,9.8306 -accelerometer: 11957450922,-1.3989,-0.421585,10.0414 -accelerometer: 11957470850,-1.24559,-0.344933,10.2714 -accelerometer: 11957490869,-1.43722,-0.536563,9.63897 -accelerometer: 11957510736,-1.26476,-0.402422,9.90726 -accelerometer: 11957530939,-1.0348,-0.536563,9.58148 -accelerometer: 11957550958,-1.13062,-0.555726,9.19823 -accelerometer: 11957570947,-1.09229,-0.459911,9.524 -accelerometer: 11957590997,-0.90066,-0.383259,9.25571 -accelerometer: 11957610834,-0.689867,-0.134141,9.08325 -accelerometer: 11957630945,-0.632378,0,9.25571 -accelerometer: 11957650964,-0.958148,-0.249119,9.19823 -accelerometer: 11957670923,-1.05396,-0.364096,9.56232 -accelerometer: 11957690942,-0.90066,-0.364096,9.69646 -accelerometer: 11957710779,-0.90066,-0.268282,9.42818 -accelerometer: 11957730920,-1.09229,-0.402422,9.23655 -accelerometer: 11957751001,-0.843171,-0.249119,9.12157 -accelerometer: 11957770807,-0.862334,-0.0383259,9.44734 -accelerometer: 11957790796,-1.11145,0.134141,9.73479 -accelerometer: 11957810816,-0.90066,-0.0766519,9.33237 -accelerometer: 11957830835,-0.919823,-0.479074,9.3132 -accelerometer: 11957850794,-0.747356,-4.84823,8.54668 -accelerometer: 11957870844,-0.938986,0.153304,9.23655 -accelerometer: 11957890802,-0.689867,-0.134141,9.06409 -accelerometer: 11957910822,-0.594052,-0.306608,9.54316 -accelerometer: 11957930933,-0.728193,-0.134141,9.6773 -accelerometer: 11957950922,-0.651541,-0.0766519,9.60065 -accelerometer: 11957970972,-0.383259,-0.0574889,9.25571 -accelerometer: 11957990747,-0.249119,0.364096,10.1947 -accelerometer: 11958010736,-0.287445,0.287445,10.5013 -accelerometer: 11958030908,-0.0766519,0.498237,10.3672 -accelerometer: 11958050958,0.0383259,0.479074,10.348 -accelerometer: 11958070947,-0.268282,0.555726,9.94558 -accelerometer: 11958090967,-0.383259,0.268282,14.7172 -accelerometer: 11958110956,-0.210793,-0.0766519,9.96474 -accelerometer: 11958130914,0.153304,0,10.3288 -accelerometer: 11958150934,0.459911,0.440748,11.1145 -accelerometer: 11958171106,0.440748,0.019163,10.9612 -accelerometer: 11958190973,0.402422,-0.555726,9.65814 -accelerometer: 11958210931,-0.0766519,0.364096,8.62334 -accelerometer: 11958230890,0.114978,0.747356,8.62334 -accelerometer: 11958250940,-0.364096,0.0383259,9.56232 -accelerometer: 11958270929,0.344933,-0.536563,10.3863 -accelerometer: 11958290949,0.0766519,-1.05396,10.118 -accelerometer: 11958310968,0.555726,-1.34141,9.33237 -accelerometer: 11958330927,0.785682,-0.632378,9.12157 -accelerometer: 11958351007,0.670704,-0.32577,9.1599 -accelerometer: 11958370966,0.785682,-0.536563,9.02576 -accelerometer: 11958390924,1.1881,-0.306608,8.87245 -accelerometer: 11958410944,0.5174,0.421585,10.0222 -accelerometer: 11958430872,0.613215,0.689867,9.75395 -accelerometer: 11958450922,0.766519,-0.0958148,9.524 -accelerometer: 11958470819,0.958148,0.632378,9.65814 -accelerometer: 11958490900,0.249119,0.651541,9.54316 -accelerometer: 11958510919,0.287445,0.843171,9.42818 -accelerometer: 11958530939,0.555726,0.440748,8.98743 -accelerometer: 11958550958,0.0766519,0.344933,9.06409 -accelerometer: 11958570947,0.229956,0.70903,8.58501 -accelerometer: 11958590967,0.153304,0.287445,9.58148 -accelerometer: 11958610803,0.0766519,0.594052,10.118 -accelerometer: 11958630945,0.344933,0.728193,9.92642 -accelerometer: 11958650934,0.134141,0.498237,9.84977 -accelerometer: 11958670953,0.344933,0.344933,9.524 -accelerometer: 11958690942,0.32577,0.479074,9.58148 -accelerometer: 11958710931,0.421585,0.689867,9.73479 -accelerometer: 11958730890,0.249119,0.555726,9.54316 -accelerometer: 11958751001,0.0766519,0.536563,9.48567 -accelerometer: 11958770837,0.153304,0.498237,9.48567 -accelerometer: 11958790765,-0.0958148,0.344933,9.77311 -accelerometer: 11958810816,0.344933,0.0766519,9.48567 -accelerometer: 11958830805,-0.0574889,0.32577,9.42818 -accelerometer: 11958850824,-0.153304,0.498237,9.40902 -accelerometer: 11958870783,0.229956,0.32577,9.40902 -accelerometer: 11958890772,0.0383259,0.440748,9.46651 -accelerometer: 11958910822,0.0383259,0.479074,9.65814 -accelerometer: 11958930902,0.153304,0.134141,9.71563 -accelerometer: 11958950983,0.268282,0.459911,9.75395 -accelerometer: 11958970972,0.383259,0.402422,9.94558 -accelerometer: 11958990778,0.210793,0.0766519,9.3132 -accelerometer: 11959010889,0.0958148,0.172467,9.69646 -accelerometer: 11959030756,0.019163,0.210793,8.94911 -accelerometer: 11959050867,-0.459911,0.344933,9.02576 -accelerometer: 11959071771,0.134141,0.210793,9.71563 -accelerometer: 11959090967,0,1.43722,9.61981 -accelerometer: 11959111292,0.249119,0.153304,10.0031 -accelerometer: 11959131006,0.134141,0.824008,9.71563 -accelerometer: 11959150964,-0.0766519,0.766519,9.29404 -accelerometer: 11959170923,-0.019163,0.114978,9.42818 -accelerometer: 11959190912,0.0766519,-0.019163,9.65814 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_twistLeft.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_twistLeft.dat deleted file mode 100644 index 909e3e1a..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_twistLeft.dat +++ /dev/null @@ -1,151 +0,0 @@ -accelerometer: 4892293507,-0.0574889,-0.344933,9.37069 -orientation:4888720692,5 -accelerometer: 4892330952,-0.153304,-0.32577,9.46651 -accelerometer: 4892350941,-0.210793,0,9.61981 -accelerometer: 4892371785,-0.0766519,-0.153304,9.524 -irProximity:4892378722,0.290196 -accelerometer: 4892390553,-0.153304,-0.5174,9.50483 -proximity:4892401000,0 -accelerometer: 4892411000,0.0383259,-0.210793,9.84977 -accelerometer: 4892430928,0.114978,0.0383259,9.86893 -accelerometer: 4892450917,-0.0958148,-0.0766519,9.60065 -accelerometer: 4892470753,-0.0574889,-0.0383259,9.88809 -accelerometer: 4892490925,0.344933,-0.172467,9.90726 -accelerometer: 4892511006,0.172467,-0.249119,9.54316 -accelerometer: 4892531025,0.114978,0.0958148,9.69646 -accelerometer: 4892550953,-4.82907,0.114978,9.92642 -accelerometer: 4892570820,-0.0958148,-0.306608,10.0414 -accelerometer: 4892590931,-0.0958148,-0.306608,9.71563 -accelerometer: 4892610951,-0.0958148,-0.383259,9.65814 -accelerometer: 4892630940,-0.32577,-0.498237,9.61981 -accelerometer: 4892650929,-0.383259,-0.153304,9.54316 -accelerometer: 4892670765,-0.459911,0.0766519,9.86893 -accelerometer: 4892690907,-0.32577,-0.268282,9.8306 -accelerometer: 4892710927,-0.440748,-0.114978,9.44734 -accelerometer: 4892730946,-0.670704,-0.114978,9.71563 -accelerometer: 4892750966,-0.498237,-0.383259,9.90726 -accelerometer: 4892770955,-0.440748,-0.402422,9.524 -accelerometer: 4892790974,-0.689867,-0.172467,9.35153 -accelerometer: 4892810963,-0.670704,-0.32577,9.3132 -accelerometer: 4892830922,-0.651541,-0.440748,9.3132 -accelerometer: 4892850941,-0.785682,-0.268282,9.23655 -accelerometer: 4892870930,-0.843171,-0.421585,9.23655 -accelerometer: 4892890889,-0.5174,-0.210793,9.44734 -accelerometer: 4892910939,-0.613215,-0.632378,9.33237 -accelerometer: 4892930928,-0.651541,-0.268282,9.71563 -accelerometer: 4892950947,-0.651541,-0.421585,9.96474 -accelerometer: 4892970936,-0.344933,-0.613215,9.96474 -accelerometer: 4892990773,-0.440748,-0.574889,9.46651 -accelerometer: 4893011067,-0.498237,-0.536563,9.84977 -accelerometer: 4893031087,-0.5174,-0.421585,9.54316 -accelerometer: 4893050892,-0.536563,-0.459911,9.56232 -accelerometer: 4893070942,-0.670704,-0.536563,9.40902 -accelerometer: 4893091054,-0.574889,-0.459911,9.37069 -accelerometer: 4893110920,-0.440748,-0.594052,9.46651 -accelerometer: 4893130940,-0.670704,-0.344933,9.54316 -accelerometer: 4893150929,-0.344933,-0.440748,9.23655 -accelerometer: 4893170918,-0.019163,-0.536563,8.83413 -accelerometer: 4893191060,0.114978,-0.344933,8.75748 -accelerometer: 4893210927,1.11145,-0.019163,7.99096 -accelerometer: 4893230946,3.23854,1.0348,8.01012 -accelerometer: 4893250935,5.34647,1.57136,8.35505 -accelerometer: 4893271504,7.05197,1.78216,7.03281 -accelerometer: 4893290974,8.91078,2.91277,5.40396 -orientation:4893290974,4 -accelerometer: 4893310689,10.5971,2.79779,2.79779 -accelerometer: 4893331013,11.0379,2.0696,1.14978 -accelerometer: 4893350880,10.0031,2.51035,0.843171 -accelerometer: 4893370900,8.10594,0.421585,1.13062 -irProximity:4893386626,0.294118 -accelerometer: 4893390950,6.51541,0.977311,0 -accelerometer: 4893410908,7.41607,0.689867,-4.36916 -accelerometer: 4893430897,8.4892,1.3989,-8.29757 -accelerometer: 4893450886,9.06409,1.49471,-8.60417 -accelerometer: 4893470753,8.22091,0.862334,-7.12862 -irProximity:4893487426,0.290196 -accelerometer: 4893490956,7.37774,0.306608,-6.76453 -accelerometer: 4893510945,8.1251,0.843171,-5.55726 -accelerometer: 4893530934,9.84977,0.90066,-3.69845 -accelerometer: 4893550953,11.402,0.651541,-1.87797 -accelerometer: 4893570973,12.6859,0.70903,-0.938986 -accelerometer: 4893590931,12.9925,0.651541,1.24559 -accelerometer: 4893610951,12.6476,1.60969,2.79779 -accelerometer: 4893631032,11.8044,1.16894,4.08171 -accelerometer: 4893650929,11.1337,1.60969,5.32731 -accelerometer: 4893670949,9.0066,0.728193,5.74889 -irProximity:4893688934,0.294118 -accelerometer: 4893690877,5.90219,0.70903,5.42312 -accelerometer: 4893710896,2.12709,0.383259,4.84823 -accelerometer: 4893730885,-0.766519,0.689867,5.71057 -accelerometer: 4893750996,-1.80132,-0.0958148,7.49272 -orientation:4893750996,5 -accelerometer: 4893770955,-1.85881,-0.5174,9.29404 -irProximity:4893789733,0.290196 -accelerometer: 4893790974,-2.12709,-0.114978,9.14074 -accelerometer: 4893810933,-2.37621,-4.88656,8.39338 -accelerometer: 4893830952,-2.20374,-0.134141,8.4892 -accelerometer: 4893850972,-1.57136,-0.421585,9.79228 -accelerometer: 4893870991,-1.80132,-0.421585,9.96474 -accelerometer: 4893890889,-1.82048,-0.210793,9.50483 -accelerometer: 4893910969,-1.53304,-0.114978,9.50483 -accelerometer: 4893930928,-1.53304,-0.19163,9.63897 -accelerometer: 4893950917,-1.59053,-0.210793,9.69646 -accelerometer: 4893970936,-1.5522,0.0574889,9.84977 -accelerometer: 4893991017,-1.37973,0.0766519,9.86893 -accelerometer: 4894010823,-1.37973,-4.71409,9.60065 -accelerometer: 4894030934,-1.26476,-0.153304,9.54316 -accelerometer: 4894050984,-1.09229,-0.0574889,9.48567 -accelerometer: 4894070973,-0.90066,0.0958148,9.48567 -accelerometer: 4894091115,-0.728193,-0.229956,9.42818 -accelerometer: 4894110951,-0.574889,-0.364096,9.54316 -accelerometer: 4894130971,-0.824008,-0.0766519,9.44734 -accelerometer: 4894150929,-0.249119,0.0383259,9.98391 -accelerometer: 4894170918,-0.479074,-0.383259,9.58148 -accelerometer: 4894190693,-0.344933,-0.0958148,9.61981 -accelerometer: 4894210896,-0.383259,0.0574889,9.63897 -accelerometer: 4894230946,-0.402422,-0.229956,9.69646 -accelerometer: 4894250935,-0.344933,-0.383259,9.46651 -accelerometer: 4894270955,-0.268282,-0.019163,9.65814 -accelerometer: 4894290852,-0.134141,-0.32577,9.81144 -accelerometer: 4894310994,0.153304,-0.306608,9.524 -accelerometer: 4894330769,0.0383259,-0.19163,9.40902 -accelerometer: 4894351002,-0.153304,-0.0766519,9.60065 -accelerometer: 4894370991,0.229956,-0.440748,10.0031 -accelerometer: 4894390889,-0.0574889,-0.229956,9.6773 -accelerometer: 4894410908,-0.172467,-0.249119,9.65814 -accelerometer: 4894430958,-0.229956,-0.229956,9.63897 -accelerometer: 4894450886,-0.0958148,-0.402422,9.37069 -accelerometer: 4894470753,-0.134141,-0.421585,9.60065 -accelerometer: 4894490925,-0.0766519,-0.613215,9.48567 -accelerometer: 4894510975,-0.0766519,-0.383259,9.6773 -accelerometer: 4894530812,-0.268282,0.0383259,9.71563 -accelerometer: 4894550953,-0.364096,4.82907,9.524 -accelerometer: 4894570973,-0.0766519,-0.574889,9.56232 -accelerometer: 4894590779,-0.306608,-0.555726,9.38986 -accelerometer: 4894610890,-0.613215,-0.287445,9.54316 -accelerometer: 4894630940,-0.498237,-0.0766519,9.40902 -accelerometer: 4894650960,-0.383259,-0.229956,9.58148 -accelerometer: 4894670918,-0.210793,-0.364096,9.58148 -accelerometer: 4894690816,-0.287445,-0.383259,9.65814 -accelerometer: 4894710896,-0.364096,-0.287445,9.61981 -accelerometer: 4894730916,-0.344933,-0.421585,9.48567 -accelerometer: 4894750966,-0.479074,-0.287445,9.35153 -accelerometer: 4894770955,-0.402422,-0.383259,9.63897 -accelerometer: 4894790822,-0.383259,-0.268282,9.63897 -accelerometer: 4894810963,-0.689867,-0.32577,9.10241 -accelerometer: 4894830922,-0.555726,-0.306608,9.17906 -accelerometer: 4894850941,-0.70903,-0.287445,9.48567 -accelerometer: 4894873494,-0.574889,-0.440748,9.46651 -accelerometer: 4894890950,-0.479074,-0.383259,9.58148 -accelerometer: 4894910786,-0.613215,-0.364096,9.6773 -accelerometer: 4894930775,-0.498237,-0.536563,9.69646 -accelerometer: 4894950795,-0.5174,-0.440748,9.75395 -accelerometer: 4894970814,-0.498237,-0.613215,9.71563 -accelerometer: 4894990803,-0.651541,-0.689867,9.65814 -accelerometer: 4895010823,-0.383259,-0.670704,9.98391 -accelerometer: 4895030812,-0.210793,-0.651541,10.1564 -accelerometer: 4895050801,-0.306608,-0.555726,10.2522 -accelerometer: 4895071004,-0.306608,-0.5174,10.0414 -accelerometer: 4895090840,-0.479074,-0.306608,9.54316 -accelerometer: 4895110859,-0.594052,-0.402422,8.20175 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_twistRight.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_twistRight.dat deleted file mode 100644 index 2e863fcb..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_twistRight.dat +++ /dev/null @@ -1,43 +0,0 @@ -irProximity:16491519325,0.286275 -proximity:16453336069,0 -orientation:0,5 -accelerometer: 1335457748904,-1.1881,0.670704,9.77311 -accelerometer: 1335457749003,-1.30308,0.306608,9.60065 -accelerometer: 1335457749103,-1.82048,0.32577,9.3132 -accelerometer: 1335457749203,-1.43722,0.249119,9.71563 -accelerometer: 1335457749303,-1.13062,0.153304,9.73479 -irProximity:16492124000,0.282353 -accelerometer: 1335457749405,-1.9163,0.536563,9.6773 -irProximity:16492224647,0.286275 -accelerometer: 1335457749503,-1.9163,0.555726,9.54316 -accelerometer: 1335457749603,-1.62885,0.613215,9.88809 -accelerometer: 1335457749703,-2.75947,0.90066,10.7696 -irProximity:16492526405,0.282353 -accelerometer: 1335457749803,-5.92136,-1.3989,0.785682 -irProximity:16492626900,0.286275 -accelerometer: 1335457749903,-8.31673,2.28039,-1.05396 -accelerometer: 1335457750003,-11.3828,0.440748,-2.91277 -irProximity:16492828010,0.294118 -accelerometer: 1335457750103,-9.23655,2.01211,-1.51387 -irProximity:16492928535,0.290196 -accelerometer: 1335457750207,-8.60417,1.68634,-1.28392 -orientation:0,3 -irProximity:16493029121,0.286275 -accelerometer: 1335457750303,-2.49119,0.728193,4.57995 -accelerometer: 1335457750403,1.14978,-0.613215,13.5674 -accelerometer: 1335457750503,0.574889,0.229956,10.2714 -accelerometer: 1335457750604,0.804845,0.5174,10.2905 -orientation:0,5 -accelerometer: 1335457750703,0.0383259,-0.0958148,9.44734 -accelerometer: 1335457750803,0.651541,-0.306608,10.0606 -accelerometer: 1335457750903,-0.153304,-0.0383259,9.54316 -accelerometer: 1335457751003,0.344933,0.114978,9.79228 -accelerometer: 1335457751103,0.0958148,0,9.56232 -accelerometer: 1335457751203,0.019163,0,9.524 -accelerometer: 1335457751303,0.134141,-0.0383259,9.48567 -accelerometer: 1335457751403,0.114978,-0.0766519,9.56232 -accelerometer: 1335457751503,-0.153304,0.153304,9.63897 -accelerometer: 1335457751603,-0.210793,0.268282,9.84977 -accelerometer: 1335457751703,0.0383259,0.19163,10.0031 -accelerometer: 1335457751803,-0.210793,0.210793,9.48567 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_whip.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensordata_whip.dat deleted file mode 100644 index 8c8eba3a..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensordata_whip.dat +++ /dev/null @@ -1,148 +0,0 @@ -orientation:11043900509,5 -accelerometer: 11122850857,0.114978,1.53304,9.25571 -accelerometer: 11122870938,0.114978,1.45639,10.0031 -accelerometer: 11122890957,0.0766519,0.90066,9.90726 -irProximity:11122905708,0.286275 -proximity:11122909156,0 -accelerometer: 11122910641,-0.229956,0.862334,9.524 -accelerometer: 11122930935,0.440748,1.45639,9.63897 -accelerometer: 11122950955,-0.019163,1.72467,9.40902 -accelerometer: 11122970974,-0.172467,1.99295,9.54316 -accelerometer: 11122990811,-0.0383259,2.01211,9.35153 -accelerometer: 11123010830,0.0958148,1.68634,9.44734 -accelerometer: 11123030972,-0.0958148,1.30308,9.58148 -accelerometer: 11123050961,-0.306608,1.20727,8.81497 -accelerometer: 11123070706,-0.287445,2.18458,8.73831 -accelerometer: 11123091000,-0.459911,4.6566,9.12157 -accelerometer: 11123110745,-0.747356,5.21233,9.86893 -accelerometer: 11123130978,-0.268282,2.0696,10.4438 -accelerometer: 11123150784,-0.383259,2.60616,9.08325 -accelerometer: 11123170987,-0.498237,3.31519,8.56585 -accelerometer: 11123190945,0,2.97026,9.29404 -accelerometer: 11123211148,-0.555726,2.7403,8.91078 -accelerometer: 11123230801,-0.5174,2.47202,9.10241 -accelerometer: 11123250943,-0.747356,2.75947,9.17906 -accelerometer: 11123270962,-0.632378,2.29956,9.19823 -accelerometer: 11123290921,-0.70903,2.29956,9.19823 -accelerometer: 11123311032,-0.785682,2.56784,9.0066 -accelerometer: 11123330960,-0.402422,2.66365,9.40902 -accelerometer: 11123350918,-0.344933,2.7403,8.81497 -accelerometer: 11123370938,-0.287445,2.98942,8.45087 -accelerometer: 11123390927,-0.383259,2.72114,9.02576 -accelerometer: 11123410641,-0.268282,2.68282,9.44734 -accelerometer: 11123430966,-0.268282,2.45286,9.27488 -accelerometer: 11123450955,-0.19163,2.68282,9.33237 -accelerometer: 11123470974,-0.134141,2.49119,9.3132 -accelerometer: 11123490964,-0.32577,2.49119,9.21739 -accelerometer: 11123510647,-0.459911,2.7403,9.25571 -accelerometer: 11123530942,-0.0383259,2.60616,9.21739 -accelerometer: 11123550961,0.114978,2.31872,9.21739 -accelerometer: 11123570736,0.172467,2.75947,8.75748 -accelerometer: 11123590756,0.0958148,2.98942,8.33589 -accelerometer: 11123610653,0.210793,2.85528,8.62334 -accelerometer: 11123630978,0.32577,3.02775,7.58854 -accelerometer: 11123650967,0.019163,3.2577,6.87951 -accelerometer: 11123670956,0.632378,3.7751,6.40043 -accelerometer: 11123690976,0.229956,3.54515,8.25924 -accelerometer: 11123710843,0.172467,3.02775,11.3062 -accelerometer: 11123730954,0.402422,2.08876,15.3687 -accelerometer: 11123751034,-0.172467,0.459911,21.2326 -accelerometer: 11123771023,-1.20727,-0.670704,25.6592 -accelerometer: 11123791897,-3.2577,-1.05396,27.633 -accelerometer: 11123810574,-2.79779,-0.364096,25.3143 -accelerometer: 11123830807,-0.938986,0.402422,16.8442 -accelerometer: 11123850796,-0.114978,1.45639,9.98391 -accelerometer: 11123870816,0.383259,0.824008,4.63744 -accelerometer: 11123890744,0.114978,-0.32577,-0.479074 -accelerometer: 11123910794,0.555726,-0.153304,-4.33083 -irProximity:11123916053,0.290196 -accelerometer: 11123930966,0.364096,-2.10793,-8.87245 -accelerometer: 11123950924,-1.24559,-3.35352,-22.0757 -accelerometer: 11123971005,-2.587,-9.92642,-39.2266 -accelerometer: 11123990780,-5.65308,-18.339,-39.2266 -accelerometer: 11124010861,-3.7751,-24.5286,-39.2266 -irProximity:11124017005,0.294118 -accelerometer: 11124030972,2.98942,-24.8927,-16.6909 -accelerometer: 11124050992,21.6925,-29.7793,21.7691 -accelerometer: 11124071072,18.1473,-38.3834,39.2458 -accelerometer: 11124090970,-3.67929,-38.0385,39.2458 -accelerometer: 11124110989,-5.30814,-19.6229,39.2458 -irProximity:11124117896,0.290196 -accelerometer: 11124130765,-3.41101,-2.03127,31.753 -accelerometer: 11124150998,0.32577,1.34141,9.524 -accelerometer: 11124170651,2.52951,2.47202,0.0574889 -accelerometer: 11124190762,4.15836,3.33436,-7.07114 -accelerometer: 11124210965,3.23854,1.97379,-9.54316 -irProximity:11124218879,0.286275 -accelerometer: 11124230984,3.18105,2.24207,-4.54162 -accelerometer: 11124250973,3.2577,1.49471,1.87797 -accelerometer: 11124270810,1.66718,1.62885,9.81144 -accelerometer: 11124290799,-0.364096,1.11145,15.1579 -accelerometer: 11124310818,-1.64802,1.11145,15.1771 -accelerometer: 11124330777,-2.03127,1.0348,13.3374 -accelerometer: 11124350979,-1.68634,1.20727,10.6929 -accelerometer: 11124370968,-0.613215,1.62885,9.35153 -accelerometer: 11124390896,0.153304,2.03127,8.4892 -accelerometer: 11124410794,0.402422,1.74383,7.4544 -accelerometer: 11124430874,0.364096,1.9163,7.9718 -accelerometer: 11124450955,0.670704,1.76299,8.96827 -accelerometer: 11124470974,0.440748,1.24559,8.29757 -accelerometer: 11124490964,0.498237,1.41806,8.47003 -accelerometer: 11124510800,0.766519,1.99295,8.85329 -accelerometer: 11124530972,0.785682,2.08876,9.88809 -accelerometer: 11124550961,0.670704,1.99295,10.233 -accelerometer: 11124570950,0.344933,1.74383,10.2714 -accelerometer: 11124590970,0.574889,1.45639,9.88809 -accelerometer: 11124610776,0.0958148,1.59053,9.44734 -accelerometer: 11124630917,0.019163,1.72467,9.37069 -accelerometer: 11124650937,-0.134141,1.60969,9.88809 -accelerometer: 11124670987,-0.32577,1.74383,9.8306 -accelerometer: 11124690945,-0.172467,1.82048,9.56232 -accelerometer: 11124710965,0.0958148,1.47555,9.33237 -accelerometer: 11124730954,-0.0766519,1.24559,9.19823 -accelerometer: 11124750973,0.0766519,1.62885,9.37069 -accelerometer: 11124770932,0.0766519,1.5522,8.94911 -accelerometer: 11124790951,0.249119,1.97379,9.33237 -accelerometer: 11124810910,0.268282,1.64802,9.44734 -accelerometer: 11124830868,0.287445,1.76299,9.23655 -accelerometer: 11124850949,0.229956,1.64802,8.71915 -accelerometer: 11124870938,0.421585,1.72467,9.40902 -accelerometer: 11124890927,0.32577,1.5522,9.06409 -accelerometer: 11124910946,0.344933,1.80132,9.08325 -accelerometer: 11124930935,0.306608,1.66718,9.21739 -accelerometer: 11124950985,0.402422,1.93546,9.1599 -accelerometer: 11124970975,0.32577,1.99295,9.06409 -accelerometer: 11124990811,0.153304,1.76299,9.33237 -accelerometer: 11125010922,0.268282,1.7055,9.56232 -accelerometer: 11125030911,0.594052,1.62885,9.06409 -accelerometer: 11125050961,0.306608,1.93546,9.17906 -accelerometer: 11125070889,0.344933,1.78216,9.17906 -accelerometer: 11125090970,-0.153304,1.62885,9.3132 -accelerometer: 11125110928,0.0574889,1.57136,9.25571 -accelerometer: 11125130887,0.229956,1.45639,9.524 -accelerometer: 11125150998,0.19163,1.59053,9.524 -accelerometer: 11125170956,0.249119,1.66718,9.63897 -accelerometer: 11125190976,0.019163,1.43722,9.69646 -accelerometer: 11125210995,0.114978,1.74383,9.56232 -accelerometer: 11125230923,0.249119,1.68634,9.37069 -accelerometer: 11125250943,0.306608,1.72467,9.3132 -accelerometer: 11125270962,0.306608,1.5522,9.88809 -accelerometer: 11125290982,0.114978,1.37973,9.71563 -accelerometer: 11125310971,0.114978,1.5522,9.50483 -accelerometer: 11125330899,0.0574889,1.5522,9.69646 -accelerometer: 11125350949,-0.153304,1.74383,9.27488 -accelerometer: 11125372281,0.019163,1.85881,8.94911 -accelerometer: 11125390866,-0.287445,1.89713,8.81497 -accelerometer: 11125410794,-0.19163,1.43722,9.40902 -accelerometer: 11125430996,-0.153304,1.11145,10.0606 -accelerometer: 11125450802,-0.0766519,1.36057,10.0989 -accelerometer: 11125470913,0.0766519,1.20727,9.58148 -accelerometer: 11125490933,-0.114978,1.34141,9.69646 -accelerometer: 11125510830,0.19163,1.47555,9.94558 -accelerometer: 11125531033,0.153304,1.51387,9.63897 -accelerometer: 11125550961,-0.0766519,1.76299,9.71563 -accelerometer: 11125570920,0.249119,1.45639,9.71563 -accelerometer: 11125591000,-0.153304,1.43722,9.56232 -accelerometer: 11125610989,-0.766519,1.83965,8.96827 -accelerometer: 11125630948,-0.479074,1.30308,9.37069 - diff --git a/tests/auto/qsensorgestures_gestures/mock_data/sensprdata_shakeRight.dat b/tests/auto/qsensorgestures_gestures/mock_data/sensprdata_shakeRight.dat deleted file mode 100644 index ccdcb1c8..00000000 --- a/tests/auto/qsensorgestures_gestures/mock_data/sensprdata_shakeRight.dat +++ /dev/null @@ -1,42 +0,0 @@ -irProximity:22645635549,0.286275 -proximity:22630498159,0 -orientation:0,5 -accelerometer: 1335463903054,0.306608,1.01564,9.54316 -accelerometer: 1335463903153,0.19163,0.90066,9.61981 -accelerometer: 1335463903253,0.210793,1.30308,9.69646 -accelerometer: 1335463903353,-0.306608,0.632378,9.6773 -accelerometer: 1335463903453,-0.402422,0.919823,9.524 -accelerometer: 1335463903553,0.229956,0.919823,9.61981 -accelerometer: 1335463903653,-0.114978,0.90066,9.38986 -accelerometer: 1335463903753,-0.249119,0.747356,9.61981 -accelerometer: 1335463903854,0.689867,1.16894,9.44734 -accelerometer: 1335463903953,16.8442,0.268282,11.7277 -accelerometer: 1335463904053,-22.1332,6.34294,6.95616 -accelerometer: 1335463904153,10.8846,-20.2744,10.2522 -accelerometer: 1335463904253,39.2074,-5.74889,8.14426 -accelerometer: 1335463904353,-39.2458,-12.6667,10.5971 -irProximity:22647146962,0.282353 -accelerometer: 1335463904454,39.2266,-8.04845,31.8105 -irProximity:22647248006,0.286275 -accelerometer: 1335463904553,2.91277,-20.0061,4.63744 -accelerometer: 1335463904653,-39.2458,-15.1579,8.85329 -accelerometer: 1335463904753,39.2266,-3.9859,19.2971 -accelerometer: 1335463904853,-16.0202,-2.64449,9.40902 -irProximity:22647652303,0.282353 -accelerometer: 1335463904953,-3.31519,3.94757,8.47003 -irProximity:22647753346,0.286275 -accelerometer: 1335463905053,0.134141,2.62533,8.81497 -accelerometer: 1335463905153,1.07313,2.41453,9.73479 -accelerometer: 1335463905253,0.862334,2.24207,9.84977 -accelerometer: 1335463905353,0.843171,2.29956,9.63897 -accelerometer: 1335463905453,0.766519,2.2229,9.29404 -accelerometer: 1335463905553,1.60969,1.99295,9.19823 -accelerometer: 1335463905653,1.13062,1.72467,9.58148 -accelerometer: 1335463905753,1.26476,1.66718,9.38986 -accelerometer: 1335463905853,0.843171,1.60969,9.33237 -accelerometer: 1335463905953,0.689867,1.43722,9.50483 -accelerometer: 1335463906053,0.0958148,1.59053,9.56232 -accelerometer: 1335463906153,0,1.22643,9.81144 -irProximity:22648964070,0.282353 -accelerometer: 1335463906253,0.421585,1.85881,9.40902 - diff --git a/tests/auto/qsensorgestures_gestures/mockbackends.h b/tests/auto/qsensorgestures_gestures/mockbackends.h deleted file mode 100644 index 517989e3..00000000 --- a/tests/auto/qsensorgestures_gestures/mockbackends.h +++ /dev/null @@ -1,79 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#ifndef MOCKBACKENDS_H -#define MOCKBACKENDS_H - -#include "mockcommon.h" - -#include <qsensorplugin.h> -#include <qsensorbackend.h> -#include <qsensormanager.h> - -#include <QAccelerometer> -#include <QOrientationSensor> -#include <QIRProximitySensor> -#include <QProximitySensor> - -#include <QFile> -#include <QDebug> -#include <QTest> - - -class mockSensorPlugin : public QObject, - public QSensorPluginInterface, - public QSensorBackendFactory -{ - Q_OBJECT - // Q_PLUGIN_METADATA(IID "com.qt-project.Qt.QSensorPluginInterface/1.0" FILE "plugin.json") - Q_INTERFACES(QSensorPluginInterface) -public: - QString m_filename; - - void registerSensors() override - { - qDebug() << "loaded the mock plugin"; - - QSensorManager::registerBackend("QAccelerometer", mockaccelerometer::id, this); - QSensorManager::registerBackend("QIRProximitySensor", mockirproximitysensor::id, this); - QSensorManager::registerBackend("QOrientationSensor", mockorientationsensor::id, this); - QSensorManager::registerBackend("QTapSensor", mocktapsensor::id, this); - QSensorManager::registerBackend("QProximitySensor", mockproximitysensor::id, this); - } - - void unregisterSensors() - { - QSensorManager::unregisterBackend("QAccelerometer", mockaccelerometer::id); - QSensorManager::unregisterBackend("QIRProximitySensor", mockirproximitysensor::id); - QSensorManager::unregisterBackend("QOrientationSensor", mockorientationsensor::id); - QSensorManager::unregisterBackend("QTapSensor", mocktapsensor::id); - QSensorManager::unregisterBackend("QProximitySensor", mockproximitysensor::id); - } - - - QSensorBackend *createBackend(QSensor *sensor) override - { - if (sensor->identifier() == mockaccelerometer::id) { - return new mockaccelerometer(sensor); - } - - if (sensor->identifier() == mockorientationsensor::id) { - return new mockorientationsensor(sensor); - } - - if (sensor->identifier() == mockirproximitysensor::id) { - return new mockirproximitysensor(sensor); - } - if (sensor->identifier() == mocktapsensor::id) { - return new mocktapsensor(sensor); - } - if (sensor->identifier() == mockproximitysensor::id) { - return new mockproximitysensor(sensor); - } - - qWarning() << "Can't create backend" << sensor->identifier(); - return 0; - } -}; - -#endif diff --git a/tests/auto/qsensorgestures_gestures/mockcommon.cpp b/tests/auto/qsensorgestures_gestures/mockcommon.cpp deleted file mode 100644 index db42c86f..00000000 --- a/tests/auto/qsensorgestures_gestures/mockcommon.cpp +++ /dev/null @@ -1,208 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include <QTimer> -#include <QDebug> -#include <QCoreApplication> -#include "mockcommon.h" - -Q_GLOBAL_STATIC(mockcommonPrivate, mockcommonPrv) - -mockcommonPrivate *mockcommonPrivate::instance() -{ - return mockcommonPrv(); -} - -mockcommonPrivate::mockcommonPrivate() - : QObject(),prevts(50), firstRun(0) -{ - readTimer = new QTimer(this); - readTimer->setSingleShot(true); - connect(readTimer,SIGNAL(timeout()),this,SLOT(timerout())); -} - -void mockcommonPrivate::timerout() -{ - while (pFile.isOpen() && !pFile.atEnd()) { - QString line = pFile.readLine(); - if (!line.isNull()) { - if (parseData(line)) { - readTimer->start(); - break; - } - } - } -} - -bool mockcommonPrivate::setFile(const QString &filename) -{ - if (pFile.isOpen()) - pFile.close(); - oldAccelTs = 0; - firstRun = true; - pFile.setFileName(":/" + filename); - return pFile.open(QIODevice::ReadOnly); -} - -bool mockcommonPrivate::parseData(const QString &line) -{ - bool ok = false; - QString sensorToken = line.section(QLatin1String(":"),0, 0).trimmed(); - QString data = line.section(QLatin1String(":"),1, 1).trimmed(); - - if (sensorToken == QLatin1String("accelerometer")) { - if (!firstRun) { - - Q_EMIT accelData(data); - if (prevts == 0 || prevts > 90000 ) - prevts = 20000; // use 20 Hz - if (prevts > 90000 ) // original slam timestamps are wrong - prevts = 100000; //use 100 Hz - readTimer->setInterval((int)prevts/1000); - } else { - firstRun = false; - } - quint64 ts = data.section(QLatin1String(","), 0,0).toULongLong(); - ok = true; - qreal difference; - if (oldAccelTs == 0) { - oldAccelTs = ts; - } - difference = ts - oldAccelTs; - - if (difference < 1 - || difference == ts) { - int hertz = 50; - readTimer->setInterval((1.0/hertz)*1000); - } else { - if (firstRun) - readTimer->setInterval((int)difference/1000); - } - oldAccelTs = ts; - prevts = difference; - - } else if (sensorToken == QLatin1String("irProximity")) { - Q_EMIT irProxyData(data); - } else if (sensorToken == QLatin1String("orientation")) { - Q_EMIT orientData(data); - } else if (sensorToken == QLatin1String("tap")) { - Q_EMIT tapData(data); //just send this it takes only one to be detected - } else if (sensorToken == QLatin1String("proximity")) { - Q_EMIT proxyData(data); - } - return ok; -} - - -mockcommon::mockcommon(QSensor *sensor) - : QSensorBackend(sensor), timer(0) -{ - mockcommonPrv()->readTimer->setInterval(0); -} - -void mockcommon::start() -{ - if (!mockcommonPrv()->readTimer->isActive()) { - mockcommonPrv()->readTimer->start(); - } -} - -void mockcommon::stop() -{ - if (mockcommonPrv()->readTimer->isActive()) { - mockcommonPrv()->readTimer->stop(); - } -} - -char const * const mockaccelerometer::id("mock.accelerometer"); - -mockaccelerometer::mockaccelerometer(QSensor *sensor) - : mockcommon(sensor) -{ - setReading<QAccelerometerReading>(&m_reading); - addDataRate(50, 50); // 50 - - connect(mockcommonPrv(),SIGNAL(accelData(QString)),this,SLOT(parseAccelData(QString))); -} - -void mockaccelerometer::parseAccelData(const QString &data) -{ - quint64 ts = data.section(QLatin1String(","), 0,0).toULongLong(); - m_reading.setTimestamp(ts); - m_reading.setX(data.section(QLatin1String(","), 1,1).toDouble()); - m_reading.setY(data.section(QLatin1String(","), 2,2).toDouble()); - m_reading.setZ(data.section(QLatin1String(","), 3,3).toDouble()); - newReadingAvailable(); -} - -char const * const mockorientationsensor::id("mock.orientation"); - -mockorientationsensor::mockorientationsensor(QSensor *sensor) - : mockcommon(sensor) -{ - setReading<QOrientationReading>(&m_reading); - addDataRate(50, 50); // 50Hz - connect(mockcommonPrv(),SIGNAL(orientData(QString)),this,SLOT(parseOrientData(QString))); -} - -void mockorientationsensor::parseOrientData(const QString &data) -{ - m_reading.setTimestamp(data.section(QLatin1String(","), 0,0).toULongLong()); - m_reading.setOrientation(static_cast<QOrientationReading::Orientation>(data.section(QLatin1String(","), 1,1).toInt())); - - newReadingAvailable(); -} - -char const * const mockirproximitysensor::id("mock.irproximity"); - -mockirproximitysensor::mockirproximitysensor(QSensor *sensor) - : mockcommon(sensor) -{ - setReading<QIRProximityReading>(&m_reading); - addDataRate(50, 50); // 50Hz - connect(mockcommonPrv(),SIGNAL(irProxyData(QString)),this,SLOT(parseIrProxyData(QString))); -} - -void mockirproximitysensor::parseIrProxyData(const QString &data) -{ - m_reading.setTimestamp(data.section(QLatin1String(","), 0,0).toULongLong()); - m_reading.setReflectance(data.section(QLatin1String(","), 1,1).toDouble()); - - newReadingAvailable(); -} - -char const * const mocktapsensor::id("mock.tap"); - -mocktapsensor::mocktapsensor(QSensor *sensor) - : mockcommon(sensor) -{ - setReading<QTapReading>(&m_reading); - addDataRate(50, 50); // 50Hz - connect(mockcommonPrv(),SIGNAL(tapData(QString)),this,SLOT(parseTapData(QString))); -} - -void mocktapsensor::parseTapData(const QString &data) -{ - m_reading.setTimestamp(data.section(QLatin1String(","), 0,0).toULongLong()); - m_reading.setDoubleTap((data.section(QLatin1String(","), 1,1).toInt() == 1)); - - newReadingAvailable(); -} - -char const * const mockproximitysensor::id("mock.proximity"); - -mockproximitysensor::mockproximitysensor(QSensor *sensor) - : mockcommon(sensor) -{ - setReading<QProximityReading>(&m_reading); - addDataRate(50, 50); // 50Hz - connect(mockcommonPrv(),SIGNAL(proxyData(QString)),this,SLOT(parseProxyData(QString))); -} - -void mockproximitysensor::parseProxyData(const QString &data) -{ - m_reading.setTimestamp(data.section(QLatin1String(","), 0,0).toULongLong()); - m_reading.setClose((data.section(QLatin1String(","), 1,1).toInt() == 1)); - - newReadingAvailable(); -} diff --git a/tests/auto/qsensorgestures_gestures/mockcommon.h b/tests/auto/qsensorgestures_gestures/mockcommon.h deleted file mode 100644 index 2a40daa4..00000000 --- a/tests/auto/qsensorgestures_gestures/mockcommon.h +++ /dev/null @@ -1,156 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#ifndef MOCKCOMMON_H -#define MOCKCOMMON_H - -#include <qsensorbackend.h> - -#include <QSensor> -#include <QTimer> -#include <QAccelerometer> -#include <QOrientationSensor> -#include <QIRProximitySensor> -#include <QProximitySensor> -#include <QTapSensor> - -#include <QFile> -#include <QTextStream> - -class mockcommonPrivate : public QObject -{ - Q_OBJECT -public: - - mockcommonPrivate(); - - static mockcommonPrivate *instance(); - - bool setFile(const QString &); - bool parseData(const QString &line); - QTimer *readTimer; - -public slots: - void timerout(); - -Q_SIGNALS: - void accelData(const QString &data); - void irProxyData(const QString &data); - void orientData(const QString &data); - void tapData(const QString &data); - void proxyData(const QString &data); - -private: - QFile pFile; - qreal oldAccelTs; - qreal prevts; - bool firstRun; -}; - -class mockcommon : public QSensorBackend -{ - Q_OBJECT -public: - mockcommon(QSensor *sensor); - - void start() override; - void stop() override; - static char const * const id; - -Q_SIGNALS: - void parseAccelData(const QString &data); - void parseIrProxyDatata(const QString &data); - void parseOrientData(const QString &data); - void parseTapData(const QString &data); - void parseProxyData(const QString &data); - -private: - int m_timerid; - friend class mockcommonPrivate; - QTimer *timer; - QSensor *parentSensor; - -}; - -class mockaccelerometer : public mockcommon -{ - Q_OBJECT - -public: - static char const * const id; - - mockaccelerometer(QSensor *sensor); - -public slots: - void parseAccelData(const QString &data); - -private: - QAccelerometerReading m_reading; - qreal lastTimestamp; -}; - -class mockorientationsensor : public mockcommon -{ - Q_OBJECT - -public: - static char const * const id; - - mockorientationsensor(QSensor *sensor); -public slots: - - void parseOrientData(const QString &data); - -private: - QOrientationReading m_reading; -}; - -class mockirproximitysensor : public mockcommon -{ - Q_OBJECT - -public: - static char const * const id; - - mockirproximitysensor(QSensor *sensor); -public slots: - - void parseIrProxyData(const QString &data); - -private: - QIRProximityReading m_reading; -}; - -class mocktapsensor : public mockcommon -{ - Q_OBJECT - -public: - static char const * const id; - - mocktapsensor(QSensor *sensor); -public slots: - - void parseTapData(const QString &data); - -private: - QTapReading m_reading; -}; - - -class mockproximitysensor : public mockcommon -{ - Q_OBJECT - -public: - static char const * const id; - - mockproximitysensor(QSensor *sensor); -public slots: - - void parseProxyData(const QString &data); - -private: - QProximityReading m_reading; -}; -#endif // MOCKCOMMON_H diff --git a/tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp b/tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp deleted file mode 100644 index 66249725..00000000 --- a/tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp +++ /dev/null @@ -1,424 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include <QString> -#include <QtTest> -#include <QtSensors/QSensorGestureManager> -#include <QtSensors/QSensorGesture> -#include <QFile> - -#include "mockbackends.h" - -class tst_sensorgestures_gestures : public QObject -{ - Q_OBJECT - -public: - tst_sensorgestures_gestures(); - -private Q_SLOTS: - void initTestCase(); - - void testTiltedTwist(); - void testNotPickup(); - - void testNotHover2(); - void testNotHover(); - void testNotWhip(); - - void testSingleGestures(); - void testSingleGestures_data(); - - void testSingleDataset2Gestures(); - void testSingleDataset2Gestures_data(); - - void testTwist(); - void testTwist_data(); - - void testShake2(); - void testShake2_data(); - - void testShake(); - - void testAllGestures(); - void testAllGestures_data(); - - -protected: - mockSensorPlugin plugin; - -}; - -tst_sensorgestures_gestures::tst_sensorgestures_gestures() -{ -} - -void tst_sensorgestures_gestures::initTestCase() -{ - qputenv("QT_SENSORS_LOAD_PLUGINS", "0"); // Do not load plugins - plugin.registerSensors(); -} - -void tst_sensorgestures_gestures::testSingleGestures() -{ - QFETCH(QString, gestureId); - QFETCH(QStringList, gestureSignals); - - QString name = "mock_data/sensordata_" + gestureId + ".dat"; - - QSensorGestureManager manager; - QStringList idList = manager.gestureIds(); - QString gestStr = QLatin1String("QtSensors.") + gestureId; - - QVERIFY(idList.contains(gestStr)); - - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(QStringList() << gestStr)); - QVERIFY(gesture.data()->validIds().contains(gestStr)); - - QSignalSpy spy_gesture(gesture.data(), SIGNAL(detected(QString))); - - QCOMPARE(mockcommonPrivate::instance()->setFile(name), true); - gesture.data()->startDetection(); - QCOMPARE(gesture->isActive(),true); - - auto toStringList = [](const QList<QList<QVariant>> list) { - QStringList result; - for (const QList<QVariant> &item: list) { - if (!item.isEmpty()) - result << item.first().toString(); - } - return result; - }; - - QTRY_COMPARE_WITH_TIMEOUT(toStringList(spy_gesture), gestureSignals, 7000); -} - -void tst_sensorgestures_gestures::testSingleGestures_data() -{ - QTest::addColumn<QString>("gestureId"); - QTest::addColumn<QStringList>("gestureSignals"); - QTest::newRow("cover") << "cover" << QStringList({ "cover"}); - QTest::newRow("doubletap") << "doubletap" << QStringList({ "doubletap" }); - QTest::newRow("hover") << "hover" << QStringList({ "hover" }); - QTest::newRow("pickup") << "pickup" << QStringList({ "pickup" }); - QTest::newRow("shake2") << "shake2" << QStringList({ "shakeRight" }); - QTest::newRow("slam") << "slam" << QStringList({ "slam" }); - QTest::newRow("turnover") << "turnover" << QStringList({ "turnover" }); - QTest::newRow("twist") << "twist" << QStringList({ "twistLeft", "twistLeft", "twistRight" }); - QTest::newRow("whip") << "whip" << QStringList({ "whip" }); -} - -void tst_sensorgestures_gestures::testSingleDataset2Gestures() -{ - QFETCH(QString, gestureId); - - QString name = "dataset2_mock_data/sensordata_" + gestureId + ".dat"; - QSensorGestureManager manager; - QStringList idList = manager.gestureIds(); - - QString gestStr = QLatin1String("QtSensors.") + gestureId; - - QVERIFY(idList.contains(gestStr)); - - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(QStringList() << gestStr)); - QVERIFY(gesture.data()->validIds().contains(gestStr)); - - QSignalSpy spy_gesture(gesture.data(), SIGNAL(detected(QString))); - - QCOMPARE(mockcommonPrivate::instance()->setFile(name), true); - gesture.data()->startDetection(); - QCOMPARE(gesture->isActive(),true); - - QTRY_COMPARE_WITH_TIMEOUT(spy_gesture.count(),1, 7000); -} - -void tst_sensorgestures_gestures::testSingleDataset2Gestures_data() -{ - QTest::addColumn<QString>("gestureId"); - QTest::newRow("cover") << "cover"; - QTest::newRow("doubletap") << "doubletap"; - QTest::newRow("hover") << "hover"; - QTest::newRow("pickup") << "pickup"; - QTest::newRow("shake2") << "shake2"; //multi? - QTest::newRow("slam") << "slam"; - QTest::newRow("turnover") << "turnover"; - QTest::newRow("twist") << "twist"; //multi? - QTest::newRow("whip") << "whip"; -} - -void tst_sensorgestures_gestures::testTwist() -{ - QFETCH(QString, gestureSignal); - - QString name = "mock_data/sensordata_" + gestureSignal + ".dat"; - - QSensorGestureManager manager; - QStringList idList = manager.gestureIds(); - - QString gestStr = QLatin1String("QtSensors.twist"); - - QVERIFY(idList.contains(gestStr)); - - QScopedPointer<QSensorGesture> gesture2(new QSensorGesture(QStringList() << gestStr)); - QVERIFY(gesture2.data()->validIds().contains(gestStr)); - - QSignalSpy spy_gesture(gesture2.data(), SIGNAL(detected(QString))); - - QCOMPARE(mockcommonPrivate::instance()->setFile(name), true); - gesture2.data()->startDetection(); - QCOMPARE(gesture2->isActive(),true); - - QTRY_COMPARE_WITH_TIMEOUT(spy_gesture.count(),1, 7000); - - QList<QVariant> arguments = spy_gesture.takeFirst(); - QCOMPARE(arguments.at(0).toString(), QString(gestureSignal)); -} - -void tst_sensorgestures_gestures::testTwist_data() -{ - QTest::addColumn<QString>("gestureSignal"); - QTest::newRow("twistLeft") << "twistLeft"; - QTest::newRow("twistRight") << "twistRight"; -} - -void tst_sensorgestures_gestures::testShake2() -{ - QFETCH(QString, gestureSignal); - - QString name = "mock_data/sensordata_" + gestureSignal + ".dat"; - - QSensorGestureManager manager; - QStringList idList = manager.gestureIds(); - - QString gestStr = QLatin1String("QtSensors.shake2"); - - QVERIFY(idList.contains(gestStr)); - - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(QStringList() << gestStr)); - QVERIFY(gesture.data()->validIds().contains(gestStr)); - - QSignalSpy spy_gesture(gesture.data(), SIGNAL(detected(QString))); - - QCOMPARE(mockcommonPrivate::instance()->setFile(name), true); - gesture.data()->startDetection(); - QCOMPARE(gesture->isActive(),true); - - QTRY_COMPARE_WITH_TIMEOUT(spy_gesture.count(),1, 7000); - QList<QVariant> arguments = spy_gesture.takeFirst(); - QCOMPARE(arguments.at(0).toString(), QString(gestureSignal)); - - gesture.data()->stopDetection(); -} - -void tst_sensorgestures_gestures::testShake2_data() -{ - QTest::addColumn<QString>("gestureSignal"); - QTest::newRow("shakeLeft") << "shakeLeft"; - QTest::newRow("shakeRight") << "shakeRight"; - QTest::newRow("shakeUp") << "shakeUp"; - QTest::newRow("shakeDown") << "shakeDown"; -} - -void tst_sensorgestures_gestures::testShake() -{ - QString gestureSignal = "shake"; - - QString name = "mock_data/sensordata_shake2.dat"; - - QSensorGestureManager manager; - QStringList idList = manager.gestureIds(); - - QString gestStr = QLatin1String("QtSensors.shake"); - - QVERIFY(idList.contains(gestStr)); - - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(QStringList() << gestStr)); - QVERIFY(gesture.data()->validIds().contains(gestStr)); - - QSignalSpy spy_gesture(gesture.data(), SIGNAL(detected(QString))); - - QCOMPARE(mockcommonPrivate::instance()->setFile(name), true); - gesture.data()->startDetection(); - QCOMPARE(gesture->isActive(),true); - - QTRY_COMPARE_WITH_TIMEOUT(spy_gesture.count(),1, 7000); - QList<QVariant> arguments = spy_gesture.takeFirst(); - - QCOMPARE(arguments.at(0).toString(), QString(gestureSignal)); - gesture.data()->stopDetection(); -} - - -void tst_sensorgestures_gestures::testAllGestures_data() -{ - testSingleGestures_data(); -} - -void tst_sensorgestures_gestures::testAllGestures() -{ - QFETCH(QString, gestureId); - - QString name = "dataset2_mock_data/sensordata_" + gestureId + ".dat"; - - QSensorGestureManager manager; - QStringList idList = manager.gestureIds(); - - QStringList gestStringList; - - gestStringList << "QtSensors.cover" - << "QtSensors.doubletap" - << "QtSensors.hover" - << "QtSensors.pickup" - << "QtSensors.shake2" - << "QtSensors.slam" - << "QtSensors.turnover" - << "QtSensors.twist" - << "QtSensors.whip"; - - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(gestStringList)); - - QCOMPARE(gesture->invalidIds().count(),0); - QSignalSpy spy_gesture(gesture.data(), SIGNAL(detected(QString))); - - QCOMPARE(mockcommonPrivate::instance()->setFile(name), true); - gesture.data()->startDetection(); - QCOMPARE(gesture->isActive(),true); - - QTRY_COMPARE_WITH_TIMEOUT(spy_gesture.count(),1, 7000); - - gesture.data()->stopDetection(); - - QList<QVariant> arguments = spy_gesture.takeFirst(); - QString gestureSignal; - if (gestureId.right(1) == QLatin1String("2")) { - gestureSignal = "shakeLeft"; - } else if (gestureId.contains("twist")) { - gestureSignal = "twistLeft"; - } else { - gestureSignal = gestureId; - } - - QCOMPARE(arguments.at(0).toString(), QString(gestureSignal)); -} - -void tst_sensorgestures_gestures::testNotHover() -{ - QString name = "mock_data/sensordata_nothover.dat"; - - QSensorGestureManager manager; - QStringList idList = manager.gestureIds(); - - QStringList gestStringList; - - gestStringList << "QtSensors.hover"; - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(gestStringList)); - - QCOMPARE(gesture->invalidIds().count(),0); - QSignalSpy spy_gesture(gesture.data(), SIGNAL(detected(QString))); - - QCOMPARE(mockcommonPrivate::instance()->setFile(name), true); - gesture.data()->startDetection(); - QCOMPARE(gesture->isActive(),true); - - QTRY_COMPARE_WITH_TIMEOUT(spy_gesture.count(),0, 2000); - -} - -void tst_sensorgestures_gestures::testNotWhip() -{ - - QString name = "mock_data/sensordata_notwhip.dat"; - - QSensorGestureManager manager; - QStringList idList = manager.gestureIds(); - - QStringList gestStringList; - - gestStringList << "QtSensors.whip"; - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(gestStringList)); - - QCOMPARE(gesture->invalidIds().count(),0); - QSignalSpy spy_gesture(gesture.data(), SIGNAL(detected(QString))); - - QCOMPARE(mockcommonPrivate::instance()->setFile(name), true); - gesture.data()->startDetection(); - QCOMPARE(gesture->isActive(),true); - - QTRY_COMPARE_WITH_TIMEOUT(spy_gesture.count(),0, 2000); - -} - -void tst_sensorgestures_gestures::testNotHover2() -{ -// test slam when coming to close to head - QString name = "dataset2_mock_data/sensordata_nothover2.dat"; - - QStringList gestStringList; - - gestStringList << "QtSensors.hover"; - gestStringList << "QtSensors.slam"; - - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(gestStringList)); - - QCOMPARE(gesture->invalidIds().count(),0); - QSignalSpy spy_gesture(gesture.data(), SIGNAL(detected(QString))); - - QCOMPARE(mockcommonPrivate::instance()->setFile(name), true); - gesture.data()->startDetection(); - QCOMPARE(gesture->isActive(),true); - - QTRY_COMPARE_WITH_TIMEOUT(spy_gesture.count(),1, 2000); - - QList<QVariant> arguments = spy_gesture.takeFirst(); - QCOMPARE(arguments.at(0).toString(), QLatin1String("slam")); -} - -void tst_sensorgestures_gestures::testTiltedTwist() -{ - QString name = "mock_data/sensordata_tiltedtwist.dat"; - - QStringList gestStringList; - - gestStringList << "QtSensors.twist"; - QScopedPointer<QSensorGesture> gesture(new QSensorGesture(gestStringList)); - - QCOMPARE(gesture->invalidIds().count(),0); - QSignalSpy spy_gesture(gesture.data(), SIGNAL(detected(QString))); - - QCOMPARE(mockcommonPrivate::instance()->setFile(name), true); - gesture.data()->startDetection(); - QCOMPARE(gesture->isActive(),true); - - QTRY_COMPARE_WITH_TIMEOUT(spy_gesture.count(),1, 7000); - - QList<QVariant> arguments = spy_gesture.takeFirst(); - QCOMPARE(arguments.at(0).toString(), QLatin1String("twistLeft")); -} - -void tst_sensorgestures_gestures::testNotPickup() -{ -// QString name = "mock_data/sensordata_notpickup.dat"; - -// QStringList gestStringList; -// gestStringList << "QtSensors.pickup" << "QtSensors.twist"; - -// QScopedPointer<QSensorGesture> gesture(new QSensorGesture(gestStringList)); - -// QCOMPARE(gesture->invalidIds().count(),0); -// QSignalSpy spy_gesture(gesture.data(), SIGNAL(detected(QString))); - -// QCOMPARE(mockcommonPrivate::instance()->setFile(name), true); -// gesture.data()->startDetection(); -// QCOMPARE(gesture->isActive(),true); - -// QTRY_COMPARE_WITH_TIMEOUT(spy_gesture.count(),1, 7000); - -// QList<QVariant> arguments = spy_gesture.takeFirst(); -// QCOMPARE(arguments.at(0).toString(), QLatin1String("twistLeft")); -} - - - -QTEST_MAIN(tst_sensorgestures_gestures) - -#include "tst_sensorgestures_gestures.moc" diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt index dce2d8c4..8686f854 100644 --- a/tests/manual/CMakeLists.txt +++ b/tests/manual/CMakeLists.txt @@ -1,9 +1,10 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause if(TARGET Qt::Widgets) - add_subdirectory(sensor_explorer) + add_subdirectory(sensor_explorer_widgets) endif() if (TARGET Qt::Quick) add_subdirectory(sensorclerk) + add_subdirectory(sensor_explorer_qml) endif() diff --git a/tests/manual/sensor_explorer_qml/CMakeLists.txt b/tests/manual/sensor_explorer_qml/CMakeLists.txt new file mode 100644 index 00000000..e68fce62 --- /dev/null +++ b/tests/manual/sensor_explorer_qml/CMakeLists.txt @@ -0,0 +1,32 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +cmake_minimum_required(VERSION 3.16) +project(tst_manual_sensor_explorer_qml LANGUAGES CXX) + +set(CMAKE_AUTOMOC ON) + +find_package(Qt6 REQUIRED COMPONENTS Qml Quick Sensors) + +qt_add_executable(tst_manual_sensor_explorer_qml + main.cpp + sensormodels.cpp sensormodels.h +) + +set_target_properties(tst_manual_sensor_explorer_qml PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) + +target_link_libraries(tst_manual_sensor_explorer_qml PUBLIC + Qt::Qml + Qt::Quick + Qt::Sensors +) + +qt_add_qml_module(tst_manual_sensor_explorer_qml + URI SensorModels + VERSION 1.0 + QML_FILES sensor_explorer.qml + NO_RESOURCE_TARGET_PATH +) diff --git a/examples/sensors/sensor_explorer/main.cpp b/tests/manual/sensor_explorer_qml/main.cpp index 4eeaa147..604a6d36 100644 --- a/examples/sensors/sensor_explorer/main.cpp +++ b/tests/manual/sensor_explorer_qml/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQml> #include <QtQuick/QQuickWindow> diff --git a/examples/sensors/sensor_explorer/qml.qrc b/tests/manual/sensor_explorer_qml/qml.qrc index df6160ae..df6160ae 100644 --- a/examples/sensors/sensor_explorer/qml.qrc +++ b/tests/manual/sensor_explorer_qml/qml.qrc diff --git a/examples/sensors/sensor_explorer/sensor_explorer.qml b/tests/manual/sensor_explorer_qml/sensor_explorer.qml index 9fe59baa..e80fb0a4 100644 --- a/examples/sensors/sensor_explorer/sensor_explorer.qml +++ b/tests/manual/sensor_explorer_qml/sensor_explorer.qml @@ -1,14 +1,12 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtQuick.Window import QtQuick.Controls import QtQuick.Layouts -//! [0] import SensorModels -//! [0] Window { id: window @@ -74,14 +72,11 @@ Window { } } - //! [1] SensorPropertyModel { id: propertyModel sensor: availableSensorsModel.get(sensorsView.currentIndex) } - //! [1] - //! [2] Button { id: activateButton Layout.preferredHeight: 30 @@ -92,7 +87,6 @@ Window { : qsTr("Activate sensor")) onClicked: propertyModel.sensor.active = !propertyModel.sensor.active } - //! [2] GroupBox { title: qsTr("Selected sensor's properties") @@ -101,7 +95,6 @@ Window { Layout.margins: 2 enabled: sensorsView.currentIndex != -1 - //! [3] TableView { id: propertyView anchors.fill: parent @@ -121,7 +114,6 @@ Window { } } } - //! [3] } } } diff --git a/examples/sensors/sensor_explorer/sensormodels.cpp b/tests/manual/sensor_explorer_qml/sensormodels.cpp index b0aa7189..36de4412 100644 --- a/examples/sensors/sensor_explorer/sensormodels.cpp +++ b/tests/manual/sensor_explorer_qml/sensormodels.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "sensormodels.h" #include "qsensor.h" @@ -20,7 +20,7 @@ QByteArray rangelistToByteArray(const qrangelist& list) else ranges << QString("%1-%2 Hz").arg(r.first).arg(r.second); } - if (ranges.count() > 0) + if (ranges.size() > 0) return ranges.join(", ").toLatin1(); return "-"; } @@ -31,7 +31,7 @@ QByteArray outputrangelistToByteArray(const qoutputrangelist& list) for (const qoutputrange &r : list) { ranges << QString("(%1, %2) += %3").arg(r.minimum).arg(r.maximum).arg(r.accuracy); } - if (ranges.count() > 0) + if (ranges.size() > 0) return ranges.join(", ").toLatin1(); return "-"; } @@ -51,7 +51,6 @@ AvailableSensorsModel::AvailableSensorsModel(QObject* parent) : QAbstractListMod */ void AvailableSensorsModel::loadSensors() { - //! [0] beginResetModel(); m_availableSensors.clear(); @@ -66,26 +65,23 @@ void AvailableSensorsModel::loadSensors() } } endResetModel(); - //! [0] } int AvailableSensorsModel::rowCount(const QModelIndex&) const { - return m_availableSensors.count(); + return m_availableSensors.size(); } -//! [1] QVariant AvailableSensorsModel::data(const QModelIndex &index, int role) const { if (role != Qt::DisplayRole) return QVariant(); return QVariant::fromValue<QSensor*>(m_availableSensors.at(index.row())); } -//! [1] QSensor* AvailableSensorsModel::get(int index) const { - if (index < 0 || index >= m_availableSensors.count()) + if (index < 0 || index >= m_availableSensors.size()) return nullptr; return m_availableSensors[index]; } @@ -103,7 +99,7 @@ int SensorPropertyModel::rowCount(const QModelIndex&) const { if (!m_sensor) return 0; - return m_values.count(); + return m_values.size(); } int SensorPropertyModel::columnCount(const QModelIndex&) const @@ -134,7 +130,6 @@ void SensorPropertyModel::setSensor(QSensor *sensor) // available sensors without knowing their properties in advance / compile-time. // 1. Read properties of the 'reading' object if available - //! [2] int firstProperty = QSensorReading::staticMetaObject.propertyOffset(); QSensorReading *reading = m_sensor->reading(); if (reading) { @@ -145,7 +140,6 @@ void SensorPropertyModel::setSensor(QSensor *sensor) (name, reading->property(name).toByteArray())); } } - //! [2] // 2. Read properties of the 'sensor' object const QMetaObject *mo1 = m_sensor->metaObject(); diff --git a/examples/sensors/sensor_explorer/sensormodels.h b/tests/manual/sensor_explorer_qml/sensormodels.h index 02de2a8e..4f16d6fd 100644 --- a/examples/sensors/sensor_explorer/sensormodels.h +++ b/tests/manual/sensor_explorer_qml/sensormodels.h @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef QSEONSOREXPLORER_H #define QSEONSOREXPLORER_H @@ -12,12 +12,10 @@ QT_BEGIN_NAMESPACE -//! [0] class AvailableSensorsModel: public QAbstractListModel { Q_OBJECT QML_ELEMENT -//! [0] public: explicit AvailableSensorsModel(QObject* parent = nullptr); int rowCount(const QModelIndex & = QModelIndex()) const override; diff --git a/tests/manual/sensor_explorer/CMakeLists.txt b/tests/manual/sensor_explorer_widgets/CMakeLists.txt index d921c869..357eb02e 100644 --- a/tests/manual/sensor_explorer/CMakeLists.txt +++ b/tests/manual/sensor_explorer_widgets/CMakeLists.txt @@ -1,11 +1,11 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## sensor_explorer Binary: ##################################################################### -qt_internal_add_manual_test(tst_manual_sensor_explorer +qt_internal_add_manual_test(tst_manual_sensor_explorer_widgets GUI SOURCES explorer.cpp explorer.h explorer.ui diff --git a/tests/manual/sensor_explorer/explorer.cpp b/tests/manual/sensor_explorer_widgets/explorer.cpp index e6353c01..16a4582b 100644 --- a/tests/manual/sensor_explorer/explorer.cpp +++ b/tests/manual/sensor_explorer_widgets/explorer.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "explorer.h" #include <QTimer> diff --git a/tests/manual/sensor_explorer/explorer.h b/tests/manual/sensor_explorer_widgets/explorer.h index 92aa6f47..05e200f3 100644 --- a/tests/manual/sensor_explorer/explorer.h +++ b/tests/manual/sensor_explorer_widgets/explorer.h @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef EXPLORER_H #define EXPLORER_H diff --git a/tests/manual/sensor_explorer/explorer.ui b/tests/manual/sensor_explorer_widgets/explorer.ui index 166e9c36..166e9c36 100644 --- a/tests/manual/sensor_explorer/explorer.ui +++ b/tests/manual/sensor_explorer_widgets/explorer.ui diff --git a/tests/manual/sensor_explorer/main.cpp b/tests/manual/sensor_explorer_widgets/main.cpp index 0e2ea93d..005ec17d 100644 --- a/tests/manual/sensor_explorer/main.cpp +++ b/tests/manual/sensor_explorer_widgets/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include "explorer.h" diff --git a/tests/manual/sensorclerk/CMakeLists.txt b/tests/manual/sensorclerk/CMakeLists.txt index dd4267a3..18a487b3 100644 --- a/tests/manual/sensorclerk/CMakeLists.txt +++ b/tests/manual/sensorclerk/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## sensorclerk Binary: diff --git a/tests/manual/sensorclerk/collector.cpp b/tests/manual/sensorclerk/collector.cpp index 25365f51..4ebc7203 100644 --- a/tests/manual/sensorclerk/collector.cpp +++ b/tests/manual/sensorclerk/collector.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 Lorn Potter. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QtQml/qqml.h> #include <QtCore/QFile> @@ -110,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 59af29fe..0f1098c9 100644 --- a/tests/manual/sensorclerk/collector.h +++ b/tests/manual/sensorclerk/collector.h @@ -1,5 +1,5 @@ // Copyright (C) 2017 Lorn Potter. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef COLLECTOR_H #define COLLECTOR_H @@ -43,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 19028e9f..468f1d88 100644 --- a/tests/manual/sensorclerk/main.cpp +++ b/tests/manual/sensorclerk/main.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2017 Lorn Potter. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <QGuiApplication> #include <QtQuick/QQuickView> diff --git a/tests/manual/sensorclerk/qml/main.qml b/tests/manual/sensorclerk/qml/main.qml index a7c5cd88..0853599c 100644 --- a/tests/manual/sensorclerk/qml/main.qml +++ b/tests/manual/sensorclerk/qml/main.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 Lorn Potter. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only import QtQuick import QtQuick.Controls import Collector diff --git a/tests/systemtests/sys_SensorElements/sys_declarative-sensor-elements.qtt b/tests/systemtests/sys_SensorElements/sys_declarative-sensor-elements.qtt deleted file mode 100644 index fd9431dc..00000000 --- a/tests/systemtests/sys_SensorElements/sys_declarative-sensor-elements.qtt +++ /dev/null @@ -1,275 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -//include("Device.qtx") -//include("extrafunctions.qtt") - -//TESTED_COMPONENT=src/sensors - -testcase = { - -/* -init: function() { - qtuitest.checkActiveWindow = false; - qtuitest.autoTerminate = false; - wait(500); - unlock(); - wait(500); -}, - - -cleanup: function() { - print("Cleanup test function"); - unlock(); - wait(500); - Gesture.swipe(Screen.leftCenter(), Screen.rightCenter()); //close applicatin - wait(500); -}, -*/ - -// As a QML Application developer I need information about the position of the device (rotation angles from X and Y Axis) - Device_Rotational_Position: function() - { - // Test meta data - testTitle = "device position (rotation angles from X and Y Axis)"; - testBinary = "QML QtSensors"; - testSource = "$QTDIR/qtsensors/examples/QtSensors/QtSensors_qmlqtsensors"; - testGoal = "Verify that the values of the X and Y axis are returned from the application and match those of the actual phone"; - testPreconditions = "Nil."; - testGroups = "BAT, 5.0"; - testRequirements = ""; - - // Test steps -// mouseClick(findByProperty("label", testBinary)); wait(500); - prompt(twiki("---+++ " + testTitle + "<br><br> - *Goal:* " + testGoal + "<br> - *Pre-Requisites:* " + testPreconditions + "<br> - *Tested Binary:* " + testBinary + "<br> - - | *Step* | *Verification* | - | Launch " + testBinary + " | App launches normally | - | Press the *Start* button for the accelerometer | The button now displays *running* and numeric values are displayed for X and Y Rotation | - | Hold the device with the screen facing up in portrait | Verfy the x, y rotation values are approximatly 0,0 | - | Rotate the device toward you along the x axis | Verify that the x rotation values increase from zero as the device is rotated and the y values remain at approximatly 0 | - | Return the device to the screen facing up in portrait position | Verfy the x, y rotation values are approximatly 0,0 | - | Rotate the device away from you along the x axis | Verify that the x rotation values decrease from zero (become negitive) as the device is rotated and the y values remain at approximatly 0 | - | Return the device to the screen facing up in portrait position | Verfy the x, y rotation values are approximatly 0,0 | - | Rotate the device to the right along the y axis | Verify that the y rotation values increase from zero as the device is rotated and the x values remain at approximatly 0 | - | Return the device to the screen facing up in portrait position | Verfy the x, y rotation values are approximatly 0,0 | - | Rotate the device to the left along the y axis | Verify that the y rotation values decrease from zero (become negitive) as the device is rotated and the x values remain at approximatly 0 | - ")); - }, - -// As a QML Application developer I want to calibrate the current device position - Calibrate_Current_Device_Position: function() - { - // Test meta data - testTitle = "Accelerometer Calibration"; - testBinary = "QML QtSensors"; - testSource = "$QTDIR/qtsensors/examples/QtSensors/QtSensors_qmlqtsensors" - testGoal = "Verify that the application can be set to read an X and Y value of zero for the current phone position"; - testPreconditions = "Nil."; - testGroups = "BAT, 5.0"; - testRequirements = ""; - - // Test steps -// mouseClick(findByProperty("label", testBinary)); wait(500); - prompt(twiki("---+++ " + testTitle + "<br><br> - *Goal:* " + testGoal + "<br> - *Pre-Requisites:* " + testPreconditions + "<br> - *Tested Binary:* " + testBinary + "<br> - - | *Step* | *Verification* | - | Launch " + testBinary + " | App launches normally | - | Press the *Start* button for the accelerometer | The button now displays *running* and numeric values are displayed for X and Y Rotation | - | Hold the device with the screen facing up in portrait | Verfy the x, y rotation values are approximatly 0,0 | - | Rotate the device toward you along the x axis until the device is at 90 degrees| Verify that the x rotation values show approximatly 90 degrees and the y values remain at approximatly 0 | - | While holding the device in this position select the calibrate button | Verify that the x, y values now show approximatly 0,0 | - | Return the device to the face up position | Verify that the accelerometer x, y rotation shows approximatly -90,0 | - | While holding the device in this position select the calibrate button | Verify that the x, y values now show approximatly 0,0 | - | Rotate the device toward the right along the y axis until the device is at 90 degrees| Verify that the x rotation values remain at approximatly 0 degrees and the y value show approximatly 90 degrees | - | While holding the device in this position select the calibrate button | Verify that the x, y values now show approximatly 0,0 | - | Return the device to the face up position | Verify that the accelerometer x, y rotation shows approximatly 0,-90 | - | Select the calibrate button | Verify that the x, y values now show approximatly 0,0 | - ")); - }, - - // As a QML Application developer I want to find the device orientation - Show_Device_Orientation: function() - { - // Test meta data - testTitle = "Phone Orientation"; - testBinary = "sensor explorer"; - testSource = "$QTDIR/qtsensors/examples/QtSensors/QtSensors_sensor_explorer" - testGoal = "Verify that the application can show the orientation of the phone"; - testPreconditions = "Nil."; - testGroups = "BAT, 5.0"; - testRequirements = ""; - - // Test steps -// mouseClick(findByProperty("label", testBinary)); wait(500); - prompt(twiki("---+++ " + testTitle + "<br><br> - *Goal:* " + testGoal + "<br> - *Pre-Requisites:* " + testPreconditions + "<br> - *Tested Binary:* " + testBinary + "<br> - - | *Step* | *Verification* | - | Launch " + testBinary + " | App launches normally | - | Select orientation from the sensor list and press start | *Orientation* is highlighted and orientation type shows the current orientation | - | Orient the device with the screen facing up | Verify that the orientation type shows *FaceUp* | - | Orient the device with the left side facing up | Verify that the orientation type shows *LeftUp* | - | Orient the device with the top down | Verify that the orientation type shows *TopDown* | - | Orient the device with the face down | Verify that the orientation type shows *FaceDown* | - | Orient the device with the right side facing up | Verify that the orientation type shows *FaceUp* | - | Orient the device with the top facing up | Verify that the orientation type shows *TopUp* | - ")); - }, - -// As a QML Application developer I would like to have one QML element per sensor type -// MTMW-427 QML System Test - Using only Proximity sensor does not start the sensor hardware - Display_All_Sensor_Types: function() - { - // Test meta data - testTitle = "List Sensor Types"; - testBinary = "sensor explorer"; - testSource = "$QTDIR/qtsensors/examples/QtSensors/QtSensors_sensor_explorer" - testGoal = "Verify that all sensor types are shown by the application"; - testPreconditions = "Nil."; - testGroups = "BAT, 5.0"; - testRequirements = ""; - - // Test steps -// mouseClick(findByProperty("label", testBinary)); wait(500); - prompt(twiki("---+++ " + testTitle + "<br><br> - *Goal:* " + testGoal + "<br> - *Pre-Requisites:* " + testPreconditions + "<br> - *Tested Binary:* " + testBinary + "<br> - - | *Step* | *Verification* | - | Launch " + testBinary + " | App launches normally | - | Ensure that none of the sensors are in a *running* state | Press any buttons that display *Running* to place that sensor in a *Stopped* state | - | Each sensor button will display *start* or *Stopped*, press the accelerometer *Start* button | Verify that the accelerometer button displays *running* and operates as expected | - | Press the accelerometer button again to stop the accelerometer | Verify the button reads *Stopped* and the X, Y Rotation values do not repond to movement | - | Press the Ambient Light *Start* button | Verify that the Ambient Light sensor button displays *running* and operates as expected | - | Press the Ambient Light button again to stop the Ambient Light sensor | Verify the button reads *Stopped* and the Ambient Light sensor does not respond when a shadow falls on it | - | Press the Proximity sensor *Start* button | Verify that the Proximity sensor button displays *running* and operates as expected | - | Press the Proximity sensor button again to stop the Proximity sensor | Verify the button reads *Stopped* and the Proximity sensor does not respond when when your palm is brought within 1 cm of the Proximity sensor | - | Press all sensor buttons again to start all sensors | Verify all buttons read *Running* and all sensors operate as expected | - ")); - }, - -// As a QML Application developer I would like to receive the rotation angles in Radian or Degree - Display_Angles_Radian_Degrees: function() - { - // Test meta data - testTitle = "Rotation Units"; - testBinary = "QML QtSensors"; - testSource = "$QTDIR/qtsensors/examples/QtSensors/QtSensors_qmlqtsensors" - testGoal = "Verify that the read values for the X and Y axis can be displayed in radians or degrees"; - testPreconditions = "Nil."; - testGroups = "BAT, 5.0"; - testRequirements = ""; - - // Test steps -// mouseClick(findByProperty("label", testBinary)); wait(500); - prompt(twiki("---+++ " + testTitle + "<br><br> - *Goal:* " + testGoal + "<br> - *Pre-Requisites:* " + testPreconditions + "<br> - *Tested Binary:* " + testBinary + "<br> - - | *Step* | *Verification* | - | Launch " + testBinary + " | App launches normally | - | Press the *Start* button for the accelerometer | The button now displays *running* and numeric values are displayed for X and Y Rotation | - | Hold the device in portrait face up horizontal | Verify the x, y rotation values display 0,0 | - | While holding the device in this position press the button marked *degree* | Verify the button now reads *radian* and the x, y rotation values display approximatly 0,0 | - | Still holding the device in portrait tilt the device at right angles toward you (screen facing you) | Verify the x, y rotation values display approximatly 1.57,0| - | While holding the device in this position press the button marked *radian* | Verify the button now reads *radian* and the x, y rotation values display approximatly 90,0 | - ")); - }, - -// As a QML Application developer I would like to change my UI dependent of the ambient light - Ambient_Light_Detection: function() - { - // Test meta data - testTitle = "Ambient Light Sensor"; - testBinary = "QML QtSensors"; - testSource = "$QTDIR/qtsensors/examples/QtSensors/QtSensors_qmlqtsensors"; - testGoal = "Verify that the ambient light values can be read"; - testPreconditions = "Nil."; - testGroups = "BAT, 5.0"; - testRequirements = "A bright light source such as a desk lamp"; - - - // Test steps -// mouseClick(findByProperty("label", testBinary)); wait(500); - prompt(twiki("---+++ " + testTitle + "<br><br> - *Goal:* " + testGoal + "<br> - *Pre-Requisites:* " + testPreconditions + "<br> - *Tested Binary:* " + testBinary + "<br> - - | *Step* | *Verification* | - | Launch " + testBinary + " | App launches normally | - | Press the *Start* button for the ambient light sensor | The button now displays *running* and a value is displayed for *Ambient Light* | - | Place the device close under a bright light | Verify that the Ambient Light is reported as *Sunny* | - | Move the device a bit futher away from the light source | Verify that the Ambient Light is reported as *Bright* | - | Move the device even futher away from the light source | Verify that the Ambient Light is reported as *Light* | - | Place the light sensor element under a partial shadow, i.e. by holding your hand above the device | Verify that the Ambient Light is reported as *Twilight*, note that the amount of shadow may need to be adjusted by moving your hand to achieve this | - | Place your finger over the sensor element | Verify that the Ambient Light now reads as *Dark* | - ")); - }, - -// As a QML Application developer I would like to deactivate the touchscreen as soon the proximity of the user is close - no need for test app to lock screen, testing that the proximity is detected is sufficient - Proximity_Detection: function() - { - // Test meta data - testTitle = "Proximity"; - testBinary = "QML QtSensors"; - testSource = "$QTDIR/qtsensors/examples/QtSensors/QtSensors_qmlqtsensors"; - testGoal = "Verify that close proximity can be detected"; - testPreconditions = "Nil."; - testGroups = "BAT, 5.0"; - testRequirements = ""; - - // Test steps -// mouseClick(findByProperty("label", testBinary)); wait(500); - prompt(twiki("---+++ " + testTitle + "<br><br> - *Goal:* " + testGoal + "<br> - *Pre-Requisites:* " + testPreconditions + "<br> - *Tested Binary:* " + testBinary + "<br> - | *Step* | *Verification* | - | Launch " + testBinary + " | App launches normally | - | Press the *Start* button for the *Proximity* | The button now displays *running* and a value is displayed for *Proximity* | - | Confirm that nothing is close to the proximity detector | Verify that the Proximity reads *far* | - | Bring your hand to within 1 cm of the proximity sensor | Verify that the Proximity now reads *near* | - | Move your hand away from the proximity sensor | Verify that the Proximity now reads *far* | - ")); - }, - -// MTMW-426 Handle service errors gracefully - Service_Errors: function() - { - // Test meta data - testTitle = "Error Handling"; - testBinary = "QML QtSensors"; - testSource = "$QTDIR/qtsensors/examples/QtSensors/QtSensors_qmlqtsensors"; - testGoal = "Verify that service errors are handled so as to prevent baldr crashes if the sensor daemon stops unexpectedly"; - testPreconditions = "Nil."; - testGroups = "BAT, 5.0"; - testRequirements = ""; - - // Test steps -// mouseClick(findByProperty("label", testBinary)); wait(500); - prompt(twiki("---+++ " + testTitle + "<br><br> - *Goal:* " + testGoal + "<br> - *Pre-Requisites:* " + testPreconditions + "<br> - *Tested Binary:* " + testBinary + "<br> - | *Step* | *Verification* | - | Launch " + testBinary + " | App launches normally | - | Press start on the three sensors | Verify that the sensors are operating | - | Log into the device using a console and enter the following commands: ps -A | grep sensorq | Verify that the process ID number for sensorq is displayed | - | Using the process ID from the previous step stop sensorq by typing kill processID at the console | | - | Check the sensors on " + testBinary + " | Verify that the sensors are still operating | - | Repeat the previous steps to find the process ID and kill sensorq a second time | Verify the sensors are still operating and sensorq still has a process ID | - ")); - }, -} diff --git a/tests/systemtests/sys_SensorGestures/sys_declarative-sensor-gestures.qtt b/tests/systemtests/sys_SensorGestures/sys_declarative-sensor-gestures.qtt deleted file mode 100644 index fd4169e1..00000000 --- a/tests/systemtests/sys_SensorGestures/sys_declarative-sensor-gestures.qtt +++ /dev/null @@ -1,150 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -//include("product.qtx") -//include("extrafunctions.qtt") - -//TESTED_COMPONENT=src/sensors/gestures - -testcase = { - -/* -init: function() { - qtuitest.checkActiveWindow = false; - qtuitest.autoTerminate = false; - wait(500); - unlock(); - wait(500); -}, - - -cleanup: function() { - print("Cleanup test function"); - unlock(); - wait(500); - Gesture.swipe(Screen.leftCenter(), Screen.rightCenter()); //close applicatin - wait(500); -}, -*/ - -// As a QML Application developer I need to be able to list sensor gesture plugins - List_Sensor_Gestures: function() - { - // Test meta data - testApplication = "Gesture"; - testBinary = "Gesture"; // Running QML using qmlrunner will insert test app binary name when compiled - testGoal = "Verify a list of all registered sensor gesture plugins"; - testPreconditions = "Nil."; - testGroups = "5.0"; - - // Test steps -// mouseClick(findByProperty("label", testBinary)); wait(500); - prompt(twiki("---+++ " + testApplication + "<br><br> - *Goal:* " + testGoal + "<br> - *Pre-Requisites:* " + testPreconditions + "<br> - *Tested Binary:* " + testBinary + "<br> - - | *Step* | *Verification* | - | Launch " + testBinary + " | App launches normally | - | Observe the list of all gestures shown in the top menu | Verify that the expected gestures are displayed | - ")); - }, - -// As a QML Application developer I need to be able to select a sensor gesture plugin - Select_Sensor_Gesture: function() - { - // Test meta data - testApplication = "Gesture"; - testBinary = "Gesture"; - testGoal = "Verify selection of a sensor gesture plugin"; - testPreconditions = "Nil."; - testGroups = "5.0"; - - // Test steps -// mouseClick(findByProperty("label", testBinary)); wait(500); - prompt(twiki("---+++ " + testApplication + "<br><br> - *Goal:* " + testGoal + "<br> - *Pre-Requisites:* " + testPreconditions + "<br> - *Tested Binary:* " + testBinary + "<br> - - | *Step* | *Verification* | - | Launch " + testBinary + " | App launches normally | - | Select the QtSensors.shake gesture from the gesture list | Verify the QtSensors.shake gesture becomes highlighted and the detection menu now has the title *QtSensors.shake* | - ")); - }, - -// As a QML Application developer I need to be able to trigger a sensor gesture plugins - Trigger_Sensor_Gesture: function() - { - // Test meta data - testApplication = "Gesture"; - testBinary = "Gesture"; - testGoal = "Verify that a sensor gesture is triggered"; - testPreconditions = "Nil."; - testGroups = "5.0"; - - // Test steps -// mouseClick(findByProperty("label", testBinary)); wait(500); - prompt(twiki("---+++ " + testApplication + "<br><br> - *Goal:* " + testGoal + "<br> - *Pre-Requisites:* " + testPreconditions + "<br> - *Tested Binary:* " + testBinary + "<br> - - | *Step* | *Verification* | - | Launch " + testBinary + " | App launches normally | - | Select the QtSensors.shake gesture from the gesture list and press *start* on the detection menu | Verify that *start* button now reads *stop* and is highlighted | - | Shake the phone more than 3 times in the X axis | Verify that shake detections are registered | - ")); - }, - -// Sensor gestures are not triggered by false positives - Sensor_Gesture_False_Positives: function() - { - // Test meta data - testApplication = "ShakeIt!"; - testBinary = "ShakeIt!"; - testGoal = "Verify that a sensor gesture doesn't trigger falsely"; - testPreconditions = "Nil."; - testGroups = "5.0"; - - // Test steps -// mouseClick(findByProperty("label", testBinary)); wait(500); - prompt(twiki("---+++ " + testApplication + "<br><br> - *Goal:* " + testGoal + "<br> - *Pre-Requisites:* " + testPreconditions + "<br> - *Tested Binary:* " + testBinary + "<br> - - | *Step* | *Verification* | - | Launch " + testBinary + " | App launches normally | - | | The display shows* Shake to rotate the triangles* and three tringles are below that | - | Perform the *Shake* gesture | Verify that *Shake* is displayed and the triangles rotate | - | | Verify no other gestures register at the same time | - | Wait for 3 seconds while observing the display | Verify the display now reads *Try another gesture* and the triangles return to the center of the display | - | Perform the *Slam* gesture | Verify that *Slam* is displayed and the triangles move out from the center of the display | - | | Verify no other gestures register at the same time | - | Wait for 3 seconds while observing the display | Verify the display now reads *Try another gesture* and the triangles return to the center of the display | - | Perform the *Whip* gesture | Verify that the *Whip* is displayed | - | | Verify no other gestures register at the same time | - | Wait for 3 seconds while observing the display | Verify the display now reads *Try another gesture* and the triangles return to the center of the display | - | Perform the *Hover* gesture | Verify that the *hover* is displayed and the triangles move to the top of the display | - | | Verify no other gestures register at the same time | - | Wait for 3 seconds while observing the display | Verify the display now reads *Try another gesture* and the triangles return to the center of the display | - | Perform the *Cover* gesture | Verify that the *Cover* is displayed and the triangles go to the bottom of the display | - | | Verify no other gestures register at the same time | - | Wait for 3 seconds while observing the display | Verify the display now reads *Try another gesture* and the triangles return to the center of the display | - | Perform the *Twist Left* gesture | Verify that the *TwistLeft* is displayed and the triangles move to the left | - | | Verify no other gestures register at the same time | - | Wait for 3 seconds while observing the display | Verify the display now reads *Try another gesture* and the triangles return to the center of the display | - | Perform the *Twist Right* gesture | Verify that the *TwistRight* is displayed and the triangles move to the right | - | | Verify no other gestures register at the same time | - | Wait for 3 seconds while observing the display | Verify the display now reads *Try another gesture* and the triangles return to the center of the display | - | Perform the *Pickup* gesture | Verify that the *Pickup* is displayed | - | | Verify no other gestures register at the same time | - | Wait for 3 seconds while observing the display | Verify the display now reads *Try another gesture* and the triangles return to the center of the display | - | Perform the *Turnover* gesture | Verify that the turnover chime is played | - | Turn over and wait for 3 seconds while observing the display | Verify the display now reads *Try another gesture* and the triangles return to the center of the display | - | Perform the *Double Tap* gesture | Verify that the *Double Tap* is displayed | - | | Verify no other gestures register at the same time | - | Wait for 3 seconds while observing the display | Verify the display now reads *Try another gesture* and the triangles return to the center of the display | - ")); - }, -} |
