qiurui
/
qtgraphs
mirror of https://github.com/qt/qtgraphs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add 2D and 3D into the same module depending on feature flags 

Task-number: QTBUG-119920
Pick-to: 6.7
Change-Id: I4f3fb7f85de710157abc92c63ed1a970dc1d37e4
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Reviewed-by: <owais.akhtar@qt.io>
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Tomi Korpipaa 2024-01-11 14:02:45 +02:00
parent be388b52b3
commit 89f3697015
143 changed files with 721 additions and 680 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/graphs/2d/testbed/CMakeLists.txt
View File

@ -19,7 +19,7 @@ set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}")
find_package(Qt6 COMPONENTS Core)
find_package(Qt6 COMPONENTS Gui)
find_package(Qt6 COMPONENTS Quick)
find_package(Qt6 COMPONENTS Graphs2D)
find_package(Qt6 COMPONENTS Graphs)
qt_add_executable(testbed
main.cpp
@ -33,7 +33,7 @@ target_link_libraries(testbed PUBLIC
Qt::Core
Qt::Gui
Qt::Quick
Qt::Graphs2D
Qt::Graphs
)
qt6_add_qml_module(testbed

4
examples/graphs/2d/testbed/custombarseries.h
View File

@ -5,8 +5,8 @@
#define CUSTOMBARSERIES_H
#include <QQmlEngine>
#include <QtGraphs2D/qbarseries.h>
#include <QtGraphs2D/qbarset.h>
#include <QtGraphs/qbarseries.h>
#include <QtGraphs/qbarset.h>
#include <QList>
#include <QTimer>

4
examples/graphs/2d/testbed/customlineseries.h
View File

@ -4,10 +4,10 @@
#ifndef CUSTOMLINESERIES_H
#define CUSTOMLINESERIES_H
#include <QQmlEngine>
#include <QtGraphs2D/qlineseries.h>
#include <QList>
#include <QQmlEngine>
#include <QTimer>
#include <QtGraphs/qlineseries.h>
class CustomLineSeries : public QLineSeries
{

2
examples/graphs/3d/axishandling/qml/axishandling/AxisDragging.qml
View File

@ -3,7 +3,7 @@
import QtQuick
import QtQuick.Controls
import QtGraphs3D
import QtGraphs
Item {
id: axisDragView

2
examples/graphs/3d/axishandling/qml/axishandling/AxisFormatting.qml
View File

@ -3,7 +3,7 @@
import QtQuick
import QtQuick.Controls
import QtGraphs3D
import QtGraphs
import AxisHandling
Item {

2
examples/graphs/3d/bars/qml/bars/Axes.qml
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick
import QtGraphs3D
import QtGraphs
Item {
property alias column: columnAxis

2
examples/graphs/3d/bars/qml/bars/main.qml
View File

@ -4,7 +4,7 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtGraphs3D
import QtGraphs
import Qt.labs.qmlmodels
pragma ComponentBehavior: Bound

2
examples/graphs/3d/scatter/qml/scatter/Graph.qml
View File

@ -1,7 +1,7 @@
// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause
import QtQuick
import QtGraphs3D
import QtGraphs
Item {
property int shadowQuality: AbstractGraph3D.ShadowQuality.High

2
examples/graphs/3d/scatter/qml/scatter/main.qml
View File

@ -5,7 +5,7 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtGraphs3D
import QtGraphs
//! [0]
Item {

2
examples/graphs/3d/surfacegallery/qml/surfacegallery/SurfaceHeightMap.qml
View File

@ -3,7 +3,7 @@
import QtQuick
import QtQuick.Controls
import QtGraphs3D
import QtGraphs
Rectangle {
id: heightMapView

2
examples/graphs/3d/surfacegallery/qml/surfacegallery/SurfaceOscilloscope.qml
View File

@ -3,7 +3,7 @@
import QtQuick
import QtQuick.Controls
import QtGraphs3D
import QtGraphs
//! [0]
import SurfaceGallery
//! [0]

2
examples/graphs/3d/surfacegallery/qml/surfacegallery/SurfaceSpectrogram.qml
View File

@ -3,7 +3,7 @@
import QtQuick
import QtQuick.Controls
import QtGraphs3D
import QtGraphs
Rectangle {
id: spectrogramView

509
src/CMakeLists.txt
View File

@ -4,6 +4,512 @@
qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/graphs2d/configure.cmake")
qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/graphs3d/configure.cmake")
if(NOT QT_FEATURE_graphs_2d AND NOT QT_FEATURE_graphs_3d)
message("You must have either FEATURE_graphs_2d or FEATURE_graphs_3d ON, or nothing will be built.")
else()
# First check if 3D is enabled. If it is, we must add dependencies to QtQuick3D.
# TODO: We could add more branches based on the feature flags for disabling 2D -specific
# dependencies (QtQuickPrivate, Qt::QuickShapesPrivate)
if(QT_FEATURE_graphs_3d)
set(qml_files
graphs3d/qml/designer/Bars3DSpecifics.qml
graphs3d/qml/designer/Scatter3DSpecifics.qml
graphs3d/qml/designer/Surface3DSpecifics.qml
graphs3d/qml/designer/GraphsCameraSection.qml
graphs3d/qml/designer/GraphsSection.qml
graphs3d/qml/designer/default/Bars3D.qml
graphs3d/qml/designer/default/Scatter3D.qml
graphs3d/qml/designer/default/Surface3D.qml
)
set_source_files_properties(${qml_files} PROPERTIES
QT_QML_SKIP_QMLDIR_ENTRY TRUE
)
qt_internal_add_qml_module(Graphs
URI "QtGraphs"
TARGET_PRODUCT "Qt Graphs (Qt $$QT_VERSION)"
TARGET_DESCRIPTION "Qt Graphs Visualization component for Qt."
VERSION "${PROJECT_VERSION}"
PAST_MAJOR_VERSIONS 1
DEPENDENCIES
QtQuick
# 2D specific
QtQuickPrivate
# 3D specific
QtQuick3D
QML_FILES
${qml_files}
LIBRARIES
# 2D specific
Qt::QuickPrivate
Qt::QuickShapesPrivate
# 3D specific
Qt::Quick3DPrivate
Qt::Quick3DRuntimeRenderPrivate
PUBLIC_LIBRARIES
Qt::Core
Qt::Gui
Qt::Quick
Qt::QuickWidgets
Qt::Quick3D
PRIVATE_MODULE_INTERFACE
# 3D specific
Qt::Quick3DPrivate
Qt::Quick3DRuntimeRenderPrivate
GENERATE_CPP_EXPORTS
)
# CMake 3.16 forces these to be added here instead of the graphs3d folder
# TODO: Create a branch that has 3D -only, to avoid including these
set(shader_resource_files_2D
"graphs2d/data/gridshader.frag.qsb"
"graphs2d/data/gridshader.vert.qsb"
"graphs2d/data/tickershader.frag.qsb"
"graphs2d/data/tickershader.vert.qsb"
"graphs2d/data/tickershaderhorizontal.frag.qsb"
"graphs2d/data/tickershaderhorizontal.vert.qsb"
"graphs2d/data/lineshaderhorizontal.frag.qsb"
"graphs2d/data/lineshaderhorizontal.vert.qsb"
"graphs2d/data/lineshadervertical.frag.qsb"
"graphs2d/data/lineshadervertical.vert.qsb"
)
# TODO: Create a branch that has 3D -only, to avoid including these
qt_internal_add_resource(Graphs "graphsshaders2D"
PREFIX
"/shaders"
BASE
"graphs2d/data"
FILES
${shader_resource_files_2D}
)
set_source_files_properties("graphs3d/qml/resources/DatapointSphere.qml"
PROPERTIES QT_RESOURCE_ALIAS "DatapointSphere"
)
set_source_files_properties("graphs3d/qml/resources/DatapointCube.qml"
PROPERTIES QT_RESOURCE_ALIAS "DatapointCube"
)
set_source_files_properties("graphs3d/qml/resources/AxisLabel.qml"
PROPERTIES QT_RESOURCE_ALIAS "AxisLabel"
)
set_source_files_properties("graphs3d/qml/resources/GridLine.qml"
PROPERTIES QT_RESOURCE_ALIAS "GridLine"
)
set_source_files_properties("graphs3d/qml/resources/ItemLabel.qml"
PROPERTIES QT_RESOURCE_ALIAS "ItemLabel"
)
set_source_files_properties("graphs3d/qml/resources/TitleLabel.qml"
PROPERTIES QT_RESOURCE_ALIAS "TitleLabel"
)
set_source_files_properties("graphs3d/qml/resources/GridSurfaceMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "GridSurfaceMaterial"
)
set_source_files_properties("graphs3d/qml/resources/SurfaceSliceMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "SurfaceSliceMaterial"
)
set_source_files_properties("graphs3d/qml/resources/BarsMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "BarsMaterial"
)
set_source_files_properties("graphs3d/qml/resources/BarsMaterialInstancing.qml"
PROPERTIES QT_RESOURCE_ALIAS "BarsMaterialInstancing"
)
set_source_files_properties("graphs3d/qml/resources/SurfaceMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "SurfaceMaterial"
)
set_source_files_properties("graphs3d/qml/resources/ScatterMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "ScatterMaterial"
)
set_source_files_properties("graphs3d/qml/resources/ScatterMaterialInstancing.qml"
PROPERTIES QT_RESOURCE_ALIAS "ScatterMaterialInstancing"
)
set_source_files_properties("graphs3d/qml/resources/ObjectGradientMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "ObjectGradientMaterial"
)
set_source_files_properties("graphs3d/qml/resources/ObjectGradientMaterialInstancing.qml"
PROPERTIES QT_RESOURCE_ALIAS "ObjectGradientMaterialInstancing"
)
set_source_files_properties("graphs3d/qml/resources/VolumeMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "VolumeMaterial"
)
set_source_files_properties("graphs3d/qml/resources/VolumeLowDefMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "VolumeLowDefMaterial"
)
set_source_files_properties("graphs3d/qml/resources/VolumeSliceMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "VolumeSliceMaterial"
)
set_source_files_properties("graphs3d/qml/resources/VolumeFrameMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "VolumeFrameMaterial"
)
set(qml_component_resources
"graphs3d/qml/resources/DatapointSphere.qml"
"graphs3d/qml/resources/DatapointCube.qml"
)
set(qml_axis_resurces
"graphs3d/qml/resources/AxisLabel.qml"
"graphs3d/qml/resources/GridLine.qml"
"graphs3d/qml/resources/ItemLabel.qml"
"graphs3d/qml/resources/TitleLabel.qml"
)
set(qml_material_resources
"graphs3d/qml/resources/ObjectGradientMaterial.qml"
"graphs3d/qml/resources/ObjectGradientMaterialInstancing.qml"
"graphs3d/qml/resources/BarsMaterial.qml"
"graphs3d/qml/resources/BarsMaterialInstancing.qml"
"graphs3d/qml/resources/SurfaceMaterial.qml"
"graphs3d/qml/resources/ScatterMaterial.qml"
"graphs3d/qml/resources/ScatterMaterialInstancing.qml"
"graphs3d/qml/resources/GridSurfaceMaterial.qml"
"graphs3d/qml/resources/SurfaceSliceMaterial.qml"
"graphs3d/qml/resources/SurfaceShadowNoTex.qml"
"graphs3d/qml/resources/VolumeMaterial.qml"
"graphs3d/qml/resources/VolumeLowDefMaterial.qml"
"graphs3d/qml/resources/VolumeSliceMaterial.qml"
"graphs3d/qml/resources/VolumeFrameMaterial.qml"
)
set(resources
"graphs2d/qml/designer/Graphs.metainfo"
"graphs2d/qml/designer/images/bars3d-icon.png"
"graphs2d/qml/designer/images/bars3d-icon16.png"
"graphs2d/qml/designer/images/scatter3d-icon.png"
"graphs2d/qml/designer/images/scatter3d-icon16.png"
"graphs2d/qml/designer/images/surface3d-icon.png"
"graphs2d/qml/designer/images/surface3d-icon16.png"
)
# .mesh file aliases
set_source_files_properties("graphs3d/engine/meshes/arrowFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "arrowMesh"
)
set_source_files_properties("graphs3d/engine/meshes/arrowSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "arrowMeshSmooth"
)
set_source_files_properties("graphs3d/engine/meshes/background.mesh"
PROPERTIES QT_RESOURCE_ALIAS "backgroundMesh"
)
set_source_files_properties("graphs3d/engine/meshes/barFilledFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "bevelBarMeshFull"
)
set_source_files_properties("graphs3d/engine/meshes/barFilledSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "bevelBarMeshSmoothFull"
)
set_source_files_properties("graphs3d/engine/meshes/barFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "bevelBarMesh"
)
set_source_files_properties("graphs3d/engine/meshes/barSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "bevelBarMeshSmooth"
)
set_source_files_properties("graphs3d/engine/meshes/cubeFilledFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "barMeshFull"
)
set_source_files_properties("graphs3d/engine/meshes/cubeFilledSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "barMeshSmoothFull"
)
set_source_files_properties("graphs3d/engine/meshes/cubeFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "barMesh"
)
set_source_files_properties("graphs3d/engine/meshes/cubeSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "barMeshSmooth"
)
set_source_files_properties("graphs3d/engine/meshes/coneFilledFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "coneMeshFull"
)
set_source_files_properties("graphs3d/engine/meshes/coneFilledSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "coneMeshSmoothFull"
)
set_source_files_properties("graphs3d/engine/meshes/coneFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "coneMesh"
)
set_source_files_properties("graphs3d/engine/meshes/coneSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "coneMeshSmooth"
)
set_source_files_properties("graphs3d/engine/meshes/cylinderFilledFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "cylinderMeshFull"
)
set_source_files_properties("graphs3d/engine/meshes/cylinderFilledSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "cylinderMeshSmoothFull"
)
set_source_files_properties("graphs3d/engine/meshes/cylinderFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "cylinderMesh"
)
set_source_files_properties("graphs3d/engine/meshes/cylinderSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "cylinderMeshSmooth"
)
set_source_files_properties("graphs3d/engine/meshes/minimalFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "minimalMesh"
)
set_source_files_properties("graphs3d/engine/meshes/minimalSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "minimalMeshSmooth"
)
set_source_files_properties("graphs3d/engine/meshes/plane.mesh"
PROPERTIES QT_RESOURCE_ALIAS "planeMesh"
)
set_source_files_properties("graphs3d/engine/meshes/pyramidFilledFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "pyramidMeshFull"
)
set_source_files_properties("graphs3d/engine/meshes/pyramidFilledSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "pyramidMeshSmoothFull"
)
set_source_files_properties("graphs3d/engine/meshes/pyramidFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "pyramidMesh"
)
set_source_files_properties("graphs3d/engine/meshes/pyramidSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "pyramidMeshSmooth"
)
set_source_files_properties("graphs3d/engine/meshes/octagon.mesh"
PROPERTIES QT_RESOURCE_ALIAS "octagonMesh"
)
set_source_files_properties("graphs3d/engine/meshes/sphere.mesh"
PROPERTIES QT_RESOURCE_ALIAS "sphereMesh"
)
set_source_files_properties("graphs3d/engine/meshes/sphereSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "sphereMeshSmooth"
)
set_source_files_properties("graphs3d/engine/meshes/backgroundNoFloor.mesh"
PROPERTIES QT_RESOURCE_ALIAS "backgroundNoFloorMesh"
)
set(mesh_resource_files
# .mesh files
"graphs3d/engine/meshes/background.mesh"
"graphs3d/engine/meshes/arrowFlat.mesh"
"graphs3d/engine/meshes/arrowSmooth.mesh"
"graphs3d/engine/meshes/barFilledFlat.mesh"
"graphs3d/engine/meshes/barFilledSmooth.mesh"
"graphs3d/engine/meshes/barFlat.mesh"
"graphs3d/engine/meshes/barSmooth.mesh"
"graphs3d/engine/meshes/coneFilledFlat.mesh"
"graphs3d/engine/meshes/coneFilledSmooth.mesh"
"graphs3d/engine/meshes/coneFlat.mesh"
"graphs3d/engine/meshes/coneSmooth.mesh"
"graphs3d/engine/meshes/cubeFilledFlat.mesh"
"graphs3d/engine/meshes/cubeFilledSmooth.mesh"
"graphs3d/engine/meshes/cubeFlat.mesh"
"graphs3d/engine/meshes/cubeSmooth.mesh"
"graphs3d/engine/meshes/cylinderFilledFlat.mesh"
"graphs3d/engine/meshes/cylinderFilledSmooth.mesh"
"graphs3d/engine/meshes/cylinderFlat.mesh"
"graphs3d/engine/meshes/cylinderSmooth.mesh"
"graphs3d/engine/meshes/minimalFlat.mesh"
"graphs3d/engine/meshes/minimalSmooth.mesh"
"graphs3d/engine/meshes/plane.mesh"
"graphs3d/engine/meshes/pyramidFilledFlat.mesh"
"graphs3d/engine/meshes/pyramidFilledSmooth.mesh"
"graphs3d/engine/meshes/pyramidFlat.mesh"
"graphs3d/engine/meshes/pyramidSmooth.mesh"
"graphs3d/engine/meshes/octagon.mesh"
"graphs3d/engine/meshes/sphere.mesh"
"graphs3d/engine/meshes/sphereSmooth.mesh"
"graphs3d/engine/meshes/backgroundNoFloor.mesh"
)
set_source_files_properties("graphs3d/engine/shaders/3dsliceframes.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragment3DSliceFrames"
)
set_source_files_properties("graphs3d/engine/shaders/position.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexPosition"
)
set_source_files_properties("graphs3d/engine/shaders/bars.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentBars"
)
set_source_files_properties("graphs3d/engine/shaders/barsinstancing.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentBarsInstancing"
)
set_source_files_properties("graphs3d/engine/shaders/barsinstancing.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexBarsInstancing"
)
set_source_files_properties("graphs3d/engine/shaders/surface.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentSurface"
)
set_source_files_properties("graphs3d/engine/shaders/surface.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexSurface"
)
set_source_files_properties("graphs3d/engine/shaders/scatter.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexScatter"
)
set_source_files_properties("graphs3d/engine/shaders/scatter.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentScatter"
)
set_source_files_properties("graphs3d/engine/shaders/scatterinstancing.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexScatterInstancing"
)
set_source_files_properties("graphs3d/engine/shaders/scatterinstancing.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentScatterInstancing"
)
set_source_files_properties("graphs3d/engine/shaders/surfaceGrid.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragSurfaceGrid"
)
set_source_files_properties("graphs3d/engine/shaders/surfaceGrid.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexSurfaceGrid"
)
set_source_files_properties("graphs3d/engine/shaders/surfaceSlice.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexSurfaceSlice"
)
set_source_files_properties("graphs3d/engine/shaders/texture3d.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentTexture3D"
)
set_source_files_properties("graphs3d/engine/shaders/texture3d.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexTexture3D"
)
set_source_files_properties("graphs3d/engine/shaders/texture3dlowdef.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentTexture3DLowDef"
)
set_source_files_properties("graphs3d/engine/shaders/texture3dslice.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentTexture3DSlice"
)
set_source_files_properties("graphs3d/engine/shaders/objectgradient.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexobjectgradient"
)
set_source_files_properties("graphs3d/engine/shaders/objectgradient.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentobjectgradient"
)
set_source_files_properties("graphs3d/engine/shaders/objectgradientinstancing.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexobjectgradientinstancing"
)
set_source_files_properties("graphs3d/engine/shaders/objectgradientinstancing.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentobjectgradientinstancing"
)
set_source_files_properties("graphs3d/engine/shaders/rangegradient.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexrangegradient"
)
set_source_files_properties("graphs3d/engine/shaders/rangegradient.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentrangegradient"
)
set_source_files_properties("graphs3d/engine/shaders/rangegradientinstancing.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexrangegradientinstancing"
)
set(shader_resource_files
"graphs3d/engine/shaders/3dsliceframes.frag"
"graphs3d/engine/shaders/position.vert"
"graphs3d/engine/shaders/objectgradient.vert"
"graphs3d/engine/shaders/objectgradient.frag"
"graphs3d/engine/shaders/objectgradientinstancing.vert"
"graphs3d/engine/shaders/objectgradientinstancing.frag"
"graphs3d/engine/shaders/rangegradient.vert"
"graphs3d/engine/shaders/rangegradient.frag"
"graphs3d/engine/shaders/rangegradientinstancing.frag"
"graphs3d/engine/shaders/rangegradientinstancing.vert"
"graphs3d/engine/shaders/surface.vert"
"graphs3d/engine/shaders/surface.frag"
"graphs3d/engine/shaders/surfaceGrid.vert"
"graphs3d/engine/shaders/surfaceGrid.frag"
"graphs3d/engine/shaders/bars.frag"
"graphs3d/engine/shaders/barsinstancing.vert"
"graphs3d/engine/shaders/barsinstancing.frag"
"graphs3d/engine/shaders/scatter.vert"
"graphs3d/engine/shaders/scatter.frag"
"graphs3d/engine/shaders/scatterinstancing.vert"
"graphs3d/engine/shaders/scatterinstancing.frag"
"graphs3d/engine/shaders/surfaceSlice.vert"
"graphs3d/engine/shaders/texture3d.frag"
"graphs3d/engine/shaders/texture3d.vert"
"graphs3d/engine/shaders/texture3dlowdef.frag"
"graphs3d/engine/shaders/texture3dslice.frag"
)
qt_internal_add_resource(Graphs "graphsshaders"
PREFIX
"/shaders"
BASE
"graphs3d/engine/shaders"
FILES
${shader_resource_files}
)
qt_internal_add_resource(Graphs "graphsmeshes"
PREFIX
"/defaultMeshes"
BASE
"graphs3d/engine/meshes"
FILES
${mesh_resource_files}
${obj_resource_files}
)
qt_internal_add_resource(Graphs "qml_component_resources"
PREFIX
"/datapointModels"
BASE
"graphs3d/qml"
FILES
${qml_component_resources}
)
qt_internal_add_resource(Graphs "qml_axis_resurces"
PREFIX
"/axis"
BASE
"graphs3d/qml"
FILES
${qml_axis_resurces}
)
qt_internal_add_resource(Graphs "qml_material_resources"
PREFIX
"/materials"
BASE
"graphs3d/qml"
FILES
${qml_material_resources}
)
else(QT_FEATURE_graphs_2d)
qt_internal_add_qml_module(Graphs
URI "QtGraphs"
TARGET_PRODUCT "Qt Graphs (Qt $$QT_VERSION)"
TARGET_DESCRIPTION "Qt Graphs Visualization component for Qt."
VERSION "${PROJECT_VERSION}"
PAST_MAJOR_VERSIONS 1
DEPENDENCIES
QtQuick
QtQuickPrivate
LIBRARIES
Qt::QuickPrivate
Qt::QuickShapesPrivate
PUBLIC_LIBRARIES
Qt::Core
Qt::Gui
Qt::Quick
GENERATE_CPP_EXPORTS
)
# CMake 3.16 forces these to be added here instead of the graphs2d folder
set(shader_resource_files_2D
"graphs2d/data/gridshader.frag.qsb"
"graphs2d/data/gridshader.vert.qsb"
"graphs2d/data/tickershader.frag.qsb"
"graphs2d/data/tickershader.vert.qsb"
"graphs2d/data/tickershaderhorizontal.frag.qsb"
"graphs2d/data/tickershaderhorizontal.vert.qsb"
"graphs2d/data/lineshaderhorizontal.frag.qsb"
"graphs2d/data/lineshaderhorizontal.vert.qsb"
"graphs2d/data/lineshadervertical.frag.qsb"
"graphs2d/data/lineshadervertical.vert.qsb"
)
qt_internal_add_resource(Graphs "graphsshaders2D"
PREFIX
"/shaders"
BASE
"graphs2d/data"
FILES
${shader_resource_files_2D}
)
endif()
endif()
qt_configure_add_summary_section(NAME "Qt Graphs Support")
qt_configure_add_summary_entry(ARGS "graphs-2d")
qt_configure_add_summary_entry(ARGS "graphs-3d")
@ -17,6 +523,3 @@ if(QT_FEATURE_graphs_2d)
add_subdirectory(graphs2d)
endif()
if(NOT QT_FEATURE_graphs_2d AND NOT QT_FEATURE_graphs_3d)
message("You must have either FEATURE_graphs_2d or FEATURE_graphs_3d ON, or nothing will be built.")
endif()

0
src/graphs3d/doc/images/q3dbars-minimal.png → src/doc/images/q3dbars-minimal.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
src/graphs3d/doc/images/q3dscatter-minimal.png → src/doc/images/q3dscatter-minimal.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

0
src/graphs3d/doc/images/q3dsurface-minimal.png → src/doc/images/q3dsurface-minimal.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

12
src/graphs3d/doc/qtgraphs.qdocconf → src/doc/qtgraphs.qdocconf
View File

@ -8,16 +8,16 @@ buildversion = Qt Graphs | Commercial or GPLv3
moduleheader = QtGraphs
examplesinstallpath = graphs
exampledirs += ../../../examples/graphs/3d \
../../../examples/graphs/2d \
../../../examples/graphs \
exampledirs += ../../examples/graphs/3d \
../../examples/graphs/2d \
../../examples/graphs \
snippets
{headerdirs,sourcedirs} += .. \
../../graphs2d
../graphs2d \
../graphs3d
imagedirs += ../images \
images
imagedirs += images
depends = qtcore qtgui qtqml qtquick qtdoc qtcmake qtwidgets qtquick3d

0
src/graphs3d/doc/snippets/doc_src_q3dbars_construction.cpp → src/doc/snippets/doc_src_q3dbars_construction.cpp
View File

0
src/graphs3d/doc/snippets/doc_src_q3dscatter_construction.cpp → src/doc/snippets/doc_src_q3dscatter_construction.cpp
View File

0
src/graphs3d/doc/snippets/doc_src_q3dsurface_construction.cpp → src/doc/snippets/doc_src_q3dsurface_construction.cpp
View File

0
src/graphs3d/doc/snippets/doc_src_q3dtheme.cpp → src/doc/snippets/doc_src_q3dtheme.cpp
View File

8
src/graphs3d/doc/snippets/doc_src_qmlgraphs.cpp → src/doc/snippets/doc_src_qmlgraphs.cpp
View File

@ -2,12 +2,12 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
//! [0]
import QtGraphs3D
import QtGraphs
//! [0]
//! [1]
import QtQuick
import QtGraphs3D
import QtGraphs
Item {
width: 640
@ -46,7 +46,7 @@ Item {
//! [2]
import QtQuick
import QtGraphs3D
import QtGraphs
Item {
width: 640
@ -79,7 +79,7 @@ Item {
//! [3]
import QtQuick
import QtGraphs3D
import QtGraphs
Item {
width: 640

0
src/graphs3d/doc/snippets/doc_src_qtgraphs.cpp → src/doc/snippets/doc_src_qtgraphs.cpp
View File

0
src/graphs3d/doc/snippets/doc_src_qtgraphs.pro → src/doc/snippets/doc_src_qtgraphs.pro
View File

39
src/graphs2d/CMakeLists.txt
View File

@ -1,15 +1,7 @@
# Copyright (C) 2023 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
qt_internal_add_qml_module(Graphs2D
URI "QtGraphs"
TARGET_PRODUCT "Qt Graphs 2D (Qt $$QT_VERSION)"
TARGET_DESCRIPTION "Qt Graphs 2D Visualization component for Qt."
VERSION "${PROJECT_VERSION}"
PAST_MAJOR_VERSIONS 1
DEPENDENCIES
QtQuick
QtQuickPrivate
qt_internal_extend_target(Graphs
SOURCES
qgraphsview.cpp qgraphsview_p.h
qabstractseries.cpp qabstractseries.h qabstractseries_p.h
@ -36,33 +28,4 @@ qt_internal_add_qml_module(Graphs2D
barchart/qabstractbarseries.cpp
axis/barcategoryaxis/qbarcategoryaxis.cpp
xychart/qxyseries.cpp
PUBLIC_LIBRARIES
Qt::Core
Qt::Gui
Qt::Quick
Qt::QuickPrivate
Qt::QuickShapesPrivate
GENERATE_CPP_EXPORTS
)
set(shader_resource_files
"data/gridshader.frag.qsb"
"data/gridshader.vert.qsb"
"data/tickershader.frag.qsb"
"data/tickershader.vert.qsb"
"data/tickershaderhorizontal.frag.qsb"
"data/tickershaderhorizontal.vert.qsb"
"data/lineshaderhorizontal.frag.qsb"
"data/lineshaderhorizontal.vert.qsb"
"data/lineshadervertical.frag.qsb"
"data/lineshadervertical.vert.qsb"
)
qt_internal_add_resource(Graphs2D "graphsshaders"
PREFIX
"/shaders"
BASE
"data"
FILES
${shader_resource_files}
)

4
src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis.cpp
View File

@ -3,7 +3,7 @@
#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
#include <QtGraphs2D/QBarCategoryAxis>
#include <QtGraphs/QBarCategoryAxis>
#include <private/qbarcategoryaxis_p.h>
#include <QtCore/QtMath>
@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
\qmltype BarCategoryAxis
\instantiates QBarCategoryAxis
\inqmlmodule QtGraphs
\ingroup graphs_qml
\ingroup graphs_qml_2D
\inherits AbstractAxis
\brief Adds categories to a chart's axes.

6
src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis.h
View File

@ -4,15 +4,15 @@
#ifndef QBARCATEGORYAXIS_H
#define QBARCATEGORYAXIS_H
#include <QtGraphs2D/QAbstractAxis>
#include <QtGraphs/QAbstractAxis>
#include <QtGraphs/qgraphsglobal.h>
#include <QtQml/QQmlEngine>
#include <QtGraphs2D/qtgraphs2dexports.h>
QT_BEGIN_NAMESPACE
class QBarCategoryAxisPrivate;
class Q_GRAPHS2D_EXPORT QBarCategoryAxis : public QAbstractAxis
class Q_GRAPHS_EXPORT QBarCategoryAxis : public QAbstractAxis
{
Q_OBJECT
Q_PROPERTY(QStringList categories READ categories WRITE setCategories NOTIFY categoriesChanged)

2
src/graphs2d/axis/barcategoryaxis/qbarcategoryaxis_p.h
View File

@ -13,7 +13,7 @@
#ifndef QBARCATEGORYAXIS_P_H
#define QBARCATEGORYAXIS_P_H
#include <QtGraphs2D/QBarCategoryAxis>
#include <QtGraphs/QBarCategoryAxis>
#include <private/qabstractaxis_p.h>
QT_BEGIN_NAMESPACE

4
src/graphs2d/axis/qabstractaxis.cpp
View File

@ -1,7 +1,7 @@
// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtGraphs2D/QAbstractAxis>
#include <QtGraphs/QAbstractAxis>
#include <private/qabstractaxis_p.h>
QT_BEGIN_NAMESPACE
@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
\qmltype AbstractAxis
\instantiates QAbstractAxis
\inqmlmodule QtGraphs
\ingroup graphs_qml
\ingroup graphs_qml_2D
\brief A base type used for specialized axis types.

8
src/graphs2d/axis/qabstractaxis.h
View File

@ -4,18 +4,18 @@
#ifndef QABSTRACTAXIS_H
#define QABSTRACTAXIS_H
#include <QtCore/QObject>
#include <QtCore/QVariant>
#include <QtGraphs/qgraphsglobal.h>
#include <QtGui/QColor>
#include <QtGui/QFont>
#include <QtCore/QVariant>
#include <QtCore/QObject>
#include <QtQml/QQmlEngine>
#include <QtGraphs2D/qtgraphs2dexports.h>
QT_BEGIN_NAMESPACE
class QAbstractAxisPrivate;
class Q_GRAPHS2D_EXPORT QAbstractAxis : public QObject
class Q_GRAPHS_EXPORT QAbstractAxis : public QObject
{
Q_OBJECT
//visibility

2
src/graphs2d/axis/qabstractaxis_p.h
View File

@ -13,7 +13,7 @@
#ifndef QABSTRACTAXIS_P_H
#define QABSTRACTAXIS_P_H
#include <QtGraphs2D/QAbstractAxis>
#include <QtGraphs/QAbstractAxis>
#include <private/qgraphsview_p.h>
#include <QtCore/QDebug>
#include <QColor>

4
src/graphs2d/axis/valueaxis/qvalueaxis.cpp
View File

@ -1,7 +1,7 @@
// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtGraphs2D/QValueAxis>
#include <QtGraphs/QValueAxis>
#include <private/qvalueaxis_p.h>
#include <private/charthelpers_p.h>
#include <QtCore/QtMath>
@ -19,7 +19,7 @@ QT_BEGIN_NAMESPACE
\qmltype ValueAxis
\instantiates QValueAxis
\inqmlmodule QtGraphs
\ingroup graphs_qml
\ingroup graphs_qml_2D
\inherits AbstractAxis
\brief Adds values to a chart's axes.

6
src/graphs2d/axis/valueaxis/qvalueaxis.h
View File

@ -4,15 +4,15 @@
#ifndef QVALUEAXIS_H
#define QVALUEAXIS_H
#include <QtGraphs2D/QAbstractAxis>
#include <QtGraphs/QAbstractAxis>
#include <QtGraphs/qgraphsglobal.h>
#include <QtQml/QQmlEngine>
#include <QtGraphs2D/qtgraphs2dexports.h>
QT_BEGIN_NAMESPACE
class QValueAxisPrivate;
class Q_GRAPHS2D_EXPORT QValueAxis : public QAbstractAxis
class Q_GRAPHS_EXPORT QValueAxis : public QAbstractAxis
{
Q_OBJECT
Q_PROPERTY(qreal min READ min WRITE setMin NOTIFY minChanged)

2
src/graphs2d/axis/valueaxis/qvalueaxis_p.h
View File

@ -13,7 +13,7 @@
#ifndef QVALUEAXIS_P_H
#define QVALUEAXIS_P_H
#include <QtGraphs2D/QValueAxis>
#include <QtGraphs/QValueAxis>
#include <private/qabstractaxis_p.h>
QT_BEGIN_NAMESPACE

6
src/graphs2d/barchart/qabstractbarseries.cpp
View File

@ -3,9 +3,9 @@
#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
#include <QtGraphs2D/qabstractbarseries.h>
#include <QtGraphs/qabstractbarseries.h>
#include <private/qabstractbarseries_p.h>
#include <QtGraphs2D/qbarset.h>
#include <QtGraphs/qbarset.h>
#include <private/qbarset_p.h>
#include <QForeach>
@ -37,7 +37,7 @@ QT_BEGIN_NAMESPACE
\qmltype AbstractBarSeries
\instantiates QAbstractBarSeries
\inqmlmodule QtGraphs
\ingroup graphs_qml
\ingroup graphs_qml_2D
\inherits AbstractSeries
\brief An abstract parent type for all bar series types.

6
src/graphs2d/barchart/qabstractbarseries.h
View File

@ -4,10 +4,10 @@
#ifndef QABSTRACTBARSERIES_H
#define QABSTRACTBARSERIES_H
#include <QtGraphs2D/qabstractseries.h>
#include <QtGraphs/qabstractseries.h>
#include <QtCore/QStringList>
#include <QtQml/QQmlEngine>
#include <QtGraphs2D/qtgraphs2dexports.h>
#include <QtGraphs/qgraphsglobal.h>
QT_BEGIN_NAMESPACE
@ -15,7 +15,7 @@ class QBarSet;
class QAbstractBarSeriesPrivate;
// Container for series
class Q_GRAPHS2D_EXPORT QAbstractBarSeries : public QAbstractSeries
class Q_GRAPHS_EXPORT QAbstractBarSeries : public QAbstractSeries
{
Q_OBJECT
Q_PROPERTY(qreal barWidth READ barWidth WRITE setBarWidth)

4
src/graphs2d/barchart/qabstractbarseries_p.h
View File

@ -13,9 +13,9 @@
#ifndef QABSTRACTBARSERIES_P_H
#define QABSTRACTBARSERIES_P_H
#include <QtGraphs2D/qabstractbarseries.h>
#include <QtGraphs/qabstractbarseries.h>
#include <private/qabstractseries_p.h>
#include <QtGraphs2D//qabstractseries.h>
#include <QtGraphs//qabstractseries.h>
#include <QtCore/QStringList>
QT_BEGIN_NAMESPACE

6
src/graphs2d/barchart/qbarseries.cpp
View File

@ -1,9 +1,9 @@
// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtGraphs2D/qbarseries.h>
#include <QtGraphs/qbarseries.h>
#include <private/qbarseries_p.h>
#include <QtGraphs2D/QBarCategoryAxis>
#include <QtGraphs/QBarCategoryAxis>
#include <private/qgraphsview_p.h>
QT_BEGIN_NAMESPACE
@ -28,7 +28,7 @@ QT_BEGIN_NAMESPACE
\qmltype BarSeries
\instantiates QBarSeries
\inqmlmodule QtGraphs
\ingroup graphs_qml
\ingroup graphs_qml_2D
\inherits AbstractBarSeries
\brief Presents a series of data as vertical bars grouped by category.

8
src/graphs2d/barchart/qbarseries.h
View File

@ -4,15 +4,15 @@
#ifndef QBARSERIES_H
#define QBARSERIES_H
#include <QtGraphs2D/qabstractbarseries.h>
#include <QtGraphs2D/qabstractaxis.h>
#include <QtGraphs2D/qtgraphs2dexports.h>
#include <QtGraphs/qabstractbarseries.h>
#include <QtGraphs/qabstractaxis.h>
#include <QtGraphs/qgraphsglobal.h>
QT_BEGIN_NAMESPACE
class QBarSeriesPrivate;
class Q_GRAPHS2D_EXPORT QBarSeries : public QAbstractBarSeries
class Q_GRAPHS_EXPORT QBarSeries : public QAbstractBarSeries
{
Q_OBJECT
Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)

4
src/graphs2d/barchart/qbarset.cpp
View File

@ -1,7 +1,7 @@
// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtGraphs2D/qbarset.h>
#include <QtGraphs/qbarset.h>
#include <private/qbarset_p.h>
#include <private/charthelpers_p.h>
@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE
\qmltype BarSet
\instantiates QBarSet
\inqmlmodule QtGraphs
\ingroup graphs_qml
\ingroup graphs_qml_2D
\brief Represents one set of bars in a bar chart.
A bar set contains one data value for each category. The first value of a set is assumed to

10
src/graphs2d/barchart/qbarset.h
View File

@ -4,18 +4,18 @@
#ifndef QBARSET_H
#define QBARSET_H
#include <QtQml/QQmlEngine>
#include <QtGui/qpen.h>
#include <QtCore/qobject.h>
#include <QtGraphs/qgraphsglobal.h>
#include <QtGui/qbrush.h>
#include <QtGui/qfont.h>
#include <QtCore/qobject.h>
#include <QtGraphs2D/qtgraphs2dexports.h>
#include <QtGui/qpen.h>
#include <QtQml/QQmlEngine>
QT_BEGIN_NAMESPACE
class QBarSetPrivate;
class Q_GRAPHS2D_EXPORT QBarSet : public QObject
class Q_GRAPHS_EXPORT QBarSet : public QObject
{
Q_OBJECT
Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)

2
src/graphs2d/barchart/qbarset_p.h
View File

@ -13,7 +13,7 @@
#ifndef QBARSET_P_H
#define QBARSET_P_H
#include <QtGraphs2D/qbarset.h>
#include <QtGraphs/qbarset.h>
#include <QtCore/QMap>
#include <QtGui/QPen>
#include <QtGui/QBrush>

2
src/graphs2d/linechart/qlineseries.cpp
View File

@ -1,7 +1,7 @@
// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtGraphs2D/qlineseries.h>
#include <QtGraphs/qlineseries.h>
#include <private/qxypoint_p.h>
#include <private/qlineseries_p.h>
#include <private/qgraphsview_p.h>

6
src/graphs2d/linechart/qlineseries.h
View File

@ -4,14 +4,14 @@
#ifndef QLINESERIES_H
#define QLINESERIES_H
#include <QtGraphs2D/qxyseries.h>
#include <QtGraphs2D/qtgraphs2dexports.h>
#include <QtGraphs/qxyseries.h>
#include <QtGraphs/qgraphsglobal.h>
QT_BEGIN_NAMESPACE
class QLineSeriesPrivate;
class Q_GRAPHS2D_EXPORT QLineSeries : public QXYSeries
class Q_GRAPHS_EXPORT QLineSeries : public QXYSeries
{
Q_OBJECT
Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)

2
src/graphs2d/linechart/qlineseries_p.h
View File

@ -13,7 +13,7 @@
#ifndef QLINESERIES_P_H
#define QLINESERIES_P_H
#include <QtGraphs2D/qlineseries.h>
#include <QtGraphs/qlineseries.h>
#include <private/qxyseries_p.h>
QT_BEGIN_NAMESPACE

4
src/graphs2d/qabstractseries.cpp
View File

@ -1,7 +1,7 @@
// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtGraphs2D/qabstractseries.h>
#include <QtGraphs/qabstractseries.h>
#include <private/qabstractseries_p.h>
#include <private/qgraphsview_p.h>
@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
\qmltype AbstractSeries
\instantiates QAbstractSeries
\inqmlmodule QtGraphs
\ingroup graphs_qml
\ingroup graphs_qml_2D
\brief Base type for all Qt Chart series types.
This type cannot be instantiated directly. Instead, one of the following derived types

8
src/graphs2d/qabstractseries.h
View File

@ -4,20 +4,20 @@
#ifndef QABSTRACTSERIES_H
#define QABSTRACTSERIES_H
#include <QtGraphs2D/QAbstractAxis>
#include <QtGraphs/QAbstractAxis>
#include <QtCore/QObject>
#include <QtGui/QPen>
#include <QtQml/QQmlParserStatus>
#include <QtQml/QQmlListProperty>
#include <QtGraphs2D/seriestheme.h>
#include <QtGraphs2D/qtgraphs2dexports.h>
#include <QtGraphs/seriestheme.h>
#include <QtGraphs/qgraphsglobal.h>
QT_BEGIN_NAMESPACE
class QAbstractSeriesPrivate;
class QGraphsView;
class Q_GRAPHS2D_EXPORT QAbstractSeries : public QObject, public QQmlParserStatus
class Q_GRAPHS_EXPORT QAbstractSeries : public QObject, public QQmlParserStatus
{
Q_OBJECT
Q_INTERFACES(QQmlParserStatus)

3
src/graphs2d/qabstractseries_p.h
View File

@ -14,8 +14,7 @@
//
// We mean it.
#include <QtGraphs2D/qabstractseries.h>
#include <QtGraphs/qabstractseries.h>
#include <memory>
QT_BEGIN_NAMESPACE

6
src/graphs2d/qgraphsview.cpp
View File

@ -2,9 +2,9 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <private/qgraphsview_p.h>
#include <QtGraphs2D/qbarseries.h>
#include <QtGraphs2D/qlineseries.h>
#include <QtGraphs2D/qscatterseries.h>
#include <QtGraphs/qbarseries.h>
#include <QtGraphs/qlineseries.h>
#include <QtGraphs/qscatterseries.h>
QT_BEGIN_NAMESPACE

4
src/graphs2d/qgraphsview_p.h
View File

@ -17,14 +17,14 @@
#include <QtQuick/QQuickItem>
#include <QList>
#include <QQmlListProperty>
#include <QtGraphs2D/qabstractseries.h>
#include <QtGraphs/qabstractseries.h>
#include <QPen>
#include <QBrush>
#include <private/axisrenderer_p.h>
#include <private/barsrenderer_p.h>
#include <private/pointrenderer_p.h>
#include <QtGraphs2D/graphtheme.h>
#include <QtGraphs/graphtheme.h>
#include <QtQuick/QSGClipNode>
QT_BEGIN_NAMESPACE

4
src/graphs2d/qsgrenderer/axisrenderer.cpp
View File

@ -4,9 +4,9 @@
#include <private/axisrenderer_p.h>
#include <private/qabstractaxis_p.h>
#include <private/qgraphsview_p.h>
#include <QtGraphs2D/QBarCategoryAxis>
#include <QtGraphs/QBarCategoryAxis>
#include <private/qvalueaxis_p.h>
#include <QtGraphs2D/graphtheme.h>
#include <QtGraphs/graphtheme.h>
QT_BEGIN_NAMESPACE

4
src/graphs2d/qsgrenderer/barsrenderer.cpp
View File

@ -3,8 +3,8 @@
#include <private/barsrenderer_p.h>
#include <private/qgraphsview_p.h>
#include <QtGraphs2D/qbarseries.h>
#include <QtGraphs2D/qbarset.h>
#include <QtGraphs/qbarseries.h>
#include <QtGraphs/qbarset.h>
QT_BEGIN_NAMESPACE

4
src/graphs2d/qsgrenderer/pointrenderer.cpp
View File

@ -3,8 +3,8 @@
#include <private/pointrenderer_p.h>
#include <private/qgraphsview_p.h>
#include <QtGraphs2D/qscatterseries.h>
#include <QtGraphs2D/qlineseries.h>
#include <QtGraphs/qscatterseries.h>
#include <QtGraphs/qlineseries.h>
QT_BEGIN_NAMESPACE

2
src/graphs2d/scatterchart/qscatterseries.cpp
View File

@ -1,7 +1,7 @@
// Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
#include <QtGraphs2D/qscatterseries.h>
#include <QtGraphs/qscatterseries.h>
#include <private/qxypoint_p.h>
#include <private/qscatterseries_p.h>
#include <private/qgraphsview_p.h>

6
src/graphs2d/scatterchart/qscatterseries.h
View File

@ -4,14 +4,14 @@
#ifndef QSCATTERSERIES_H
#define QSCATTERSERIES_H
#include <QtGraphs2D/qxyseries.h>
#include <QtGraphs2D/qtgraphs2dexports.h>
#include <QtGraphs/qxyseries.h>
#include <QtGraphs/qgraphsglobal.h>
QT_BEGIN_NAMESPACE
class QScatterSeriesPrivate;
class Q_GRAPHS2D_EXPORT QScatterSeries : public QXYSeries
class Q_GRAPHS_EXPORT QScatterSeries : public QXYSeries
{
Q_OBJECT
Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)

2
src/graphs2d/scatterchart/qscatterseries_p.h
View File

@ -13,7 +13,7 @@
#ifndef QSCATTERSERIES_P_H
#define QSCATTERSERIES_P_H
#include <QtGraphs2D/qscatterseries.h>
#include <QtGraphs/qscatterseries.h>
#include <private/qxyseries_p.h>
QT_BEGIN_NAMESPACE

4
src/graphs2d/themes/graphtheme.h
View File

@ -9,11 +9,11 @@
#include <QtCore/QObject>
#include <QtQml/QQmlEngine>
#include <QtQml/QQmlParserStatus>
#include <QtGraphs2D/qtgraphs2dexports.h>
#include <QtGraphs/qgraphsglobal.h>
QT_BEGIN_NAMESPACE
class Q_GRAPHS2D_EXPORT GraphTheme : public QObject, public QQmlParserStatus
class Q_GRAPHS_EXPORT GraphTheme : public QObject, public QQmlParserStatus
{
Q_OBJECT
Q_INTERFACES(QQmlParserStatus)

4
src/graphs2d/themes/seriestheme.h
View File

@ -9,11 +9,11 @@
#include <QtCore/QObject>
#include <QtQml/QQmlEngine>
#include <QtQml/QQmlParserStatus>
#include <QtGraphs2D/qtgraphs2dexports.h>
#include <QtGraphs/qgraphsglobal.h>
QT_BEGIN_NAMESPACE
class Q_GRAPHS2D_EXPORT SeriesTheme : public QObject, public QQmlParserStatus
class Q_GRAPHS_EXPORT SeriesTheme : public QObject, public QQmlParserStatus
{
Q_OBJECT
Q_INTERFACES(QQmlParserStatus)

2
src/graphs2d/xychart/qxypoint.cpp
View File

@ -9,7 +9,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmltype XYPoint
\inqmlmodule QtGraphs
\ingroup graphs_qml
\ingroup graphs_qml_2D
\brief Initializes XY-series coordinate data.
The XYPoint type is a convenience type for initializing line, spline, and

2
src/graphs2d/xychart/qxyseries.cpp
View File

@ -3,7 +3,7 @@
#undef QT_NO_FOREACH // this file contains unported legacy Q_FOREACH uses
#include <QtGraphs2D/qxyseries.h>
#include <QtGraphs/qxyseries.h>
#include <private/qxyseries_p.h>
#include <private/charthelpers_p.h>

6
src/graphs2d/xychart/qxyseries.h
View File

@ -4,8 +4,8 @@
#ifndef QXYSERIES_H
#define QXYSERIES_H
#include <QtGraphs2D/qabstractseries.h>
#include <QtGraphs2D/qtgraphs2dexports.h>
#include <QtGraphs/qabstractseries.h>
#include <QtGraphs/qgraphsglobal.h>
QT_BEGIN_NAMESPACE
class QModelIndex;
@ -16,7 +16,7 @@ QT_BEGIN_NAMESPACE
class QXYSeriesPrivate;
class QXYModelMapper;
class Q_GRAPHS2D_EXPORT QXYSeries : public QAbstractSeries
class Q_GRAPHS_EXPORT QXYSeries : public QAbstractSeries
{
Q_OBJECT
Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)

2
src/graphs2d/xychart/qxyseries_p.h
View File

@ -13,7 +13,7 @@
#ifndef QXYSERIES_P_H
#define QXYSERIES_P_H
#include <QtGraphs2D/qxyseries.h>
#include <QtGraphs/qxyseries.h>
#include <private/qabstractseries_p.h>
QT_BEGIN_NAMESPACE

421
src/graphs3d/CMakeLists.txt
View File

@ -1,32 +1,7 @@
# Copyright (C) 2023 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
set(qml_files
qml/designer/Bars3DSpecifics.qml
qml/designer/Scatter3DSpecifics.qml
qml/designer/Surface3DSpecifics.qml
qml/designer/GraphsCameraSection.qml
qml/designer/GraphsSection.qml
qml/designer/default/Bars3D.qml
qml/designer/default/Scatter3D.qml
qml/designer/default/Surface3D.qml
)
set_source_files_properties(${qml_files} PROPERTIES
QT_QML_SKIP_QMLDIR_ENTRY TRUE
)
qt_internal_add_qml_module(Graphs
URI "QtGraphs3D"
TARGET_PRODUCT "Qt Graphs (Qt $$QT_VERSION)"
TARGET_DESCRIPTION "Qt Graphs 3D Visualization component for Qt."
VERSION "${PROJECT_VERSION}"
PAST_MAJOR_VERSIONS 1
DEPENDENCIES
QtQuick
QtQuick3D
QML_FILES
${qml_files}
qt_internal_extend_target(Graphs
SOURCES
axis/qabstract3daxis.cpp axis/qabstract3daxis.h axis/qabstract3daxis_p.h
axis/qcategory3daxis.cpp axis/qcategory3daxis.h axis/qcategory3daxis_p.h
@ -110,400 +85,6 @@ qt_internal_add_qml_module(Graphs
theme
utils
qml
LIBRARIES
Qt::Quick3DPrivate
Qt::Quick3DRuntimeRenderPrivate
PUBLIC_LIBRARIES
Qt::Core
Qt::Gui
Qt::Quick
Qt::QuickWidgets
Qt::Quick3D
PRIVATE_MODULE_INTERFACE
Qt::Quick3DPrivate
Qt::Quick3DRuntimeRenderPrivate
GENERATE_CPP_EXPORTS
)
set_source_files_properties("qml/resources/DatapointSphere.qml"
PROPERTIES QT_RESOURCE_ALIAS "DatapointSphere"
)
set_source_files_properties("qml/resources/DatapointCube.qml"
PROPERTIES QT_RESOURCE_ALIAS "DatapointCube"
)
set_source_files_properties("qml/resources/AxisLabel.qml"
PROPERTIES QT_RESOURCE_ALIAS "AxisLabel"
)
set_source_files_properties("qml/resources/GridLine.qml"
PROPERTIES QT_RESOURCE_ALIAS "GridLine"
)
set_source_files_properties("qml/resources/ItemLabel.qml"
PROPERTIES QT_RESOURCE_ALIAS "ItemLabel"
)
set_source_files_properties("qml/resources/TitleLabel.qml"
PROPERTIES QT_RESOURCE_ALIAS "TitleLabel"
)
set_source_files_properties("qml/resources/GridSurfaceMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "GridSurfaceMaterial"
)
set_source_files_properties("qml/resources/SurfaceSliceMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "SurfaceSliceMaterial"
)
set_source_files_properties("qml/resources/BarsMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "BarsMaterial"
)
set_source_files_properties("qml/resources/BarsMaterialInstancing.qml"
PROPERTIES QT_RESOURCE_ALIAS "BarsMaterialInstancing"
)
set_source_files_properties("qml/resources/SurfaceMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "SurfaceMaterial"
)
set_source_files_properties("qml/resources/ScatterMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "ScatterMaterial"
)
set_source_files_properties("qml/resources/ScatterMaterialInstancing.qml"
PROPERTIES QT_RESOURCE_ALIAS "ScatterMaterialInstancing"
)
set_source_files_properties("qml/resources/ObjectGradientMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "ObjectGradientMaterial"
)
set_source_files_properties("qml/resources/ObjectGradientMaterialInstancing.qml"
PROPERTIES QT_RESOURCE_ALIAS "ObjectGradientMaterialInstancing"
)
set_source_files_properties("qml/resources/VolumeMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "VolumeMaterial"
)
set_source_files_properties("qml/resources/VolumeLowDefMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "VolumeLowDefMaterial"
)
set_source_files_properties("qml/resources/VolumeSliceMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "VolumeSliceMaterial"
)
set_source_files_properties("qml/resources/VolumeFrameMaterial.qml"
PROPERTIES QT_RESOURCE_ALIAS "VolumeFrameMaterial"
)
set(qml_component_resources
"qml/resources/DatapointSphere.qml"
"qml/resources/DatapointCube.qml"
)
set(qml_axis_resurces
"qml/resources/AxisLabel.qml"
"qml/resources/GridLine.qml"
"qml/resources/ItemLabel.qml"
"qml/resources/TitleLabel.qml"
)
set(qml_material_resources
"qml/resources/ObjectGradientMaterial.qml"
"qml/resources/ObjectGradientMaterialInstancing.qml"
"qml/resources/BarsMaterial.qml"
"qml/resources/BarsMaterialInstancing.qml"
"qml/resources/SurfaceMaterial.qml"
"qml/resources/ScatterMaterial.qml"
"qml/resources/ScatterMaterialInstancing.qml"
"qml/resources/GridSurfaceMaterial.qml"
"qml/resources/SurfaceSliceMaterial.qml"
"qml/resources/SurfaceShadowNoTex.qml"
"qml/resources/VolumeMaterial.qml"
"qml/resources/VolumeLowDefMaterial.qml"
"qml/resources/VolumeSliceMaterial.qml"
"qml/resources/VolumeFrameMaterial.qml"
)
set(resources
"qml/designer/Graphs.metainfo"
"qml/designer/images/bars3d-icon.png"
"qml/designer/images/bars3d-icon16.png"
"qml/designer/images/scatter3d-icon.png"
"qml/designer/images/scatter3d-icon16.png"
"qml/designer/images/surface3d-icon.png"
"qml/designer/images/surface3d-icon16.png"
)
# .mesh file aliases
set_source_files_properties("engine/meshes/arrowFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "arrowMesh"
)
set_source_files_properties("engine/meshes/arrowSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "arrowMeshSmooth"
)
set_source_files_properties("engine/meshes/background.mesh"
PROPERTIES QT_RESOURCE_ALIAS "backgroundMesh"
)
set_source_files_properties("engine/meshes/barFilledFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "bevelBarMeshFull"
)
set_source_files_properties("engine/meshes/barFilledSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "bevelBarMeshSmoothFull"
)
set_source_files_properties("engine/meshes/barFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "bevelBarMesh"
)
set_source_files_properties("engine/meshes/barSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "bevelBarMeshSmooth"
)
set_source_files_properties("engine/meshes/cubeFilledFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "barMeshFull"
)
set_source_files_properties("engine/meshes/cubeFilledSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "barMeshSmoothFull"
)
set_source_files_properties("engine/meshes/cubeFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "barMesh"
)
set_source_files_properties("engine/meshes/cubeSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "barMeshSmooth"
)
set_source_files_properties("engine/meshes/coneFilledFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "coneMeshFull"
)
set_source_files_properties("engine/meshes/coneFilledSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "coneMeshSmoothFull"
)
set_source_files_properties("engine/meshes/coneFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "coneMesh"
)
set_source_files_properties("engine/meshes/coneSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "coneMeshSmooth"
)
set_source_files_properties("engine/meshes/cylinderFilledFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "cylinderMeshFull"
)
set_source_files_properties("engine/meshes/cylinderFilledSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "cylinderMeshSmoothFull"
)
set_source_files_properties("engine/meshes/cylinderFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "cylinderMesh"
)
set_source_files_properties("engine/meshes/cylinderSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "cylinderMeshSmooth"
)
set_source_files_properties("engine/meshes/minimalFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "minimalMesh"
)
set_source_files_properties("engine/meshes/minimalSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "minimalMeshSmooth"
)
set_source_files_properties("engine/meshes/plane.mesh"
PROPERTIES QT_RESOURCE_ALIAS "planeMesh"
)
set_source_files_properties("engine/meshes/pyramidFilledFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "pyramidMeshFull"
)
set_source_files_properties("engine/meshes/pyramidFilledSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "pyramidMeshSmoothFull"
)
set_source_files_properties("engine/meshes/pyramidFlat.mesh"
PROPERTIES QT_RESOURCE_ALIAS "pyramidMesh"
)
set_source_files_properties("engine/meshes/pyramidSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "pyramidMeshSmooth"
)
set_source_files_properties("engine/meshes/octagon.mesh"
PROPERTIES QT_RESOURCE_ALIAS "octagonMesh"
)
set_source_files_properties("engine/meshes/sphere.mesh"
PROPERTIES QT_RESOURCE_ALIAS "sphereMesh"
)
set_source_files_properties("engine/meshes/sphereSmooth.mesh"
PROPERTIES QT_RESOURCE_ALIAS "sphereMeshSmooth"
)
set_source_files_properties("engine/meshes/backgroundNoFloor.mesh"
PROPERTIES QT_RESOURCE_ALIAS "backgroundNoFloorMesh"
)
set(mesh_resource_files
# .mesh files
"engine/meshes/background.mesh"
"engine/meshes/arrowFlat.mesh"
"engine/meshes/arrowSmooth.mesh"
"engine/meshes/barFilledFlat.mesh"
"engine/meshes/barFilledSmooth.mesh"
"engine/meshes/barFlat.mesh"
"engine/meshes/barSmooth.mesh"
"engine/meshes/coneFilledFlat.mesh"
"engine/meshes/coneFilledSmooth.mesh"
"engine/meshes/coneFlat.mesh"
"engine/meshes/coneSmooth.mesh"
"engine/meshes/cubeFilledFlat.mesh"
"engine/meshes/cubeFilledSmooth.mesh"
"engine/meshes/cubeFlat.mesh"
"engine/meshes/cubeSmooth.mesh"
"engine/meshes/cylinderFilledFlat.mesh"
"engine/meshes/cylinderFilledSmooth.mesh"
"engine/meshes/cylinderFlat.mesh"
"engine/meshes/cylinderSmooth.mesh"
"engine/meshes/minimalFlat.mesh"
"engine/meshes/minimalSmooth.mesh"
"engine/meshes/plane.mesh"
"engine/meshes/pyramidFilledFlat.mesh"
"engine/meshes/pyramidFilledSmooth.mesh"
"engine/meshes/pyramidFlat.mesh"
"engine/meshes/pyramidSmooth.mesh"
"engine/meshes/octagon.mesh"
"engine/meshes/sphere.mesh"
"engine/meshes/sphereSmooth.mesh"
"engine/meshes/backgroundNoFloor.mesh"
)
set_source_files_properties("engine/shaders/3dsliceframes.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragment3DSliceFrames"
)
set_source_files_properties("engine/shaders/position.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexPosition"
)
set_source_files_properties("engine/shaders/bars.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentBars"
)
set_source_files_properties("engine/shaders/barsinstancing.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentBarsInstancing"
)
set_source_files_properties("engine/shaders/barsinstancing.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexBarsInstancing"
)
set_source_files_properties("engine/shaders/surface.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentSurface"
)
set_source_files_properties("engine/shaders/surface.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexSurface"
)
set_source_files_properties("engine/shaders/scatter.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexScatter"
)
set_source_files_properties("engine/shaders/scatter.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentScatter"
)
set_source_files_properties("engine/shaders/scatterinstancing.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexScatterInstancing"
)
set_source_files_properties("engine/shaders/scatterinstancing.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentScatterInstancing"
)
set_source_files_properties("engine/shaders/surfaceGrid.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragSurfaceGrid"
)
set_source_files_properties("engine/shaders/surfaceGrid.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexSurfaceGrid"
)
set_source_files_properties("engine/shaders/surfaceSlice.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexSurfaceSlice"
)
set_source_files_properties("engine/shaders/texture3d.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentTexture3D"
)
set_source_files_properties("engine/shaders/texture3d.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexTexture3D"
)
set_source_files_properties("engine/shaders/texture3dlowdef.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentTexture3DLowDef"
)
set_source_files_properties("engine/shaders/texture3dslice.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentTexture3DSlice"
)
set_source_files_properties("engine/shaders/objectgradient.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexobjectgradient"
)
set_source_files_properties("engine/shaders/objectgradient.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentobjectgradient"
)
set_source_files_properties("engine/shaders/objectgradientinstancing.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexobjectgradientinstancing"
)
set_source_files_properties("engine/shaders/objectgradientinstancing.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentobjectgradientinstancing"
)
set_source_files_properties("engine/shaders/rangegradient.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexrangegradient"
)
set_source_files_properties("engine/shaders/rangegradient.frag"
PROPERTIES QT_RESOURCE_ALIAS "fragmentrangegradient"
)
set_source_files_properties("engine/shaders/rangegradientinstancing.vert"
PROPERTIES QT_RESOURCE_ALIAS "vertexrangegradientinstancing"
)
set(shader_resource_files
"engine/shaders/3dsliceframes.frag"
"engine/shaders/position.vert"
"engine/shaders/objectgradient.vert"
"engine/shaders/objectgradient.frag"
"engine/shaders/objectgradientinstancing.vert"
"engine/shaders/objectgradientinstancing.frag"
"engine/shaders/rangegradient.vert"
"engine/shaders/rangegradient.frag"
"engine/shaders/rangegradientinstancing.frag"
"engine/shaders/rangegradientinstancing.vert"
"engine/shaders/surface.vert"
"engine/shaders/surface.frag"
"engine/shaders/surfaceGrid.vert"
"engine/shaders/surfaceGrid.frag"
"engine/shaders/bars.frag"
"engine/shaders/barsinstancing.vert"
"engine/shaders/barsinstancing.frag"
"engine/shaders/scatter.vert"
"engine/shaders/scatter.frag"
"engine/shaders/scatterinstancing.vert"
"engine/shaders/scatterinstancing.frag"
"engine/shaders/surfaceSlice.vert"
"engine/shaders/texture3d.frag"
"engine/shaders/texture3d.vert"
"engine/shaders/texture3dlowdef.frag"
"engine/shaders/texture3dslice.frag"
)
qt_internal_add_resource(Graphs "graphsshaders"
PREFIX
"/shaders"
BASE
"engine/shaders"
FILES
${shader_resource_files}
)
qt_internal_add_resource(Graphs "graphsmeshes"
PREFIX
"/defaultMeshes"
BASE
"engine/meshes"
FILES
${mesh_resource_files}
${obj_resource_files}
)
qt_internal_add_resource(Graphs "qml_component_resources"
PREFIX
"/datapointModels"
BASE
"qml"
FILES
${qml_component_resources}
)
qt_internal_add_resource(Graphs "qml_axis_resurces"
PREFIX
"/axis"
BASE
"qml"
FILES
${qml_axis_resurces}
)
qt_internal_add_resource(Graphs "qml_material_resources"
PREFIX
"/materials"
BASE
"qml"
FILES
${qml_material_resources}
)
qt_internal_extend_target(Graphs CONDITION MACOS

2
src/graphs3d/axis/qabstract3daxis.cpp
View File

@ -20,7 +20,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype AbstractAxis3D
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QAbstract3DAxis
* \brief A base type for the axes of a 3D graph.

2
src/graphs3d/axis/qcategory3daxis.cpp
View File

@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype CategoryAxis3D
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QCategory3DAxis
* \inherits AbstractAxis3D

2
src/graphs3d/axis/qlogvalue3daxisformatter.cpp
View File

@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype LogValueAxis3DFormatter
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QLogValue3DAxisFormatter
* \inherits ValueAxis3DFormatter

2
src/graphs3d/axis/qvalue3daxis.cpp
View File

@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype ValueAxis3D
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QValue3DAxis
* \inherits AbstractAxis3D

2
src/graphs3d/axis/qvalue3daxisformatter.cpp
View File

@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype ValueAxis3DFormatter
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QValue3DAxisFormatter
* \brief A base type for 3D value axis formatters.

2
src/graphs3d/data/qabstract3dseries.cpp
View File

@ -31,7 +31,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype Abstract3DSeries
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QAbstract3DSeries
* \brief A base type for all 3D data series.

2
src/graphs3d/data/qabstractdataproxy.cpp
View File

@ -19,7 +19,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype AbstractDataProxy
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QAbstractDataProxy
* \brief Base type for all 3D graph data proxies.

2
src/graphs3d/data/qbar3dseries.cpp
View File

@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype Bar3DSeries
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QBar3DSeries
* \inherits Abstract3DSeries

2
src/graphs3d/data/qbardataproxy.cpp
View File

@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype BarDataProxy
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QBarDataProxy
* \inherits AbstractDataProxy

2
src/graphs3d/data/qcustom3ditem.cpp
View File

@ -18,7 +18,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype Custom3DItem
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QCustom3DItem
* \brief Adds a custom item to a graph.

2
src/graphs3d/data/qcustom3dlabel.cpp
View File

@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype Custom3DLabel
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QCustom3DLabel
* \inherits Custom3DItem

2
src/graphs3d/data/qcustom3dvolume.cpp
View File

@ -36,7 +36,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype Custom3DVolume
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QCustom3DVolume
* \inherits Custom3DItem

2
src/graphs3d/data/qheightmapsurfacedataproxy.cpp
View File

@ -30,7 +30,7 @@ const float defaultMaxValue = 10.0f;
/*!
* \qmltype HeightMapSurfaceDataProxy
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QHeightMapSurfaceDataProxy
* \inherits SurfaceDataProxy

2
src/graphs3d/data/qitemmodelbardataproxy.cpp
View File

@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype ItemModelBarDataProxy
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QItemModelBarDataProxy
* \inherits BarDataProxy

2
src/graphs3d/data/qitemmodelscatterdataproxy.cpp
View File

@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype ItemModelScatterDataProxy
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QItemModelScatterDataProxy
* \inherits ScatterDataProxy

2
src/graphs3d/data/qitemmodelsurfacedataproxy.cpp
View File

@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype ItemModelSurfaceDataProxy
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QItemModelSurfaceDataProxy
* \inherits SurfaceDataProxy

2
src/graphs3d/data/qscatter3dseries.cpp
View File

@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype Scatter3DSeries
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QScatter3DSeries
* \inherits Abstract3DSeries

2
src/graphs3d/data/qscatterdataproxy.cpp
View File

@ -31,7 +31,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype ScatterDataProxy
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QScatterDataProxy
* \inherits AbstractDataProxy

2
src/graphs3d/data/qsurface3dseries.cpp
View File

@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype Surface3DSeries
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QSurface3DSeries
* \inherits Abstract3DSeries

2
src/graphs3d/data/qsurfacedataproxy.cpp
View File

@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype SurfaceDataProxy
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QSurfaceDataProxy
* \inherits AbstractDataProxy

8
src/graphs3d/doc/src/qtgraphs-index.qdoc
View File

@ -12,19 +12,15 @@
received from multiple sensors. The look and feel of graphs can be
customized by using themes or by adding custom items and labels.
Qt Graphs is built on Qt 6 and Qt Quick 3D to take advantage of
Qt Graphs is built on Qt 6 and the 3D graphs on Qt Quick 3D to take advantage of
hardware acceleration and Qt Quick.
\section1 Using the Module
\section2 QtGraphs 2D QML API
\section2 QtGraphs QML API
\include {module-use.qdocinc} {using the qml api} {QtGraphs}
\section2 QtGraphs 3D QML API
\include {module-use.qdocinc} {using the qml api} {QtGraphs3D}
\section2 C++ API
\include {module-use.qdocinc} {using the c++ api}

17
src/graphs3d/doc/src/qtgraphs.qdoc
View File

@ -15,10 +15,13 @@
*/
/*!
\qmlmodule QtGraphs3D \QtMajorVersion.\QtMinorVersion
\title Qt Graphs 3D QML Types
\ingroup qmlmodules
\qmlmodule QtGraphs \QtMajorVersion.\QtMinorVersion
\modulestate Technical Preview
*/
/*!
\group graphs_qml_3D
\title Qt Graphs 3D QML Types
\brief QML types for the Qt Graphs 3D API.
@ -28,10 +31,8 @@
*/
/*!
\qmlmodule QtGraphs \QtMajorVersion.\QtMinorVersion
\group graphs_qml_2D
\title Qt Graphs 2D QML Types
\ingroup qmlmodules
\modulestate Technical Preview
\brief QML types for the Qt Graphs 2D API.
@ -42,7 +43,6 @@
/*!
\group graphs_examples_3D
\ingroup all-examples-3D
\title Qt Graphs 3D Examples
\brief Examples for the Qt Graphs 3D.
@ -58,7 +58,6 @@
/*!
\group graphs_examples_2D
\ingroup all-examples-2D
\title Qt Graphs 2D Examples
\brief Examples for the Qt Graphs 2D.
@ -272,7 +271,7 @@
\endcode
has to be changed to:
\code
import QtGraphs3D
import QtGraphs
\endcode
for Qt Graphs.

2
src/graphs3d/doc/src/qtgraphs3d-qml-abstractdeclarative.qdoc
View File

@ -3,7 +3,7 @@
/*!
\qmltype AbstractGraph3D
\inqmlmodule QtGraphs3D
\inqmlmodule QtGraphs
\ingroup graphs_qml_3D
\brief Base type for 3D graphs.

2
src/graphs3d/doc/src/qtgraphs3d-qml-bars3d.qdoc
View File

@ -4,7 +4,7 @@
/*!
* \qmltype Bars3D
* \inherits AbstractGraph3D
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \brief 3D bar graph.
*

2
src/graphs3d/doc/src/qtgraphs3d-qml-scatter3d.qdoc
View File

@ -4,7 +4,7 @@
/*!
\qmltype Scatter3D
\inherits AbstractGraph3D
\inqmlmodule QtGraphs3D
\inqmlmodule QtGraphs
\ingroup graphs_qml_3D
\brief 3D scatter graph.

2
src/graphs3d/doc/src/qtgraphs3d-qml-surface3d.qdoc
View File

@ -4,7 +4,7 @@
/*!
\qmltype Surface3D
\inherits AbstractGraph3D
\inqmlmodule QtGraphs3D
\inqmlmodule QtGraphs
\ingroup graphs_qml_3D
\brief Describes the usage of the 3D surface graph.

2
src/graphs3d/engine/q3dbars.cpp
View File

@ -79,7 +79,7 @@ Q3DBars::Q3DBars()
: QAbstract3DGraph()
{
QQmlComponent *component = new QQmlComponent(engine(), this);
component->setData("import QtQuick; import QtGraphs3D; Bars3D { anchors.fill: parent; }", QUrl());
component->setData("import QtQuick; import QtGraphs; Bars3D { anchors.fill: parent; }", QUrl());
m_graphsItem.reset(qobject_cast<QQuickGraphsBars *>(component->create()));
setContent(component->url(), component, m_graphsItem.data());

2
src/graphs3d/engine/q3dscatter.cpp
View File

@ -65,7 +65,7 @@ Q3DScatter::Q3DScatter()
: QAbstract3DGraph()
{
QQmlComponent *component = new QQmlComponent(engine(), this);
component->setData("import QtQuick; import QtGraphs3D; Scatter3D { anchors.fill: parent; }",
component->setData("import QtQuick; import QtGraphs; Scatter3D { anchors.fill: parent; }",
QUrl());
m_graphsItem.reset(qobject_cast<QQuickGraphsScatter *>(component->create()));
setContent(component->url(), component, m_graphsItem.data());

2
src/graphs3d/engine/q3dscene.cpp
View File

@ -33,7 +33,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype Scene3D
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates Q3DScene
* \brief Scene3D type provides description of the 3D scene being visualized.

2
src/graphs3d/engine/q3dsurface.cpp
View File

@ -83,7 +83,7 @@ Q3DSurface::Q3DSurface()
: QAbstract3DGraph()
{
QQmlComponent *component = new QQmlComponent(engine(), this);
component->setData("import QtQuick; import QtGraphs3D; Surface3D { anchors.fill: parent; }",
component->setData("import QtQuick; import QtGraphs; Surface3D { anchors.fill: parent; }",
QUrl());
m_graphsItem.reset(qobject_cast<QQuickGraphsSurface *>(component->create()));
setContent(component->url(), component, m_graphsItem.data());

2
src/graphs3d/input/q3dinputhandler.cpp
View File

@ -56,7 +56,7 @@ static const float rotationSpeed = 100.0f;
/*!
* \qmltype InputHandler3D
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates Q3DInputHandler
* \brief Basic wheel mouse based input handler.

2
src/graphs3d/input/qabstract3dinputhandler.cpp
View File

@ -32,7 +32,7 @@ QT_BEGIN_NAMESPACE
/*!
* \qmltype AbstractInputHandler3D
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QAbstract3DInputHandler
* \brief Base type for all 3D graph input handlers.

2
src/graphs3d/input/qtouch3dinputhandler.cpp
View File

@ -58,7 +58,7 @@ static const float touchZoomDrift = 0.02f;
/*!
* \qmltype TouchInputHandler3D
* \inqmlmodule QtGraphs3D
* \inqmlmodule QtGraphs
* \ingroup graphs_qml_3D
* \instantiates QTouch3DInputHandler
* \inherits InputHandler3D

2
src/graphs3d/qml/designer/default/Bars3D.qml
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
import QtQuick 2.0
import QtGraphs3D
import QtGraphs
Bars3D {
width: 300

2
src/graphs3d/qml/designer/default/Scatter3D.qml
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
import QtQuick 2.0
import QtGraphs3D
import QtGraphs
Scatter3D {
width: 300

2
src/graphs3d/qml/designer/default/Surface3D.qml
View File

@ -2,7 +2,7 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
import QtQuick 2.0
import QtGraphs3D
import QtGraphs
Surface3D {
width: 300

12
src/graphs3d/qml/designer/qtgraphs.metainfo
View File

@ -1,6 +1,6 @@
MetaInfo {
Type {
name: "QtGraphs3D.Bars3D"
name: "QtGraphs.Bars3D"
icon: "images/bars3d-icon16.png"
ItemLibraryEntry {
@ -8,13 +8,13 @@ MetaInfo {
category: "Qt Graphs"
libraryIcon: "images/bars3d-icon.png"
version: "1.0"
requiredImport: "QtGraphs3D"
requiredImport: "QtGraphs"
QmlSource { source: "default/Bars3D.qml" }
}
}
Type {
name: "QtGraphs3D.Scatter3D"
name: "QtGraphs.Scatter3D"
icon: "images/scatter3d-icon16.png"
ItemLibraryEntry {
@ -22,13 +22,13 @@ MetaInfo {
category: "Qt Graphs"
libraryIcon: "images/scatter3d-icon.png"
version: "1.0"
requiredImport: "QtGraphs3D"
requiredImport: "QtGraphs"
QmlSource { source: "default/Scatter3D.qml" }
}
}
Type {
name: "QtGraphs3D.Surface3D"
name: "QtGraphs.Surface3D"
icon: "images/surface3d-icon16.png"
ItemLibraryEntry {
@ -36,7 +36,7 @@ MetaInfo {
category: "Qt Graphs"
libraryIcon: "images/surface3d-icon.png"
version: "1.0"
requiredImport: "QtGraphs3D"
requiredImport: "QtGraphs"
QmlSource { source: "default/Surface3D.qml" }
}

Some files were not shown because too many files have changed in this diff Show More