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/q3dbars.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/q3dbars.h')
| -rw-r--r-- | src/datavisualization/engine/q3dbars.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/datavisualization/engine/q3dbars.h b/src/datavisualization/engine/q3dbars.h index d0ddf3fb..51c35257 100644 --- a/src/datavisualization/engine/q3dbars.h +++ b/src/datavisualization/engine/q3dbars.h @@ -35,7 +35,7 @@ class Q3DScene; class QT_DATAVISUALIZATION_EXPORT Q3DBars : 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::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged) Q_PROPERTY(qreal barThickness READ barThickness WRITE setBarThickness) @@ -45,14 +45,9 @@ class QT_DATAVISUALIZATION_EXPORT Q3DBars : public Q3DWindow Q_PROPERTY(QFont font READ font WRITE setFont) Q_PROPERTY(bool gridVisible READ isGridVisible WRITE setGridVisible) Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible) - Q_PROPERTY(QPoint selectedBarPos READ selectedBarPos WRITE setSelectedBarPos NOTIFY selectedBarPosChanged) + Q_PROPERTY(QPoint selectedBar READ selectedBar WRITE setSelectedBar NOTIFY selectedBarChanged) 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) - public: explicit Q3DBars(); ~Q3DBars(); @@ -76,8 +71,8 @@ public: void setMeshFileName(const QString &objFileName); QString meshFileName() const; - void setSelectionMode(QDataVis::SelectionMode mode); - QDataVis::SelectionMode selectionMode() const; + void setSelectionMode(QDataVis::SelectionFlags mode); + QDataVis::SelectionFlags selectionMode() const; void setFont(const QFont &font); QFont font() const; @@ -96,8 +91,8 @@ public: void setBackgroundVisible(bool visible); bool isBackgroundVisible() const; - void setSelectedBarPos(const QPoint &position); - QPoint selectedBarPos() const; + void setSelectedBar(const QPoint &position); + QPoint selectedBar() const; void setShadowQuality(QDataVis::ShadowQuality quality); QDataVis::ShadowQuality shadowQuality() const; @@ -120,7 +115,7 @@ public: signals: void shadowQualityChanged(QDataVis::ShadowQuality quality); - void selectedBarPosChanged(QPoint position); + void selectedBarChanged(QPoint position); protected: |