diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-16 14:26:22 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-17 07:48:24 +0200 |
| commit | 2c9963be44c00e7299401e248bc94ef191e0af68 (patch) | |
| tree | 97f2fdb8b2b5ea3f04ac9d3248e4d430ee1b5a2a /src/datavisualization/engine/abstract3drenderer.cpp | |
| parent | 8674307d6bafabfcaedfe175b883313f0e7d88b9 (diff) | |
Synchronize clicked detection properly
Implements item 2) in QTRD-2645
Task-number: QTRD-2645
Change-Id: I8b4b3a63eeeba3ba34b6865543380022a6d732ed
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/abstract3drenderer.cpp')
| -rw-r--r-- | src/datavisualization/engine/abstract3drenderer.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp index 6e286095..29262f41 100644 --- a/src/datavisualization/engine/abstract3drenderer.cpp +++ b/src/datavisualization/engine/abstract3drenderer.cpp @@ -46,11 +46,14 @@ Abstract3DRenderer::Abstract3DRenderer(Abstract3DController *controller) m_cachedScene(new Q3DScene()), m_selectionDirty(true), m_selectionState(SelectNone), - m_devicePixelRatio(1.0f) - #ifdef DISPLAY_RENDER_SPEED + m_devicePixelRatio(1.0f), + m_selectionLabelDirty(true), + m_clickPending(false), + m_clickedSeries(0) +#ifdef DISPLAY_RENDER_SPEED , m_isFirstFrame(true), m_numFrames(0) - #endif +#endif { QObject::connect(m_drawer, &Drawer::drawerChanged, this, &Abstract3DRenderer::updateTextures); @@ -207,6 +210,7 @@ void Abstract3DRenderer::updateScene(Q3DScene *scene) } else { // Selections are one-shot, reset selection active to false before processing scene->setSelectionQueryPosition(Q3DScene::invalidSelectionPoint()); + m_clickPending = true; if (scene->isSlicingActive()) { if (scene->isPointInPrimarySubView(logicalPixelPosition)) |