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/q3dsurface.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/q3dsurface.h')
| -rw-r--r-- | src/datavisualization/engine/q3dsurface.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h index 1b572a36..c131f245 100644 --- a/src/datavisualization/engine/q3dsurface.h +++ b/src/datavisualization/engine/q3dsurface.h @@ -34,7 +34,7 @@ class QSurfaceDataProxy; class QT_DATAVISUALIZATION_EXPORT Q3DSurface : public Q3DWindow { Q_OBJECT - Q_PROPERTY(QtDataVisualization::QDataVis::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode) + Q_PROPERTY(QtDataVisualization::QDataVis::SelectionFlags selectionMode READ selectionMode WRITE setSelectionMode) Q_PROPERTY(QtDataVisualization::QDataVis::LabelStyle labelStyle READ labelStyle WRITE setLabelStyle) Q_PROPERTY(QtDataVisualization::QDataVis::Theme theme READ theme WRITE setTheme) Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality) @@ -45,10 +45,8 @@ class QT_DATAVISUALIZATION_EXPORT Q3DSurface : public Q3DWindow Q_PROPERTY(QLinearGradient gradient READ gradient WRITE setGradient) Q_PROPERTY(QFont font READ font WRITE setFont) Q_PROPERTY(Q3DScene* scene READ scene) - Q_ENUMS(QtDataVisualization::QDataVis::SelectionMode) - Q_ENUMS(QtDataVisualization::QDataVis::ShadowQuality) - Q_ENUMS(QtDataVisualization::QDataVis::LabelStyle) - Q_ENUMS(QtDataVisualization::QDataVis::CameraPreset) + Q_PROPERTY(QPoint selectedPoint READ selectedPoint WRITE setSelectedPoint NOTIFY selectedPointChanged) + public: explicit Q3DSurface(); @@ -69,8 +67,8 @@ public: void setSmoothSurfaceEnabled(bool enabled); bool isSmoothSurfaceEnabled() const; - void setSelectionMode(QDataVis::SelectionMode mode); - QDataVis::SelectionMode selectionMode() const; + void setSelectionMode(QDataVis::SelectionFlags mode); + QDataVis::SelectionFlags selectionMode() const; void setSurfaceGridEnabled(bool enabled); bool isSurfaceGridEnabled() const; @@ -101,9 +99,15 @@ public: Q3DScene *scene() const; + void setSelectedPoint(const QPoint &position); + QPoint selectedPoint() const; + void setLabelStyle(QDataVis::LabelStyle style); QDataVis::LabelStyle labelStyle() const; +signals: + void selectedPointChanged(QPoint position); + protected: void mouseDoubleClickEvent(QMouseEvent *event); void touchEvent(QTouchEvent *event); |