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/scatter3drenderer_p.h | |
| 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/scatter3drenderer_p.h')
| -rw-r--r-- | src/datavisualization/engine/scatter3drenderer_p.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h index 350aa934..d21f56a0 100644 --- a/src/datavisualization/engine/scatter3drenderer_p.h +++ b/src/datavisualization/engine/scatter3drenderer_p.h @@ -93,6 +93,7 @@ private: GLfloat m_backgroundMargin; GLfloat m_maxItemSize; QVector<float> m_cachedItemSize; + int m_clickedIndex; public: explicit Scatter3DRenderer(Scatter3DController *controller); @@ -102,6 +103,9 @@ public: void updateData(); void updateScene(Q3DScene *scene); + inline int clickedIndex() const { return m_clickedIndex; } + void resetClickedStatus(); + void render(GLuint defaultFboHandle); protected: @@ -142,12 +146,9 @@ public slots: void updateSelectedItem(int index, const QScatter3DSeries *series); -signals: - void itemClicked(int index, QScatter3DSeries *series); - private: QVector3D indexToSelectionColor(GLint index); - void selectionColorToSeriesAndIndex(const QVector3D &color, int &index, QScatter3DSeries *&series); + void selectionColorToSeriesAndIndex(const QVector3D &color, int &index, QAbstract3DSeries *&series); }; QT_END_NAMESPACE_DATAVISUALIZATION |