diff options
author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2021-03-26 09:36:15 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-26 09:06:42 +0000 |
commit | 1d067e8aa9bddd056447aefb5b626b3b0db5ab63 (patch) | |
tree | 3a3e0e66862e7e309ab281b14cbfe8752bfc756b | |
parent | 5928a0529c3b25dd30ac5df16cb28bc33f1563c0 (diff) |
Rename qmloscilloscope
There was a naming conflict with QtCharts
qmloscilloscope example, so this is now
renamed as qml3doscilloscope
Fixes: QTBUG-92167
Change-Id: I657d9737c39b0680aabc6b7c00ebe04351643502
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 695276e2c4725d67960aa212043fe1b86c47fe95)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | examples/datavisualization/CMakeLists.txt | 2 | ||||
-rw-r--r-- | examples/datavisualization/datavisualization.pro | 2 | ||||
-rw-r--r-- | examples/datavisualization/qml3doscilloscope/CMakeLists.txt (renamed from examples/datavisualization/qmloscilloscope/CMakeLists.txt) | 18 | ||||
-rw-r--r-- | examples/datavisualization/qml3doscilloscope/datasource.cpp (renamed from examples/datavisualization/qmloscilloscope/datasource.cpp) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qml3doscilloscope/datasource.h (renamed from examples/datavisualization/qmloscilloscope/datasource.h) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qml3doscilloscope/doc/images/qml3doscilloscope-example.png (renamed from examples/datavisualization/qmloscilloscope/doc/images/qmloscilloscope-example.png) | bin | 129028 -> 129028 bytes | |||
-rw-r--r-- | examples/datavisualization/qml3doscilloscope/doc/src/qml3doscilloscope.qdoc (renamed from examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc) | 30 | ||||
-rw-r--r-- | examples/datavisualization/qml3doscilloscope/main.cpp (renamed from examples/datavisualization/qmloscilloscope/main.cpp) | 2 | ||||
-rw-r--r-- | examples/datavisualization/qml3doscilloscope/qml/qml3doscilloscope/main.qml (renamed from examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml) | 0 | ||||
-rw-r--r-- | examples/datavisualization/qml3doscilloscope/qml3doscilloscope.pro (renamed from examples/datavisualization/qmloscilloscope/qmloscilloscope.pro) | 4 | ||||
-rw-r--r-- | examples/datavisualization/qml3doscilloscope/qml3doscilloscope.qrc (renamed from examples/datavisualization/qmloscilloscope/qmloscilloscope.qrc) | 2 |
11 files changed, 30 insertions, 30 deletions
diff --git a/examples/datavisualization/CMakeLists.txt b/examples/datavisualization/CMakeLists.txt index b70b3b53..b90ca103 100644 --- a/examples/datavisualization/CMakeLists.txt +++ b/examples/datavisualization/CMakeLists.txt @@ -5,7 +5,7 @@ if(TARGET Qt::Quick) add_subdirectory(qmlcustominput) add_subdirectory(qmllegend) add_subdirectory(qmlmultigraph) - add_subdirectory(qmloscilloscope) + add_subdirectory(qml3doscilloscope) add_subdirectory(qmlsurfacelayers) add_subdirectory(qmlaxisformatter) add_subdirectory(qmlaxisdrag) diff --git a/examples/datavisualization/datavisualization.pro b/examples/datavisualization/datavisualization.pro index f9fce6af..ca01bace 100644 --- a/examples/datavisualization/datavisualization.pro +++ b/examples/datavisualization/datavisualization.pro @@ -6,7 +6,7 @@ qtHaveModule(quick) { qmlcustominput \ qmllegend \ qmlmultigraph \ - qmloscilloscope \ + qml3doscilloscope \ qmlsurfacelayers \ qmlaxisformatter \ qmlaxisdrag \ diff --git a/examples/datavisualization/qmloscilloscope/CMakeLists.txt b/examples/datavisualization/qml3doscilloscope/CMakeLists.txt index 9fdfbc70..f37e9c5d 100644 --- a/examples/datavisualization/qmloscilloscope/CMakeLists.txt +++ b/examples/datavisualization/qml3doscilloscope/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(qmloscilloscope LANGUAGES CXX) +project(qml3doscilloscope LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -18,15 +18,15 @@ find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Qml) find_package(Qt6 COMPONENTS Quick) -qt_add_executable(qmloscilloscope +qt_add_executable(qml3doscilloscope datasource.cpp datasource.h main.cpp ) -set_target_properties(qmloscilloscope PROPERTIES +set_target_properties(qml3doscilloscope PROPERTIES WIN32_EXECUTABLE TRUE MACOSX_BUNDLE TRUE ) -target_link_libraries(qmloscilloscope PUBLIC +target_link_libraries(qml3doscilloscope PUBLIC Qt::Core Qt::Gui Qt::Qml @@ -34,18 +34,18 @@ target_link_libraries(qmloscilloscope PUBLIC Qt::DataVisualization ) -set(qmloscilloscope_resource_files - "qml/qmloscilloscope/main.qml" +set(qml3doscilloscope_resource_files + "qml/qml3doscilloscope/main.qml" ) -qt6_add_resources(qmloscilloscope "qmloscilloscope" +qt6_add_resources(qml3doscilloscope "qml3doscilloscope" PREFIX "/" FILES - ${qmloscilloscope_resource_files} + ${qml3doscilloscope_resource_files} ) -install(TARGETS qmloscilloscope +install(TARGETS qml3doscilloscope RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/datavisualization/qmloscilloscope/datasource.cpp b/examples/datavisualization/qml3doscilloscope/datasource.cpp index 336458a8..336458a8 100644 --- a/examples/datavisualization/qmloscilloscope/datasource.cpp +++ b/examples/datavisualization/qml3doscilloscope/datasource.cpp diff --git a/examples/datavisualization/qmloscilloscope/datasource.h b/examples/datavisualization/qml3doscilloscope/datasource.h index dc3ea568..dc3ea568 100644 --- a/examples/datavisualization/qmloscilloscope/datasource.h +++ b/examples/datavisualization/qml3doscilloscope/datasource.h diff --git a/examples/datavisualization/qmloscilloscope/doc/images/qmloscilloscope-example.png b/examples/datavisualization/qml3doscilloscope/doc/images/qml3doscilloscope-example.png Binary files differindex d8a79a36..d8a79a36 100644 --- a/examples/datavisualization/qmloscilloscope/doc/images/qmloscilloscope-example.png +++ b/examples/datavisualization/qml3doscilloscope/doc/images/qml3doscilloscope-example.png diff --git a/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc b/examples/datavisualization/qml3doscilloscope/doc/src/qml3doscilloscope.qdoc index 748bbc6c..6ad3f69f 100644 --- a/examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc +++ b/examples/datavisualization/qml3doscilloscope/doc/src/qml3doscilloscope.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \example qmloscilloscope + \example qml3doscilloscope \title Qt Quick 2 Oscilloscope Example \ingroup qtdatavisualization_examples \brief Example of a hybrid C++ and QML application. @@ -34,7 +34,7 @@ The Qt Quick 2 oscilloscope example shows how to combine C++ and QML in an application, as well as showing data that changes realtime. - \image qmloscilloscope-example.png + \image qml3doscilloscope-example.png The interesting thing about this example is combining C++ and QML, so we'll concentrate on that and skip explaining the basic functionality - for @@ -53,18 +53,18 @@ The \c DataSource class provides three methods that can be called from QML: - \snippet qmloscilloscope/datasource.h 0 + \snippet qml3doscilloscope/datasource.h 0 The first method, \c generateData(), creates a cache of simulated oscilloscope data for us to display. The data is cached in a format accepted by QSurfaceDataProxy: - \snippet qmloscilloscope/datasource.cpp 0 + \snippet qml3doscilloscope/datasource.cpp 0 The second method, \c update(), copies one set of the cached data into another array, which we set to the data proxy of the series by calling QSurfaceDataProxy::resetArray(). We reuse the same array if the array dimensions have not changed to minimize overhead: - \snippet qmloscilloscope/datasource.cpp 1 + \snippet qml3doscilloscope/datasource.cpp 1 \note Even though we are operating on the array pointer we have previously set to the proxy we still need to call QSurfaceDataProxy::resetArray() after changing the data in it to prompt @@ -73,21 +73,21 @@ To be able to access the \c DataSource methods from QML, we need to expose it. We do this by defining a context property in application main: - \snippet qmloscilloscope/main.cpp 0 + \snippet qml3doscilloscope/main.cpp 0 To make it possible to use QSurface3DSeries pointers as parameters on the \c DataSource class methods on all environments and builds, we need to make sure the meta type is registered: - \snippet qmloscilloscope/datasource.cpp 3 + \snippet qml3doscilloscope/datasource.cpp 3 \dots 0 - \snippet qmloscilloscope/datasource.cpp 4 + \snippet qml3doscilloscope/datasource.cpp 4 \section1 QML In the QML codes, we define a Surface3D graph normally and give it a Surface3DSeries: - \snippet qmloscilloscope/qml/qmloscilloscope/main.qml 0 + \snippet qml3doscilloscope/qml/qml3doscilloscope/main.qml 0 One interesting detail is that we don't specify a proxy for the Surface3DSeries we attach to the graph. This makes the series to utilize the default QSurfaceDataProxy. @@ -101,14 +101,14 @@ We initialize the \c DataSource cache when the graph is complete by calling a helper function \c generateData(), which calls the method with the same name on the \c DataSource: - \snippet qmloscilloscope/qml/qmloscilloscope/main.qml 2 + \snippet qml3doscilloscope/qml/qml3doscilloscope/main.qml 2 \dots 4 - \snippet qmloscilloscope/qml/qmloscilloscope/main.qml 4 + \snippet qml3doscilloscope/qml/qml3doscilloscope/main.qml 4 To trigger the updates in data, we define a \c Timer item which calls the \c update() method on the \c DataSource at requested intervals. The label update is also triggered on each cycle: - \snippet qmloscilloscope/qml/qmloscilloscope/main.qml 3 + \snippet qml3doscilloscope/qml/qml3doscilloscope/main.qml 3 \section1 Enabling Direct Rendering @@ -118,11 +118,11 @@ We use the utility function provided by Qt Data Visualization to change the surface format in \c main.cpp: - \snippet qmloscilloscope/main.cpp 1 + \snippet qml3doscilloscope/main.cpp 1 \dots 0 - \snippet qmloscilloscope/main.cpp 2 + \snippet qml3doscilloscope/main.cpp 2 On the QML side, direct rendering mode is enabled via \l{AbstractGraph3D::renderingMode}{renderingMode} property: - \snippet qmloscilloscope/qml/qmloscilloscope/main.qml 5 + \snippet qml3doscilloscope/qml/qml3doscilloscope/main.qml 5 */ diff --git a/examples/datavisualization/qmloscilloscope/main.cpp b/examples/datavisualization/qml3doscilloscope/main.cpp index f0cb9b68..fef0f30e 100644 --- a/examples/datavisualization/qmloscilloscope/main.cpp +++ b/examples/datavisualization/qml3doscilloscope/main.cpp @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) viewer.rootContext()->setContextProperty("dataSource", &dataSource); //! [0] - viewer.setSource(QUrl("qrc:/qml/qmloscilloscope/main.qml")); + viewer.setSource(QUrl("qrc:/qml/qml3doscilloscope/main.qml")); viewer.setResizeMode(QQuickView::SizeRootObjectToView); viewer.show(); diff --git a/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml b/examples/datavisualization/qml3doscilloscope/qml/qml3doscilloscope/main.qml index 7a97764a..7a97764a 100644 --- a/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml +++ b/examples/datavisualization/qml3doscilloscope/qml/qml3doscilloscope/main.qml diff --git a/examples/datavisualization/qmloscilloscope/qmloscilloscope.pro b/examples/datavisualization/qml3doscilloscope/qml3doscilloscope.pro index 89023cc0..07ee9838 100644 --- a/examples/datavisualization/qmloscilloscope/qmloscilloscope.pro +++ b/examples/datavisualization/qml3doscilloscope/qml3doscilloscope.pro @@ -9,8 +9,8 @@ SOURCES += main.cpp \ datasource.cpp HEADERS += datasource.h -RESOURCES += qmloscilloscope.qrc +RESOURCES += qml3doscilloscope.qrc OTHER_FILES += doc/src/* \ doc/images/* \ - qml/qmloscilloscope/* + qml/qml3doscilloscope/* diff --git a/examples/datavisualization/qmloscilloscope/qmloscilloscope.qrc b/examples/datavisualization/qml3doscilloscope/qml3doscilloscope.qrc index 52678b78..64650c35 100644 --- a/examples/datavisualization/qmloscilloscope/qmloscilloscope.qrc +++ b/examples/datavisualization/qml3doscilloscope/qml3doscilloscope.qrc @@ -1,5 +1,5 @@ <RCC> <qresource prefix="/"> - <file>qml/qmloscilloscope/main.qml</file> + <file>qml/qml3doscilloscope/main.qml</file> </qresource> </RCC> |