summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2/declarativebars_p.h
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-10-29 14:01:42 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-10-30 10:06:08 +0200
commit84c156d3e2fcceeab608f401fbc638f2d01219b3 (patch)
tree74de2de1635c60645f4864d08f6afb941948aea8 /src/datavisualizationqml2/declarativebars_p.h
parent233d5c02638903e96687d580ada7188f0e6a9756 (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/datavisualizationqml2/declarativebars_p.h')
-rw-r--r--src/datavisualizationqml2/declarativebars_p.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h
index dfbf9934..f71d9ad3 100644
--- a/src/datavisualizationqml2/declarativebars_p.h
+++ b/src/datavisualizationqml2/declarativebars_p.h
@@ -57,7 +57,7 @@ class DeclarativeBars : public AbstractDeclarative
Q_PROPERTY(bool barSpacingRelative READ isBarSpacingRelative WRITE setBarSpacingRelative)
Q_PROPERTY(bool barSmoothingEnabled READ isBarSmoothingEnabled WRITE setBarSmoothingEnabled)
Q_PROPERTY(QString meshFileName READ meshFileName WRITE setMeshFileName)
- Q_PROPERTY(QPointF selectedBarPos READ selectedBarPos WRITE setSelectedBarPos NOTIFY selectedBarPosChanged)
+ Q_PROPERTY(QPointF selectedBar READ selectedBar WRITE setSelectedBar NOTIFY selectedBarChanged)
Q_ENUMS(QtDataVisualization::QDataVis::MeshStyle)
public:
@@ -94,11 +94,11 @@ public:
void setMeshFileName(const QString &objFileName);
QString meshFileName() const;
- void setSelectedBarPos(const QPointF &position);
- QPointF selectedBarPos() const;
+ void setSelectedBar(const QPointF &position);
+ QPointF selectedBar() const;
signals:
- void selectedBarPosChanged(const QPointF &position);
+ void selectedBarChanged(const QPointF &position);
protected:
QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *);