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/datavisualization/data/qbardataproxy.cpp | |
| 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/datavisualization/data/qbardataproxy.cpp')
| -rw-r--r-- | src/datavisualization/data/qbardataproxy.cpp | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp index 13517b4b..26c3a36a 100644 --- a/src/datavisualization/data/qbardataproxy.cpp +++ b/src/datavisualization/data/qbardataproxy.cpp @@ -18,6 +18,7 @@ #include "qbardataproxy.h" #include "qbardataproxy_p.h" +#include "qbar3dseries_p.h" QT_DATAVISUALIZATION_BEGIN_NAMESPACE @@ -110,6 +111,12 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE */ /*! + * \qmlproperty Bar3DSeries BarDataProxy::series + * + * The series this proxy is attached to. + */ + +/*! * Constructs QBarDataProxy with the given \a parent. */ QBarDataProxy::QBarDataProxy(QObject *parent) : @@ -133,6 +140,16 @@ QBarDataProxy::~QBarDataProxy() } /*! + * \property QBarDataProxy::series + * + * The series this proxy is attached to. + */ +QBar3DSeries *QBarDataProxy::series() +{ + return static_cast<QBar3DSeries *>(d_ptr->series()); +} + +/*! * Clears the existing array and row and column labels. */ void QBarDataProxy::resetArray() @@ -482,7 +499,6 @@ QBarDataProxyPrivate::QBarDataProxyPrivate(QBarDataProxy *q) : QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeBar), m_dataArray(new QBarDataArray) { - m_itemLabelFormat = QStringLiteral("@valueTitle: @valueLabel"); } QBarDataProxyPrivate::~QBarDataProxyPrivate() @@ -704,4 +720,11 @@ QPair<GLfloat, GLfloat> QBarDataProxyPrivate::limitValues(int startRow, int endR return limits; } +void QBarDataProxyPrivate::setSeries(QAbstract3DSeries *series) +{ + QAbstractDataProxyPrivate::setSeries(series); + QBar3DSeries *barSeries = static_cast<QBar3DSeries *>(series); + emit qptr()->seriesChanged(barSeries); +} + QT_DATAVISUALIZATION_END_NAMESPACE |