summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-11-07 14:57:48 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-11-08 09:09:22 +0200
commit1dca7a61130615da20f8c7205abd62db721e61d0 (patch)
tree476db607495d38fc986157e2715a79e23487a3a6 /src/datavisualizationqml2
parent6c3a413f65fe69cc525599ca183a66976ce0eaa7 (diff)
Gradient support part 2
Scatter gradients. Task-number: QTRD-2200 Change-Id: Ia6ac271440d0d26b7cae9332ef2ba4e7bf1a11fe Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualizationqml2')
-rw-r--r--src/datavisualizationqml2/declarativebars.cpp4
-rw-r--r--src/datavisualizationqml2/declarativebars_p.h2
-rw-r--r--src/datavisualizationqml2/declarativescatter.cpp4
-rw-r--r--src/datavisualizationqml2/declarativescatter_p.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp
index 2fecf5d1..9f2af06b 100644
--- a/src/datavisualizationqml2/declarativebars.cpp
+++ b/src/datavisualizationqml2/declarativebars.cpp
@@ -78,9 +78,9 @@ QSGNode *DeclarativeBars::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData
return node;
}
-void DeclarativeBars::setBarColor(const QColor &baseColor, bool uniform)
+void DeclarativeBars::setBarColor(const QColor &baseColor)
{
- m_shared->setObjectColor(baseColor); // TODO
+ m_shared->setObjectColor(baseColor);
}
void DeclarativeBars::setDataProxy(QBarDataProxy *dataProxy)
diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h
index acc5f2f1..f6d36632 100644
--- a/src/datavisualizationqml2/declarativebars_p.h
+++ b/src/datavisualizationqml2/declarativebars_p.h
@@ -63,7 +63,7 @@ public:
explicit DeclarativeBars(QQuickItem *parent = 0);
~DeclarativeBars();
- Q_INVOKABLE void setBarColor(const QColor &baseColor, bool uniform = true);
+ Q_INVOKABLE void setBarColor(const QColor &baseColor); // TODO property (or more likely as part of data set)
QBarDataProxy *dataProxy() const;
void setDataProxy(QBarDataProxy *dataProxy);
diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp
index f1de9a16..7c201301 100644
--- a/src/datavisualizationqml2/declarativescatter.cpp
+++ b/src/datavisualizationqml2/declarativescatter.cpp
@@ -76,9 +76,9 @@ QSGNode *DeclarativeScatter::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDa
return node;
}
-void DeclarativeScatter::setObjectColor(const QColor &baseColor, bool uniform)
+void DeclarativeScatter::setObjectColor(const QColor &baseColor)
{
- m_shared->setObjectColor(baseColor); //TODO
+ m_shared->setObjectColor(baseColor);
}
QScatterDataProxy *DeclarativeScatter::dataProxy() const
diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h
index 3532f8d6..c066f42c 100644
--- a/src/datavisualizationqml2/declarativescatter_p.h
+++ b/src/datavisualizationqml2/declarativescatter_p.h
@@ -58,7 +58,7 @@ public:
explicit DeclarativeScatter(QQuickItem *parent = 0);
~DeclarativeScatter();
- Q_INVOKABLE void setObjectColor(const QColor &baseColor, bool uniform = true);
+ Q_INVOKABLE void setObjectColor(const QColor &baseColor); // TODO property (or more likely as part of data set)
QScatterDataProxy *dataProxy() const;
void setDataProxy(QScatterDataProxy *dataProxy);