diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-09-16 10:27:06 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-09-16 10:30:11 +0300 |
commit | 7805902c5b056f94a8f8302eebf7da180bffe0b4 (patch) | |
tree | 96fcd25984a91533d4213113210b967b294565a8 /src/datavisualization/engine | |
parent | ce6aff50ecd1445d148c1bbb9f712d6bfb77a78e (diff) |
Fix to slice crash bug fix
Task-number: QTRD-3301
Change-Id: Ia0ae6d5e3ac9aabc9af9199df27bbbe7f7908d60
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine')
-rw-r--r-- | src/datavisualization/engine/bars3drenderer.cpp | 7 | ||||
-rw-r--r-- | src/datavisualization/engine/q3dscene.cpp | 11 | ||||
-rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 7 |
3 files changed, 16 insertions, 9 deletions
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index da774239..1f395422 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -456,8 +456,11 @@ void Bars3DRenderer::render(GLuint defaultFboHandle) void Bars3DRenderer::drawSlicedScene() { - if (!m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionSlice)) { - qWarning("Selection mode QAbstract3DGraph::SelectionSlice not set. It must be set before calling setSlicingActive(true)."); + if (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionRow) + == m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionColumn)) { + qWarning("Invalid selection mode. Either QAbstract3DGraph::SelectionRow or" + " QAbstract3DGraph::SelectionColumn must be set before calling" + " setSlicingActive(true)."); return; } diff --git a/src/datavisualization/engine/q3dscene.cpp b/src/datavisualization/engine/q3dscene.cpp index 081868ef..08721b97 100644 --- a/src/datavisualization/engine/q3dscene.cpp +++ b/src/datavisualization/engine/q3dscene.cpp @@ -99,9 +99,10 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION * \qmlproperty bool Scene3D::slicingActive * * This property contains whether 2D slicing view is currently active or not. If setting it, you - * must make sure AbstractGraph3D::selectionMode has - * \l{QAbstract3DGraph::SelectionSlice}{AbstractGraph3D.SelectionSlice} flag set in conjunction - * with either row or column selection mode, and there is a valid selection. + * must make sure AbstractGraph3D::selectionMode has either + * \l{QAbstract3DGraph::SelectionRow}{AbstractGraph3D.SelectionRow} or + * \l{QAbstract3DGraph::SelectionColumn}{AbstractGraph3D.SelectionColumn} flag set, and there is a + * valid selection. * \note Not all visualizations support the 2D slicing view. */ @@ -295,8 +296,8 @@ QPoint Q3DScene::invalidSelectionPoint() * \property Q3DScene::slicingActive * * This property contains whether 2D slicing view is currently active or not. If setting it, you - * must make sure QAbstract3DGraph::selectionMode has QAbstract3DGraph::SelectionSlice flag set - * in conjunction with either row or column selection mode, and there is a valid selection. + * must make sure QAbstract3DGraph::selectionMode has either QAbstract3DGraph::SelectionRow or + * QAbstract3DGraph::SelectionColumn flag set, and there is a valid selection. * \note Not all visualizations support the 2D slicing view. */ bool Q3DScene::isSlicingActive() const diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index 19ae0de4..9bee6b30 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -782,8 +782,11 @@ void Surface3DRenderer::render(GLuint defaultFboHandle) void Surface3DRenderer::drawSlicedScene() { - if (!m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionSlice)) { - qWarning("Selection mode QAbstract3DGraph::SelectionSlice not set. It must be set before calling setSlicingActive(true)."); + if (m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionRow) + == m_cachedSelectionMode.testFlag(QAbstract3DGraph::SelectionColumn)) { + qWarning("Invalid selection mode. Either QAbstract3DGraph::SelectionRow or" + " QAbstract3DGraph::SelectionColumn must be set before calling" + " setSlicingActive(true)."); return; } |