diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-11 13:22:54 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-15 08:24:15 +0200 |
| commit | 999ffa01d20f75a457da62d41c0fabfc32e5e1bb (patch) | |
| tree | c5267f6831d5ff61444f85b2110f7150e20d3451 /src/datavisualizationqml2/declarativebars_p.h | |
| parent | bbb874d0591215164b2030db60dc9d6a95f4c8fe (diff) | |
Basic multiseries support
Task-number: QTRD-2548
Change-Id: Iba324c0e8be56f2b3f8f6c6a992883c134a51a9d
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualizationqml2/declarativebars_p.h')
| -rw-r--r-- | src/datavisualizationqml2/declarativebars_p.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h index f6d36632..c3808b7b 100644 --- a/src/datavisualizationqml2/declarativebars_p.h +++ b/src/datavisualizationqml2/declarativebars_p.h @@ -36,6 +36,7 @@ #include "q3dvalueaxis.h" #include "q3dcategoryaxis.h" #include "qbardataproxy.h" +#include "qbar3dseries.h" #include <QAbstractItemModel> #include <QQuickItem> @@ -47,7 +48,6 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE class DeclarativeBars : public AbstractDeclarative { Q_OBJECT - Q_PROPERTY(QBarDataProxy *dataProxy READ dataProxy WRITE setDataProxy) Q_PROPERTY(Q3DCategoryAxis *rowAxis READ rowAxis WRITE setRowAxis) Q_PROPERTY(Q3DValueAxis *valueAxis READ valueAxis WRITE setValueAxis) Q_PROPERTY(Q3DCategoryAxis *columnAxis READ columnAxis WRITE setColumnAxis) @@ -58,6 +58,7 @@ class DeclarativeBars : public AbstractDeclarative Q_PROPERTY(bool barSmoothingEnabled READ isBarSmoothingEnabled WRITE setBarSmoothingEnabled NOTIFY meshFileNameChanged) Q_PROPERTY(QString meshFileName READ meshFileName WRITE setMeshFileName NOTIFY meshFileNameChanged) Q_PROPERTY(QPointF selectedBar READ selectedBar WRITE setSelectedBar NOTIFY selectedBarChanged) + Q_PROPERTY(QQmlListProperty<QBar3DSeries> seriesList READ seriesList) public: explicit DeclarativeBars(QQuickItem *parent = 0); @@ -65,9 +66,6 @@ public: Q_INVOKABLE void setBarColor(const QColor &baseColor); // TODO property (or more likely as part of data set) - QBarDataProxy *dataProxy() const; - void setDataProxy(QBarDataProxy *dataProxy); - Q3DCategoryAxis *rowAxis() const; void setRowAxis(Q3DCategoryAxis *axis); Q3DValueAxis *valueAxis() const; @@ -96,6 +94,14 @@ public: void setSelectedBar(const QPointF &position); QPointF selectedBar() const; + QQmlListProperty<QBar3DSeries> seriesList(); + static void appendSeriesFunc(QQmlListProperty<QBar3DSeries> *list, QBar3DSeries *series); + static int countSeriesFunc(QQmlListProperty<QBar3DSeries> *list); + static QBar3DSeries *atSeriesFunc(QQmlListProperty<QBar3DSeries> *list, int index); + static void clearSeriesFunc(QQmlListProperty<QBar3DSeries> *list); + Q_INVOKABLE void addSeries(QBar3DSeries *series); + Q_INVOKABLE void removeSeries(QBar3DSeries *series); + signals: void selectedBarChanged(const QPointF &position); void barThicknessChanged(qreal thicknessRatio); |