summaryrefslogtreecommitdiffstats
path: root/src/datavis3dqml2/declarativescatter.cpp
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-09-06 12:24:41 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-09-06 12:41:57 +0300
commit48ec1d061bfd202f68f8c6771917fa22f9e45733 (patch)
treeb3a0b33dfaca99ba693b4e1fc3c69faf73ac98cf /src/datavis3dqml2/declarativescatter.cpp
parent1ff7a47fe0f2a016e7b61adf3b99ca750347ec13 (diff)
Expose data proxy in QML
Change-Id: I1102520678f2c8ae2932ddb396b41655cfd538e9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavis3dqml2/declarativescatter.cpp')
-rw-r--r--src/datavis3dqml2/declarativescatter.cpp28
1 files changed, 4 insertions, 24 deletions
diff --git a/src/datavis3dqml2/declarativescatter.cpp b/src/datavis3dqml2/declarativescatter.cpp
index c38dc9d0..79f91265 100644
--- a/src/datavis3dqml2/declarativescatter.cpp
+++ b/src/datavis3dqml2/declarativescatter.cpp
@@ -56,16 +56,6 @@ void DeclarativeScatter::handleShadowQualityUpdate(QDataVis::ShadowQuality quali
emit shadowQualityChanged(quality);
}
-void DeclarativeScatter::classBegin()
-{
- //qDebug() << "classBegin";
-}
-
-void DeclarativeScatter::componentComplete()
-{
- //qDebug() << "componentComplete";
-}
-
QSGNode *DeclarativeScatter::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
{
// If old node exists and has right size, reuse it.
@@ -100,24 +90,14 @@ void DeclarativeScatter::setObjectColor(const QColor &baseColor, const QColor &h
m_shared->setObjectColor(baseColor, heightColor, depthColor, uniform);
}
-void DeclarativeScatter::setData(const QAbstractItemModel *data)
-{
- static_cast<QItemModelScatterDataProxy *>(m_shared->activeDataProxy())->setItemModel(data);
-}
-
-const QAbstractItemModel *DeclarativeScatter::data() const
-{
- return static_cast<const QItemModelScatterDataProxy *>(m_shared->activeDataProxy())->itemModel();
-}
-
-void DeclarativeScatter::setMapping(QItemModelScatterDataMapping *mapping)
+QScatterDataProxy *DeclarativeScatter::dataProxy() const
{
- static_cast<QItemModelScatterDataProxy *>(m_shared->activeDataProxy())->setActiveMapping(mapping);
+ return static_cast<QScatterDataProxy *>(m_shared->activeDataProxy());
}
-QItemModelScatterDataMapping *DeclarativeScatter::mapping() const
+void DeclarativeScatter::setDataProxy(QScatterDataProxy *dataProxy)
{
- return static_cast<QItemModelScatterDataProxy *>(m_shared->activeDataProxy())->activeMapping();
+ m_shared->setActiveDataProxy(dataProxy);
}
Q3DValueAxis *DeclarativeScatter::axisX() const