diff options
Diffstat (limited to 'sources/pyside6/PySide6/QtGraphs')
| -rw-r--r-- | sources/pyside6/PySide6/QtGraphs/CMakeLists.txt | 100 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtGraphs/qtgraphs_helper.cpp | 97 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtGraphs/typesystem_graphs.xml | 303 |
3 files changed, 500 insertions, 0 deletions
diff --git a/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt b/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt new file mode 100644 index 000000000..59cef220b --- /dev/null +++ b/sources/pyside6/PySide6/QtGraphs/CMakeLists.txt @@ -0,0 +1,100 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +project(QtGraphs) + +set(QtGraphs_DROPPED_ENTRIES) + +list(APPEND QtGraphs_src "${QtGraphs_SOURCE_DIR}/qtgraphs_helper.cpp") + +set(QtGraphs_SRC +# 3D +${QtGraphs_GEN_DIR}/qabstract3daxis_wrapper.cpp +${QtGraphs_GEN_DIR}/qcategory3daxis_wrapper.cpp +${QtGraphs_GEN_DIR}/qlogvalue3daxisformatter_wrapper.cpp +${QtGraphs_GEN_DIR}/qvalue3daxis_wrapper.cpp +${QtGraphs_GEN_DIR}/qvalue3daxisformatter_wrapper.cpp +${QtGraphs_GEN_DIR}/qabstract3dseries_wrapper.cpp +${QtGraphs_GEN_DIR}/qabstractdataproxy_wrapper.cpp +${QtGraphs_GEN_DIR}/qbar3dseries_wrapper.cpp +${QtGraphs_GEN_DIR}/qbardataitem_wrapper.cpp +${QtGraphs_GEN_DIR}/qbardataproxy_wrapper.cpp +${QtGraphs_GEN_DIR}/qcustom3ditem_wrapper.cpp +${QtGraphs_GEN_DIR}/qcustom3dlabel_wrapper.cpp +${QtGraphs_GEN_DIR}/qcustom3dvolume_wrapper.cpp +${QtGraphs_GEN_DIR}/qheightmapsurfacedataproxy_wrapper.cpp +${QtGraphs_GEN_DIR}/qitemmodelbardataproxy_wrapper.cpp +${QtGraphs_GEN_DIR}/qitemmodelscatterdataproxy_wrapper.cpp +${QtGraphs_GEN_DIR}/qitemmodelsurfacedataproxy_wrapper.cpp +${QtGraphs_GEN_DIR}/qscatter3dseries_wrapper.cpp +${QtGraphs_GEN_DIR}/qscatterdataitem_wrapper.cpp +${QtGraphs_GEN_DIR}/qscatterdataproxy_wrapper.cpp +${QtGraphs_GEN_DIR}/qsurface3dseries_wrapper.cpp +${QtGraphs_GEN_DIR}/qsurfacedataitem_wrapper.cpp +${QtGraphs_GEN_DIR}/qsurfacedataproxy_wrapper.cpp +${QtGraphs_GEN_DIR}/q3dbars_wrapper.cpp +${QtGraphs_GEN_DIR}/q3dscatter_wrapper.cpp +${QtGraphs_GEN_DIR}/q3dscene_wrapper.cpp +${QtGraphs_GEN_DIR}/q3dsurface_wrapper.cpp +${QtGraphs_GEN_DIR}/qabstract3dgraph_wrapper.cpp +${QtGraphs_GEN_DIR}/q3dinputhandler_wrapper.cpp +${QtGraphs_GEN_DIR}/qabstract3dinputhandler_wrapper.cpp +${QtGraphs_GEN_DIR}/qtouch3dinputhandler_wrapper.cpp +${QtGraphs_GEN_DIR}/q3dtheme_wrapper.cpp +# 2D +${QtGraphs_GEN_DIR}/qbarcategoryaxis_wrapper.cpp +${QtGraphs_GEN_DIR}/qabstractaxis_wrapper.cpp +${QtGraphs_GEN_DIR}/qvalueaxis_wrapper.cpp +${QtGraphs_GEN_DIR}/qabstractbarseries_wrapper.cpp +${QtGraphs_GEN_DIR}/qbarseries_wrapper.cpp +${QtGraphs_GEN_DIR}/qbarset_wrapper.cpp +${QtGraphs_GEN_DIR}/qlineseries_wrapper.cpp +${QtGraphs_GEN_DIR}/qabstractseries_wrapper.cpp +${QtGraphs_GEN_DIR}/qscatterseries_wrapper.cpp +${QtGraphs_GEN_DIR}/qgraphtheme_wrapper.cpp +${QtGraphs_GEN_DIR}/qseriestheme_wrapper.cpp +${QtGraphs_GEN_DIR}/qxyseries_wrapper.cpp +# module is always needed +${QtGraphs_GEN_DIR}/qtgraphs_module_wrapper.cpp +) + +set(QtGraphs_include_dirs ${QtGraphs_SOURCE_DIR} + ${QtGraphs_BINARY_DIR} + ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} + ${Qt${QT_MAJOR_VERSION}QtNetwork_INCLUDE_DIRS} + ${Qt${QT_MAJOR_VERSION}Gui_INCLUDE_DIRS} + ${Qt${QT_MAJOR_VERSION}Widgets_INCLUDE_DIRS} + ${Qt${QT_MAJOR_VERSION}Qml_INCLUDE_DIRS} + ${Qt${QT_MAJOR_VERSION}Quick_INCLUDE_DIRS} + ${Qt${QT_MAJOR_VERSION}QuickWidgets_INCLUDE_DIRS} + ${Qt${QT_MAJOR_VERSION}Graphs_INCLUDE_DIRS} + ${Qt${QT_MAJOR_VERSION}Quick3D_INCLUDE_DIRS} + ${libpyside_SOURCE_DIR} + ${QtCore_GEN_DIR} + ${QtNetwork_GEN_DIR} + ${QtGui_GEN_DIR} + ${QtWidgets_GEN_DIR} + ${QtQml_GEN_DIR} + ${QtQuick_GEN_DIR} + ${QtQuickWidgets_GEN_DIR} + ${QtQuick3D_GEN_DIR}) + +set(QtGraphs_libraries pyside6 + ${Qt${QT_MAJOR_VERSION}Graphs_LIBRARIES}) + +set(QtGraphs_deps QtCore QtNetwork QtGui QtWidgets QtQml QtQuick QtQuickWidgets QtQuick3D) + +check_qt_opengl("Graphs" QtGraphs_include_dirs QtGraphs_deps + QtGraphs_DROPPED_ENTRIES) + +create_pyside_module(NAME QtGraphs + INCLUDE_DIRS QtGraphs_include_dirs + LIBRARIES QtGraphs_libraries + DEPS QtGraphs_deps + TYPESYSTEM_PATH QtGraphs_SOURCE_DIR + SOURCES QtGraphs_SRC + STATIC_SOURCES QtGraphs_src + DROPPED_ENTRIES QtGraphs_DROPPED_ENTRIES) + +install(FILES ${pyside6_SOURCE_DIR}/qtgraphs_helper.h + DESTINATION include/PySide6/QtGraphs) diff --git a/sources/pyside6/PySide6/QtGraphs/qtgraphs_helper.cpp b/sources/pyside6/PySide6/QtGraphs/qtgraphs_helper.cpp new file mode 100644 index 000000000..19fe4f818 --- /dev/null +++ b/sources/pyside6/PySide6/QtGraphs/qtgraphs_helper.cpp @@ -0,0 +1,97 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +#include "qtgraphs_helper.h" + +#include <sbknumpyview.h> + +#include <QtCore/QDebug> + +namespace QtGraphsHelper { + +template <class T> +static void populateArray(double xStart, double deltaX, double zStart, double deltaZ, + qsizetype xSize, qsizetype zSize, qsizetype zStrideBytes, + const T *data, QSurfaceDataArray *result) +{ + result->reserve(zSize); + const qsizetype zStride = zStrideBytes / sizeof(T); + double z = zStart; + for (qsizetype zi = 0; zi < zSize; ++zi) { + QSurfaceDataRow row; + row.reserve(xSize); + + double x = xStart; + auto *rowDataEnd = data + xSize; + for (auto *d = data; d < rowDataEnd; ++d) { + row.append(QSurfaceDataItem(QVector3D(x, *d, z))); + x += deltaX; + } + result->append(row); + + data += zStride; + z += deltaZ; + } +} + +QSurfaceDataArray surfaceDataFromNp(double xStart, double deltaX, double zStart, double deltaZ, + PyObject *pyData) +{ + static const char funcName[] = "QSurfaceDataProxy.resetArrayNp"; + + QSurfaceDataArray result; + + auto view = Shiboken::Numpy::View::fromPyObject(pyData); + if (!view) { + PyErr_Format(PyExc_TypeError, "Invalid array passed to %s", funcName); + return result; + } + if (view.ndim != 2) { + PyErr_Format(PyExc_TypeError, "%s expects a 2 dimensional array (%d)", view.ndim); + return result; + } + + const qsizetype zSize = view.dimensions[0]; + const qsizetype xSize = view.dimensions[1]; + if (zSize == 0 || xSize == 0) + return result; + + switch (view.type) { + case Shiboken::Numpy::View::Int16: + populateArray(xStart, deltaX, zStart, deltaZ, xSize, zSize, view.stride[0], + reinterpret_cast<const int16_t *>(view.data), &result); + break; + case Shiboken::Numpy::View::Unsigned16: + populateArray(xStart, deltaX, zStart, deltaZ, xSize, zSize, view.stride[0], + reinterpret_cast<const uint16_t *>(view.data), &result); + break; + case Shiboken::Numpy::View::Int: + populateArray(xStart, deltaX, zStart, deltaZ, xSize, zSize, view.stride[0], + reinterpret_cast<const int *>(view.data), &result); + break; + case Shiboken::Numpy::View::Unsigned: + populateArray(xStart, deltaX, zStart, deltaZ, xSize, zSize, view.stride[0], + reinterpret_cast<const unsigned *>(view.data), &result); + break; + case Shiboken::Numpy::View::Int64: + populateArray(xStart, deltaX, zStart, deltaZ, xSize, zSize, view.stride[0], + reinterpret_cast<const int64_t *>(view.data), &result); + break; + case Shiboken::Numpy::View::Unsigned64: + populateArray(xStart, deltaX, zStart, deltaZ, xSize, zSize, view.stride[0], + reinterpret_cast<const uint64_t *>(view.data), &result); + break; + case Shiboken::Numpy::View::Float: + populateArray(xStart, deltaX, zStart, deltaZ, xSize, zSize, view.stride[0], + reinterpret_cast<const float *>(view.data), &result); + break; + case Shiboken::Numpy::View::Double: + populateArray(xStart, deltaX, zStart, deltaZ, xSize, zSize, view.stride[0], + reinterpret_cast<const double *>(view.data), &result); + + break; + } + return result; +} + +} // namespace QtGraphsHelper diff --git a/sources/pyside6/PySide6/QtGraphs/typesystem_graphs.xml b/sources/pyside6/PySide6/QtGraphs/typesystem_graphs.xml new file mode 100644 index 000000000..43e4458be --- /dev/null +++ b/sources/pyside6/PySide6/QtGraphs/typesystem_graphs.xml @@ -0,0 +1,303 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +--> +<typesystem package="PySide6.QtGraphs" + namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE"> + + <extra-includes> + <include file-name="qtgraphs_helper.h" location="global"/> + </extra-includes> + + <load-typesystem name="templates/datavisualization_common.xml" generate="no" /> + <load-typesystem name="QtQuickWidgets/typesystem_quickwidgets.xml" generate="no" /> + + <function signature="qDefaultSurfaceFormat(bool)"/> + + + <object-type name="QAbstract3DAxis"> + <enum-type name="AxisOrientation"/> + <enum-type name="AxisType"/> + </object-type> + <object-type name="QCategory3DAxis"/> + <object-type name="QLogValue3DAxisFormatter"/> + <object-type name="QValue3DAxis"> + <modify-function signature="setFormatter(QValue3DAxisFormatter *)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <object-type name="QValue3DAxisFormatter"> + <modify-function signature="createNewInstance() const"> + <modify-argument index="return"> + <define-ownership class="native" owner="c++"/> + <define-ownership class="target" owner="default"/> + </modify-argument> + </modify-function> + </object-type> + <object-type name="QAbstract3DSeries"> + <enum-type name="Mesh"/> + <enum-type name="SeriesType"/> + </object-type> + <object-type name="QAbstractDataProxy"> + <enum-type name="DataType"/> + </object-type> + <object-type name="QBar3DSeries"> + <modify-function signature="setDataProxy(QBarDataProxy*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <value-type name="QBarDataItem"/> + <object-type name="QBarDataProxy"> + </object-type> + <object-type name="QCustom3DItem"/> + <object-type name="QCustom3DLabel"/> + <object-type name="QCustom3DVolume"> + <modify-function signature="setTextureData(QList<uchar>*)" remove="all"/> + <add-function signature="setTextureData(const QList<uchar>&)"> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="qcustom3dvolume-settexturedata"/> + </add-function> + </object-type> + <object-type name="QHeightMapSurfaceDataProxy"/> + <object-type name="QItemModelBarDataProxy"> + <enum-type name="MultiMatchBehavior"/> + </object-type> + <object-type name="QItemModelScatterDataProxy"/> + <object-type name="QItemModelSurfaceDataProxy"> + <enum-type name="MultiMatchBehavior"/> + </object-type> + <object-type name="QScatter3DSeries"> + <modify-function signature="setDataProxy(QScatterDataProxy*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <value-type name="QScatterDataItem"/> + <object-type name="QScatterDataProxy"> + </object-type> + <object-type name="QSurface3DSeries"> + <enum-type name="DrawFlag" flags="DrawFlags"/> + <modify-function signature="QSurface3DSeries(QSurfaceDataProxy*,QObject*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setDataProxy(QSurfaceDataProxy*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <value-type name="QSurfaceDataItem"/> + <object-type name="QSurfaceDataProxy"> + <inject-code class="native" position="beginning"> + #include <sbknumpycheck.h> + #include <qtgraphs_helper.h> + </inject-code> + <add-function signature="resetArrayNp(double@x@,double@deltaX@,double@z@,double@deltaZ@,PyArrayObject*@data@)"> + <inject-code file="../glue/qtgraphs.cpp" + snippet="graphs-qsurfacedataproxy-resetarraynp"/> + <inject-documentation format="target" mode="append"> + Populates the data from a 2 dimensional numpy array containing the y + values for a range starting a ``x``, ``z`` with steps of ``deltaX``, + ``deltaZ``, respectively. + </inject-documentation> + </add-function> + + </object-type> + <object-type name="Q3DBars"> + <modify-function signature="addAxis(QAbstract3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="releaseAxis(QAbstract3DAxis*)"> + <modify-argument index="1"> + <reference-count action="set"/> + </modify-argument> + <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> + </modify-function> + <modify-function signature="setColumnAxis(QCategory3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setRowAxis(QCategory3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <object-type name="Q3DScatter"> + <modify-function signature="addAxis(QValue3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="releaseAxis(QValue3DAxis*)"> + <modify-argument index="1"> + <reference-count action="set"/> + </modify-argument> + <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> + </modify-function> + <modify-function signature="setAxisX(QValue3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setAxisY(QValue3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setAxisZ(QValue3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <object-type name="Q3DScene"/> + <object-type name="Q3DSurface"> + <modify-function signature="addAxis(QValue3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="releaseAxis(QValue3DAxis*)"> + <modify-argument index="1"> + <reference-count action="set"/> + </modify-argument> + <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> + </modify-function> + <modify-function signature="setAxisX(QValue3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setAxisY(QValue3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setAxisZ(QValue3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <object-type name="QAbstract3DGraph"> + <enum-type name="ElementType"/> + <enum-type name="OptimizationHint" flags="OptimizationHints"/> + <enum-type name="RenderingMode"/> + <enum-type name="SelectionFlag" flags="SelectionFlags"/> + <enum-type name="ShadowQuality"/> + <enum-type name="CameraPreset" since="6.7"/> + <modify-function signature="addCustomItem(QCustom3DItem*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="addInputHandler(QAbstract3DInputHandler*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="addTheme(Q3DTheme*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="releaseCustomItem(QCustom3DItem*)"> + <modify-argument index="1"> + <reference-count action="set"/> + </modify-argument> + <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> + </modify-function> + <modify-function signature="releaseInputHandler(QAbstract3DInputHandler*)"> + <modify-argument index="1"> + <reference-count action="set"/> + </modify-argument> + <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> + </modify-function> + <modify-function signature="releaseTheme(Q3DTheme*)"> + <modify-argument index="1"> + <reference-count action="set"/> + </modify-argument> + <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> + </modify-function> + <modify-function signature="setActiveInputHandler(QAbstract3DInputHandler*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setActiveTheme(Q3DTheme*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <object-type name="Q3DInputHandler"/> + <object-type name="QAbstract3DInputHandler"> + <enum-type name="InputView"/> + </object-type> + <object-type name="QTouch3DInputHandler"/> + <object-type name="Q3DTheme"> + <enum-type name="ColorStyle"/> + <enum-type name="Theme"/> + </object-type> + + <!-- 2D --> + <object-type name="QBarCategoryAxis"/> + <object-type name="QAbstractAxis"> + <enum-type name="AxisType"/> + </object-type> + <object-type name="QValueAxis"/> + <object-type name="QAbstractBarSeries"> + <enum-type name="LabelsPosition"/> + <modify-function signature="append(QBarSet*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="append(QList<QBarSet*>)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="insert(int,QBarSet*)"> + <modify-argument index="2"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="take(QBarSet*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <object-type name="QBarSeries"/> + <object-type name="QBarSet"/> + <object-type name="QLineSeries"/> + <object-type name="QAbstractSeries"> + <enum-type name="SeriesType"/> + </object-type> + <object-type name="QScatterSeries"/> + <object-type name="QGraphTheme"> + <enum-type name="ColorTheme"/> + </object-type> + <object-type name="QSeriesTheme"> + <enum-type name="SeriesColorTheme"/> + </object-type> + <object-type name="QXYSeries"> + </object-type> + + <extra-includes> + <include file-name="qutils.h" location="global"/> + </extra-includes> +</typesystem> |