diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-10-04 12:06:57 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2024-02-28 16:52:41 +0100 |
| commit | bb35f031a9680be6f8cf92ddc8e2cc9f3e309612 (patch) | |
| tree | 171f3e32c4c247ab0383dbc45591071c2c0272fa /sources/pyside6/PySide6/QtGraphs/qtgraphs_helper.cpp | |
| parent | b08c24890d8c5c09ba7a25a69c8c3600dcca5dc3 (diff) | |
Adapt to QtGraphs changed API
Task-number: QTBUG-114091
Task-number: PYSIDE-2497
Change-Id: I62b6c50ea4cafd240ef75b2814849821f4eb2c3b
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside6/PySide6/QtGraphs/qtgraphs_helper.cpp')
| -rw-r--r-- | sources/pyside6/PySide6/QtGraphs/qtgraphs_helper.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sources/pyside6/PySide6/QtGraphs/qtgraphs_helper.cpp b/sources/pyside6/PySide6/QtGraphs/qtgraphs_helper.cpp index 05d6b00a3..19fe4f818 100644 --- a/sources/pyside6/PySide6/QtGraphs/qtgraphs_helper.cpp +++ b/sources/pyside6/PySide6/QtGraphs/qtgraphs_helper.cpp @@ -18,28 +18,28 @@ static void populateArray(double xStart, double deltaX, double zStart, double de 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); + 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))); + 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) +QSurfaceDataArray surfaceDataFromNp(double xStart, double deltaX, double zStart, double deltaZ, + PyObject *pyData) { static const char funcName[] = "QSurfaceDataProxy.resetArrayNp"; - auto *result = new QSurfaceDataArray; + QSurfaceDataArray result; auto view = Shiboken::Numpy::View::fromPyObject(pyData); if (!view) { @@ -59,35 +59,35 @@ QSurfaceDataArray *surfaceDataFromNp(double xStart, double deltaX, double zStart 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); + 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); + 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); + 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); + 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); + 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); + 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); + 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); + reinterpret_cast<const double *>(view.data), &result); break; } |