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/qscatterdataproxy.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/qscatterdataproxy.cpp')
| -rw-r--r-- | src/datavisualization/data/qscatterdataproxy.cpp | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp index 85cbb4eb..149cb1ae 100644 --- a/src/datavisualization/data/qscatterdataproxy.cpp +++ b/src/datavisualization/data/qscatterdataproxy.cpp @@ -18,6 +18,7 @@ #include "qscatterdataproxy.h" #include "qscatterdataproxy_p.h" +#include "qscatter3dseries_p.h" QT_DATAVISUALIZATION_BEGIN_NAMESPACE @@ -80,6 +81,12 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE */ /*! + * \qmlproperty Scatter3DSeries ScatterDataProxy::series + * + * The series this proxy is attached to. + */ + +/*! * Constructs QScatterDataProxy with the given \a parent. */ QScatterDataProxy::QScatterDataProxy(QObject *parent) : @@ -103,6 +110,16 @@ QScatterDataProxy::~QScatterDataProxy() } /*! + * \property QScatterDataProxy::series + * + * The series this proxy is attached to. + */ +QScatter3DSeries *QScatterDataProxy::series() +{ + return static_cast<QScatter3DSeries *>(d_ptr->series()); +} + +/*! * Takes ownership of the \a newArray. Clears the existing array if the \a newArray is * different from the existing array. If it's the same array, this just triggers arrayReset() * signal. @@ -277,7 +294,6 @@ QScatterDataProxyPrivate::QScatterDataProxyPrivate(QScatterDataProxy *q) : QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeScatter), m_dataArray(new QScatterDataArray) { - m_itemLabelFormat = QStringLiteral("(@xLabel, @yLabel, @zLabel)"); } QScatterDataProxyPrivate::~QScatterDataProxyPrivate() @@ -346,7 +362,7 @@ void QScatterDataProxyPrivate::removeItems(int index, int removeCount) m_dataArray->remove(index, removeCount); } -void QScatterDataProxyPrivate::limitValues(QVector3D &minValues, QVector3D &maxValues) +void QScatterDataProxyPrivate::limitValues(QVector3D &minValues, QVector3D &maxValues) const { if (m_dataArray->isEmpty()) return; @@ -393,4 +409,16 @@ void QScatterDataProxyPrivate::limitValues(QVector3D &minValues, QVector3D &maxV maxValues.setZ(maxZ); } +void QScatterDataProxyPrivate::setSeries(QAbstract3DSeries *series) +{ + QAbstractDataProxyPrivate::setSeries(series); + QScatter3DSeries *scatterSeries = static_cast<QScatter3DSeries *>(series); + emit qptr()->seriesChanged(scatterSeries); +} + +QScatterDataProxy *QScatterDataProxyPrivate::qptr() +{ + return static_cast<QScatterDataProxy *>(q_ptr); +} + QT_DATAVISUALIZATION_END_NAMESPACE |