diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-20 11:49:24 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-09-20 12:12:18 +0300 |
| commit | 0d74bd964a2f63c303cc03d83c1ae02991b8e0ec (patch) | |
| tree | 12a76ca7a56bcc280e986fbcf0ef9840aa8b9153 | |
| parent | d8662133def955c4aedf83e9b035fbece35a6710 (diff) | |
Surface: base gradient from theme
Task-number: QTRD-2318
Change-Id: If0483647ce4674a7f2f0cc1fa7aaab3fca5b16fe
Change-Id: If0483647ce4674a7f2f0cc1fa7aaab3fca5b16fe
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
| -rw-r--r-- | examples/qmlsurface/qml/qmlsurface/main.qml | 1 | ||||
| -rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 4 | ||||
| -rw-r--r-- | src/datavisualization/engine/theme.cpp | 11 |
3 files changed, 10 insertions, 6 deletions
diff --git a/examples/qmlsurface/qml/qmlsurface/main.qml b/examples/qmlsurface/qml/qmlsurface/main.qml index 19b6a67c..b8c09b35 100644 --- a/examples/qmlsurface/qml/qmlsurface/main.qml +++ b/examples/qmlsurface/qml/qmlsurface/main.qml @@ -64,7 +64,6 @@ Item { axisY.labelFormat: "%i" Component.onCompleted: { setGradientColorAt(0, "black"); - setGradientColorAt(0.5, "lightgray"); setGradientColorAt(1, "white"); } } diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index e64928eb..308f449e 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -1225,8 +1225,8 @@ void Surface3DRenderer::idToRGBA(uint id, uchar *r, uchar *g, uchar *b, uchar *a void Surface3DRenderer::updateTextures() { qDebug() << __FUNCTION__ << "NEED TO DO SOMETHING"; - // Drawer has changed; this flag needs to be checked when checking if we need to update labels - //m_updateLabels = true; + + updateSurfaceGradient(m_cachedTheme.m_surfaceGradient); } void Surface3DRenderer::calculateSceneScalingFactors() diff --git a/src/datavisualization/engine/theme.cpp b/src/datavisualization/engine/theme.cpp index 220f59ce..23dc6705 100644 --- a/src/datavisualization/engine/theme.cpp +++ b/src/datavisualization/engine/theme.cpp @@ -45,9 +45,6 @@ Theme::Theme() m_labelBorders(false) { // Default values for surface gradient - m_surfaceGradient.setColorAt(0.0, Qt::green); - m_surfaceGradient.setColorAt(0.5, Qt::yellow); - m_surfaceGradient.setColorAt(1.0, Qt::red); } Theme::~Theme() @@ -448,6 +445,14 @@ void Theme::useColorTheme(QDataVis::ColorTheme colorTheme) default: break; } + if (m_uniformColor) { + m_surfaceGradient.setColorAt(0.0, m_baseColor); + } else { + m_surfaceGradient.setColorAt(0.0, QColor(m_baseColor.redF() * 0.7, + m_baseColor.greenF() * 0.7, + m_baseColor.blueF() * 0.7)); + } + m_surfaceGradient.setColorAt(1.0, m_baseColor); } void Theme::setFromTheme(Theme &theme) |