summaryrefslogtreecommitdiffstats
path: root/examples/sensors/sensorgestures
diff options
context:
space:
mode:
authorJuha Vuolle <juha.vuolle@insta.fi>2022-09-29 17:53:56 +0300
committerJuha Vuolle <juha.vuolle@insta.fi>2022-10-04 08:11:45 +0300
commit7a94c109e6805b35150522b6714f04e63d751888 (patch)
tree4ce31ad1feb0de16bda4c591ad18c165db833b1d /examples/sensors/sensorgestures
parentd5d24fd5fe095337063891204e4fee4c6914b165 (diff)
Remove disabled sensor gesture code
Support for sensor gestures in their then-current form was removed in Qt 6 (QTBUG-95747). This commit removes the disabled code. This is to avoid distraction when keeping the repository up-to-date with rest of Qt. The gestures may be reintroduced in some shape or form in the future (QTBUG-97066). For those reference purposes the old code can be found in the git history. Fixes: QTBUG-107065 Change-Id: If2c50171f84d483dde55600422d138d550124bdc Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'examples/sensors/sensorgestures')
-rw-r--r--examples/sensors/sensorgestures/CMakeLists.txt39
-rw-r--r--examples/sensors/sensorgestures/doc/images/sensorgesturecpp.pngbin33013 -> 0 bytes
-rw-r--r--examples/sensors/sensorgestures/doc/src/sensorgestures.qdoc43
-rw-r--r--examples/sensors/sensorgestures/main.cpp14
-rw-r--r--examples/sensors/sensorgestures/mainwindow.cpp131
-rw-r--r--examples/sensors/sensorgestures/mainwindow.h39
-rw-r--r--examples/sensors/sensorgestures/mainwindow.ui84
-rw-r--r--examples/sensors/sensorgestures/sensorgestures.pro16
8 files changed, 0 insertions, 366 deletions
diff --git a/examples/sensors/sensorgestures/CMakeLists.txt b/examples/sensors/sensorgestures/CMakeLists.txt
deleted file mode 100644
index 46aa22da..00000000
--- a/examples/sensors/sensorgestures/CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright (C) 2022 The Qt Company Ltd.
-# SPDX-License-Identifier: 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
deleted file mode 100644
index 4d453cf2..00000000
--- a/examples/sensors/sensorgestures/doc/images/sensorgesturecpp.png
+++ /dev/null
Binary files differ
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>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-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;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</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