diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:47:32 +0100 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2016-12-12 12:23:04 +0200 |
| commit | 54910f8cf827d6f9474de9f6f88b3a158a058c56 (patch) | |
| tree | f8b425821436f02d099299799f794d26345e0d5a /src/datavisualization/engine/scatter3dcontroller.cpp | |
| parent | 470330e69b7ee34beb27ed905fcb923d9cfdae31 (diff) | |
| parent | 21c82c7e0db0a567c11ed80eac955d86ad0e1dff (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
tests/auto/cpptest/q3dscene/tst_scene.cpp
tests/auto/qmltest/scene3d/tst_scene.qml
Change-Id: I0aef5e7d8fe202e7f4c7565922938d1627ab8124
Diffstat (limited to 'src/datavisualization/engine/scatter3dcontroller.cpp')
| -rw-r--r-- | src/datavisualization/engine/scatter3dcontroller.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp index ee190196..6fc29b20 100644 --- a/src/datavisualization/engine/scatter3dcontroller.cpp +++ b/src/datavisualization/engine/scatter3dcontroller.cpp @@ -135,7 +135,12 @@ QList<QScatter3DSeries *> Scatter3DController::scatterSeriesList() void Scatter3DController::handleArrayReset() { - QScatter3DSeries *series = static_cast<QScatterDataProxy *>(sender())->series(); + QScatter3DSeries *series; + if (qobject_cast<QScatterDataProxy *>(sender())) + series = static_cast<QScatterDataProxy *>(sender())->series(); + else + series = static_cast<QScatter3DSeries *>(sender()); + if (series->isVisible()) { adjustAxisRanges(); m_isDataDirty = true; @@ -394,7 +399,7 @@ void Scatter3DController::adjustAxisRanges() if (scatterSeries->isVisible() && proxy) { QVector3D minLimits; QVector3D maxLimits; - proxy->dptrc()->limitValues(minLimits, maxLimits); + proxy->dptrc()->limitValues(minLimits, maxLimits, valueAxisX, valueAxisY, valueAxisZ); if (adjustX) { if (!series) { // First series initializes the values |