diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-05-09 16:05:57 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-05-13 10:57:49 +0200 |
| commit | 7f43e62608541f797cfefc036d913eb4e246e1b8 (patch) | |
| tree | 6865c12d1a80b037e20139a0b742135b16f4965c /sources/pyside6/PySide6/QtDataVisualization/qtdatavisualization_helper.cpp | |
| parent | 9ba60057a22693242dab3b3edc6ba1240561e6da (diff) | |
Move numpyview from libpyside into libshiboken
libpyside then no longer depends on numpy. There is only one place
left where numpy is initialized, allowing for dynamic loading.
Task-number: PYSIDE-1924
Change-Id: I50d02814f8cc6eb85d8cdb5330cfff3b586656ad
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/PySide6/QtDataVisualization/qtdatavisualization_helper.cpp')
| -rw-r--r-- | sources/pyside6/PySide6/QtDataVisualization/qtdatavisualization_helper.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sources/pyside6/PySide6/QtDataVisualization/qtdatavisualization_helper.cpp b/sources/pyside6/PySide6/QtDataVisualization/qtdatavisualization_helper.cpp index 3687f2d3e..4d9121032 100644 --- a/sources/pyside6/PySide6/QtDataVisualization/qtdatavisualization_helper.cpp +++ b/sources/pyside6/PySide6/QtDataVisualization/qtdatavisualization_helper.cpp @@ -39,7 +39,7 @@ #include "qtdatavisualization_helper.h" -#include <pyside_numpy.h> +#include <sbknumpyview.h> #include <QtCore/QDebug> @@ -77,7 +77,7 @@ QSurfaceDataArray *surfaceDataFromNp(double xStart, double deltaX, double zStart auto *result = new QSurfaceDataArray; - PySide::Numpy::View view = PySide::Numpy::View::fromPyObject(pyData); + auto view = Shiboken::Numpy::View::fromPyObject(pyData); if (!view) { PyErr_Format(PyExc_TypeError, "Invalid array passed to %s", funcName); return result; @@ -93,19 +93,19 @@ QSurfaceDataArray *surfaceDataFromNp(double xStart, double deltaX, double zStart return result; switch (view.type) { - case PySide::Numpy::View::Int: + case Shiboken::Numpy::View::Int: populateArray(xStart, deltaX, zStart, deltaZ, xSize, zSize, view.stride[0], reinterpret_cast<const int *>(view.data), result); break; - case PySide::Numpy::View::Unsigned: + case Shiboken::Numpy::View::Unsigned: populateArray(xStart, deltaX, zStart, deltaZ, xSize, zSize, view.stride[0], reinterpret_cast<const unsigned *>(view.data), result); break; - case PySide::Numpy::View::Float: + case Shiboken::Numpy::View::Float: populateArray(xStart, deltaX, zStart, deltaZ, xSize, zSize, view.stride[0], reinterpret_cast<const float *>(view.data), result); break; - case PySide::Numpy::View::Double: + case Shiboken::Numpy::View::Double: populateArray(xStart, deltaX, zStart, deltaZ, xSize, zSize, view.stride[0], reinterpret_cast<const double *>(view.data), result); |