Fix screen position based queries in threaded rendering environment

QtQuick's threaded renderer doesn't seem to always pair up sync and
render (or more accurately, beforeSynchronizing and node's
preprocess calls). Sometimes sync comes without a followup render,
or there are two syncs in a row, even though the sync is using
direct connection. Both of these cases broke the old
logic for handling position based queries.

Changed the logic to actually ensure we have resolved the query
before emitting the relevant signal.

Task-number: QTRD-3358
Change-Id: Ica6c8c311f53a06311c21532aaabc18c28556655
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h
index 4833afaa..d8ca7696 100644
--- a/src/datavisualization/engine/abstract3drenderer_p.h
+++ b/src/datavisualization/engine/abstract3drenderer_p.h
@@ -148,13 +148,15 @@ public:
     void generateBaseColorTexture(const QColor &color, GLuint *texture);
     void fixGradientAndGenerateTexture(QLinearGradient *gradient, GLuint *gradientTexture);
 
-    inline bool isClickPending() { return m_clickPending; }
-    inline void clearClickPending() { m_clickPending = false; }
+    inline bool isClickQueryResolved() const { return m_clickResolved; }
+    inline void clearClickQueryResolved() { m_clickResolved = false; }
+    inline QPoint cachedClickQuery() const { return m_cachedScene->selectionQueryPosition(); }
     inline QAbstract3DSeries *clickedSeries() const { return m_clickedSeries; }
     inline QAbstract3DGraph::ElementType clickedType() { return m_clickedType; }
-    inline bool isGraphPositionQueryPending() { return m_graphPositionQueryPending; }
-    inline void clearGraphPositionQueryPending() { m_graphPositionQueryPending = false; }
+    inline bool isGraphPositionQueryResolved() const { return m_graphPositionQueryResolved; }
+    inline void clearGraphPositionQueryResolved() { m_graphPositionQueryResolved = false; }
     inline QVector3D queriedGraphPosition() const { return m_queriedGraphPosition; }
+    inline QPoint cachedGraphPositionQuery() const { return m_cachedScene->graphPositionQuery(); }
 
     LabelItem &selectionLabelItem();
     void setSelectionLabel(const QString &label);
@@ -253,8 +255,9 @@ protected:
     QRect m_secondarySubViewport;
     float m_devicePixelRatio;
     bool m_selectionLabelDirty;
-    bool m_clickPending;
+    bool m_clickResolved;
     bool m_graphPositionQueryPending;
+    bool m_graphPositionQueryResolved;
     QAbstract3DSeries *m_clickedSeries;
     QAbstract3DGraph::ElementType m_clickedType;
     int m_selectedLabelIndex;