diff options
Diffstat (limited to 'sources/pyside6/PySide6/QtDataVisualization')
3 files changed, 196 insertions, 58 deletions
diff --git a/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt b/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt index d50ab1f6c..1276b424f 100644 --- a/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt @@ -1,5 +1,10 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + project(QtDataVisualization) +list(APPEND QtDataVisualization_src "${QtDataVisualization_SOURCE_DIR}/qtdatavisualization_helper.cpp") + set(QtDataVisualization_SRC ${QtDataVisualization_GEN_DIR}/qabstract3daxis_wrapper.cpp ${QtDataVisualization_GEN_DIR}/qcategory3daxis_wrapper.cpp @@ -49,10 +54,8 @@ set(QtDataVisualization_include_dirs ${QtDataVisualization_SOURCE_DIR} ${QtCore_GEN_DIR} ${QtGui_GEN_DIR}) -set(QtDataVisualization_libraries pyside6 - ${Qt${QT_MAJOR_VERSION}DataVisualization_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES}) +set(QtDataVisualization_libraries pyside6 + ${Qt${QT_MAJOR_VERSION}DataVisualization_LIBRARIES}) set(QtDataVisualization_deps QtCore QtGui) @@ -61,4 +64,8 @@ create_pyside_module(NAME QtDataVisualization LIBRARIES QtDataVisualization_libraries DEPS QtDataVisualization_deps TYPESYSTEM_PATH QtDataVisualization_SOURCE_DIR - SOURCES QtDataVisualization_SRC) + SOURCES QtDataVisualization_SRC + STATIC_SOURCES QtDataVisualization_src) + +install(FILES ${pyside6_SOURCE_DIR}/qtdatavisualization_helper.h + DESTINATION include/PySide6/QtDataVisualization) diff --git a/sources/pyside6/PySide6/QtDataVisualization/qtdatavisualization_helper.cpp b/sources/pyside6/PySide6/QtDataVisualization/qtdatavisualization_helper.cpp new file mode 100644 index 000000000..8ad31a77a --- /dev/null +++ b/sources/pyside6/PySide6/QtDataVisualization/qtdatavisualization_helper.cpp @@ -0,0 +1,97 @@ +// Copyright (C) 2022 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 "qtdatavisualization_helper.h" + +#include <sbknumpyview.h> + +#include <QtCore/QDebug> + +namespace QtDataVisualizationHelper { + +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) { + auto *row = new QSurfaceDataRow; + row->reserve(xSize); + result->append(row); + + double x = xStart; + auto *rowDataEnd = data + xSize; + for (auto *d = data; d < rowDataEnd; ++d) { + row->append(QSurfaceDataItem(QVector3D(x, *d, z))); + x += deltaX; + } + + data += zStride; + z += deltaZ; + } +} + +QSurfaceDataArray *surfaceDataFromNp(double xStart, double deltaX, double zStart, double deltaZ, + PyObject *pyData) +{ + static const char funcName[] = "QSurfaceDataProxy.resetArrayNp"; + + auto *result = new QSurfaceDataArray; + + 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 QtDataVisualizationHelper diff --git a/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml b/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml index 66f0784e8..70014e3dc 100644 --- a/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml +++ b/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml @@ -1,45 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 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.QtDataVisualization"> +<typesystem package="PySide6.QtDataVisualization" + namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE"> + + <extra-includes> + <include file-name="qtdatavisualization_helper.h" location="global"/> + </extra-includes> <load-typesystem name="templates/datavisualization_common.xml" generate="no" /> <load-typesystem name="QtGui/typesystem_gui.xml" generate="no" /> @@ -87,13 +56,50 @@ </object-type> <object-type name="QCategory3DAxis"/> <object-type name="QLogValue3DAxisFormatter"/> - <object-type name="QValue3DAxis"/> + <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"> + <inject-code class="native" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="qvalue3daxisformatter-friend"/> + <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> <modify-function signature="populateCopy(QValue3DAxisFormatter&)const"> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> </modify-function> + <!-- PYSIDE-2025: gridPositions(), labelPositions(), labelStrings() return + non-const-references to lists for modifications. Add setters for them. --> + <add-function signature="setGridPositions(const QList<float>&@grid_positions@)"> + <inject-documentation format="target" mode="append"> + Sets the normalized grid line positions to ``grid_positions``. + </inject-documentation> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="qvalue3daxisformatter-setgridpositions"/> + </add-function> + <add-function signature="setLabelPositions(const QList<float>&@label_positions@)"> + <inject-documentation format="target" mode="append"> + Sets the normalized label positions to ``label_positions``. + </inject-documentation> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="qvalue3daxisformatter-setlabelpositions"/> + </add-function> + <add-function signature="setLabelStrings(const QStringList&@label_strings@)"> + <inject-documentation format="target" mode="append"> + Sets the label strings to ``label_strings``. + </inject-documentation> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="qvalue3daxisformatter-setlabelstrings"/> + </add-function> </object-type> <object-type name="QAbstract3DSeries"> <enum-type name="Mesh"/> @@ -111,11 +117,17 @@ </object-type> <value-type name="QBarDataItem"/> <object-type name="QBarDataProxy"> - <modify-function signature="resetArray(QBarDataArray*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> + <modify-function signature="resetArray(QBarDataArray*)" remove="all"/> + <add-function signature="resetArray(const QBarDataArray&)"> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="dataproxy-resetarray"/> + </add-function> + <modify-function signature="resetArray(QBarDataArray*,const QStringList&,const QStringList&)" + remove="all"/> + <add-function signature="resetArray(const QBarDataArray&,const QStringList&,const QStringList&)"> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="dataproxy-resetarray2"/> + </add-function> <modify-function signature="resetArray(QBarDataArray*,const QStringList&,const QStringList&)"> <modify-argument index="1"> <parent index="this" action="add"/> @@ -215,11 +227,12 @@ </object-type> <value-type name="QScatterDataItem"/> <object-type name="QScatterDataProxy"> - <modify-function signature="resetArray(QList<QScatterDataItem>*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> + <modify-function signature="resetArray(QList<QScatterDataItem>*)" + remove="all"/> + <add-function signature="resetArray(QList<QScatterDataItem>*)"> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="scatterdataproxy-resetarray"/> + </add-function> <modify-function signature="addItem(const QScatterDataItem&)"> <modify-argument index="1"> <parent index="this" action="add"/> @@ -266,7 +279,10 @@ </object-type> <value-type name="QSurfaceDataItem"/> <object-type name="QSurfaceDataProxy"> - + <inject-code class="native" position="beginning"> + #include <sbknumpycheck.h> + #include <qtdatavisualization_helper.h> + </inject-code> <!-- PYSIDE-1438: Replace all add/set/insertRow() taking a 'QList*' by overloads taking 'const QList &' since an allocated list needs to be passed. --> <modify-function signature="addRow(QList<QSurfaceDataItem>*)" remove="all"/> @@ -287,11 +303,25 @@ snippet="dataproxy-setrow"/> </add-function> - <modify-function signature="resetArray(QSurfaceDataArray*)"> + <modify-function signature="resetArray(QSurfaceDataArray*)" remove="all"/> + <add-function signature="resetArray(const QSurfaceDataArray&)"> + <inject-code class="target" position="beginning" file="../glue/qtdatavisualization.cpp" + snippet="dataproxy-resetarray"/> <modify-argument index="1"> <parent index="this" action="add"/> </modify-argument> - </modify-function> + </add-function> + + <add-function signature="resetArrayNp(double@x@,double@deltaX@,double@z@,double@deltaZ@,PyArrayObject*@data@)"> + <inject-code file="../glue/qtdatavisualization.cpp" + snippet="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*)"> @@ -439,4 +469,8 @@ <extra-includes> <include file-name="qutils.h" location="global"/> </extra-includes> + + <!-- QtQml/QtNetwork are pulled in via QtDataVisualizationDepends. --> + <suppress-warning text="^Scoped enum 'Q(Ocsp)|(Dtls)|(Qml).*' does not have a type entry.*$"/> + </typesystem> |