diff options
author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2023-01-25 10:17:39 +0200 |
---|---|---|
committer | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2023-01-27 13:03:06 +0200 |
commit | fcb72898b2c8f05ee1a5d2e2e192cc3b9afba486 (patch) | |
tree | 47772886667b9f43f146cbf5cbb35b6c908ee98c /examples/datavisualization/qmlmultigraph/qml | |
parent | 7e9e9d00f0e3def86f679d38e9f30aa5e32e682a (diff) |
Fix example naming and categories
Remove 2 more irrelevant examples
Pick-to: 6.5
Fixes: QTBUG-110463
Change-Id: I9597f311d36fb79db45f6f64fb97bc5376372980
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'examples/datavisualization/qmlmultigraph/qml')
-rw-r--r-- | examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/Data.qml | 33 | ||||
-rw-r--r-- | examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml | 200 |
2 files changed, 0 insertions, 233 deletions
diff --git a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/Data.qml b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/Data.qml deleted file mode 100644 index 46ebef17..00000000 --- a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/Data.qml +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only - -import QtQuick - -Item { - property alias sharedData: dataModel - - ListModel { - id: dataModel - ListElement{ row: "0"; col: "0"; longitude: "20.0"; latitude: "10.0"; pop_density: "4.75"; } - ListElement{ row: "1"; col: "0"; longitude: "21.1"; latitude: "10.3"; pop_density: "3.00"; } - ListElement{ row: "2"; col: "0"; longitude: "22.5"; latitude: "10.7"; pop_density: "1.24"; } - ListElement{ row: "3"; col: "0"; longitude: "24.0"; latitude: "10.5"; pop_density: "2.53"; } - ListElement{ row: "0"; col: "1"; longitude: "20.2"; latitude: "11.2"; pop_density: "3.55"; } - ListElement{ row: "1"; col: "1"; longitude: "21.3"; latitude: "11.5"; pop_density: "3.03"; } - ListElement{ row: "2"; col: "1"; longitude: "22.6"; latitude: "11.7"; pop_density: "3.46"; } - ListElement{ row: "3"; col: "1"; longitude: "23.4"; latitude: "11.5"; pop_density: "4.12"; } - ListElement{ row: "0"; col: "2"; longitude: "20.2"; latitude: "12.3"; pop_density: "3.37"; } - ListElement{ row: "1"; col: "2"; longitude: "21.1"; latitude: "12.4"; pop_density: "2.98"; } - ListElement{ row: "2"; col: "2"; longitude: "22.5"; latitude: "12.1"; pop_density: "3.33"; } - ListElement{ row: "3"; col: "2"; longitude: "23.3"; latitude: "12.7"; pop_density: "3.23"; } - ListElement{ row: "0"; col: "3"; longitude: "20.7"; latitude: "13.3"; pop_density: "5.34"; } - ListElement{ row: "1"; col: "3"; longitude: "21.5"; latitude: "13.2"; pop_density: "4.54"; } - ListElement{ row: "2"; col: "3"; longitude: "22.4"; latitude: "13.6"; pop_density: "4.65"; } - ListElement{ row: "3"; col: "3"; longitude: "23.2"; latitude: "13.4"; pop_density: "6.67"; } - ListElement{ row: "0"; col: "4"; longitude: "20.6"; latitude: "15.0"; pop_density: "6.01"; } - ListElement{ row: "1"; col: "4"; longitude: "21.3"; latitude: "14.6"; pop_density: "5.83"; } - ListElement{ row: "2"; col: "4"; longitude: "22.5"; latitude: "14.8"; pop_density: "7.32"; } - ListElement{ row: "3"; col: "4"; longitude: "23.7"; latitude: "14.3"; pop_density: "6.90"; } - } -} - diff --git a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml deleted file mode 100644 index 2a8a03ec..00000000 --- a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml +++ /dev/null @@ -1,200 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only - -import QtQuick -import QtQuick.Layouts -import QtQuick.Controls -import QtDataVisualization - -Item { - id: mainView - width: 800 - height: 600 - - property bool portraitMode: width < height - - Data { - id: data - } - - //! [0] - GridLayout { - id: gridLayout - columns: 2 - Layout.fillHeight: true - Layout.fillWidth: true - anchors.top: mainView.top - anchors.bottom: mainView.bottom - anchors.left: mainView.left - anchors.right: mainView.right - - Rectangle { - Layout.fillHeight: true - Layout.fillWidth: true - border.color: surfaceGraph.theme.gridLineColor - border.width: 2 - color: "#00000000" - - Surface3D { - id: surfaceGraph - anchors.fill: parent - anchors.margins: parent.border.width - theme: Theme3D { - type: Theme3D.ThemePrimaryColors - font.pointSize: 60 - } - scene.activeCamera.cameraPreset: Camera3D.CameraPresetIsometricLeftHigh - - Surface3DSeries { - itemLabelFormat: "Pop density at (@xLabel N, @zLabel E): @yLabel" - ItemModelSurfaceDataProxy { - itemModel: data.sharedData - // The surface data points are not neatly lined up in rows and columns, - // so we define explicit row and column roles. - rowRole: "row" - columnRole: "col" - xPosRole: "latitude" - zPosRole: "longitude" - yPosRole: "pop_density" - } - } - } - } - - // We'll use one grid cell for buttons - Rectangle { - Layout.fillHeight: true - Layout.fillWidth: true - - GridLayout { - anchors.right: parent.right - anchors.left: parent.left - anchors.top: parent.top - anchors.bottom: parent.bottom - columns: 2 - - Button { - Layout.minimumWidth: parent.width / 2 - Layout.fillHeight: true - Layout.fillWidth: true - text: mainView.portraitMode ? "Clear\nSelections" : "Clear Selections" - onClicked: mainView.clearSelections() // call a helper function to keep button itself simpler - } - - Button { - Layout.minimumWidth: parent.width / 2 - Layout.fillHeight: true - Layout.fillWidth: true - text: "Quit" - onClicked: Qt.quit(); - } - - Button { - Layout.fillHeight: true - Layout.fillWidth: true - text: mainView.portraitMode ? "Reset\nCameras" : "Reset Cameras" - onClicked: mainView.resetCameras() // call a helper function to keep button itself simpler - } - - Button { - Layout.fillHeight: true - Layout.fillWidth: true - text: mainView.portraitMode ? "Toggle\nMesh\nStyles" : "Toggle Mesh Styles" - onClicked: mainView.toggleMeshStyle() // call a helper function to keep button itself simpler - } - } - } - - Rectangle { - Layout.fillHeight: true - Layout.fillWidth: true - border.color: scatterGraph.theme.gridLineColor - border.width: 2 - color: "#00000000" - - Scatter3D { - id: scatterGraph - anchors.fill: parent - anchors.margins: parent.border.width - theme: Theme3D { - type: Theme3D.ThemeDigia - font.pointSize: 60 - } - scene.activeCamera.cameraPreset: Camera3D.CameraPresetIsometricLeftHigh - - Scatter3DSeries { - itemLabelFormat: "Pop density at (@xLabel N, @zLabel E): @yLabel" - ItemModelScatterDataProxy { - itemModel: data.sharedData - // Mapping model roles to scatter series item coordinates. - xPosRole: "latitude" - zPosRole: "longitude" - yPosRole: "pop_density" - } - } - } - } - - Rectangle { - Layout.fillHeight: true - Layout.fillWidth: true - border.color: barGraph.theme.gridLineColor - border.width: 2 - color: "#00000000" - - Bars3D { - id: barGraph - anchors.fill: parent - anchors.margins: parent.border.width - theme: Theme3D { - type: Theme3D.ThemeQt - font.pointSize: 60 - } - selectionMode: AbstractGraph3D.SelectionItemAndRow | AbstractGraph3D.SelectionSlice - scene.activeCamera.cameraPreset: Camera3D.CameraPresetIsometricLeftHigh - - Bar3DSeries { - itemLabelFormat: "@seriesName: @valueLabel" - name: "Population density" - - ItemModelBarDataProxy { - itemModel: data.sharedData - // Mapping model roles to bar series rows, columns, and values. - rowRole: "row" - columnRole: "col" - valueRole: "pop_density" - } - } - } - } - } - //! [0] - - function clearSelections() { - barGraph.clearSelection() - scatterGraph.clearSelection() - surfaceGraph.clearSelection() - } - - function resetCameras() { - surfaceGraph.scene.activeCamera.cameraPreset = Camera3D.CameraPresetIsometricLeftHigh - scatterGraph.scene.activeCamera.cameraPreset = Camera3D.CameraPresetIsometricLeftHigh - barGraph.scene.activeCamera.cameraPreset = Camera3D.CameraPresetIsometricLeftHigh - surfaceGraph.scene.activeCamera.zoomLevel = 100.0 - scatterGraph.scene.activeCamera.zoomLevel = 100.0 - barGraph.scene.activeCamera.zoomLevel = 100.0 - } - - function toggleMeshStyle() { - if (barGraph.seriesList[0].meshSmooth === true) { - barGraph.seriesList[0].meshSmooth = false - if (surfaceGraph.seriesList[0].flatShadingSupported) - surfaceGraph.seriesList[0].flatShadingEnabled = true - scatterGraph.seriesList[0].meshSmooth = false - } else { - barGraph.seriesList[0].meshSmooth = true - surfaceGraph.seriesList[0].flatShadingEnabled = false - scatterGraph.seriesList[0].meshSmooth = true - } - } -} |