diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-10-29 14:01:42 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-10-30 10:06:08 +0200 |
| commit | 84c156d3e2fcceeab608f401fbc638f2d01219b3 (patch) | |
| tree | 74de2de1635c60645f4864d08f6afb941948aea8 /src/datavisualization/engine/abstract3drenderer_p.h | |
| parent | 233d5c02638903e96687d580ada7188f0e6a9756 (diff) | |
Selection overhaul
Selection modes are now proper flags, so you can easily mix and match
item, row, and column modes as you wish. Slice flag means automatic
slicing control - if user wishes to control slicing himself, he should
not set this mode flag.
Clicking an item on graph now emits clicked signal from renderer to
controller on all graphs instead of setting the selected item.
Controller will set the selected item based on this information.
Task-number: QTRD-2366
Task-number: QTRD-2491
Change-Id: I6251c42e22ea676613fbd36685e33574e6eb9a1a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/abstract3drenderer_p.h')
| -rw-r--r-- | src/datavisualization/engine/abstract3drenderer_p.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index 1c61ac07..b3ee6eac 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -42,6 +42,9 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE +static const QVector3D selectionSkipColor = QVector3D(255.0f, 255.0f, 255.0f); // Selection texture's background color +static const QVector3D invalidColorVector = QVector3D(-1.0f, -1.0f, -1.0f); + class TextureHelper; class Theme; class Drawer; @@ -65,7 +68,7 @@ protected: QString m_cachedItemLabelFormat; QString m_cachedObjFile; - QDataVis::SelectionMode m_cachedSelectionMode; + QDataVis::SelectionFlags m_cachedSelectionMode; bool m_cachedIsGridEnabled; bool m_cachedIsBackgroundEnabled; @@ -76,6 +79,7 @@ protected: Q3DBox m_boundingBox; Q3DScene *m_cachedScene; + bool m_selectionDirty; #ifdef DISPLAY_RENDER_SPEED bool m_isFirstFrame; @@ -98,7 +102,7 @@ public: virtual void updateTheme(Theme theme); virtual void updateFont(const QFont &font); virtual void updateLabelStyle(QDataVis::LabelStyle style); - virtual void updateSelectionMode(QDataVis::SelectionMode newMode); + virtual void updateSelectionMode(QDataVis::SelectionFlags newMode); virtual void updateGridEnabled(bool enable); virtual void updateBackgroundEnabled(bool enable); virtual void updateMeshFileName(const QString &objFileName); |