summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-02-10 12:01:35 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-02-11 07:51:34 +0200
commitb86e535d839643298ba610da9789e9c4bc9149db (patch)
treeaffb34cf301618eb5c869a5bef2b48ab4229ffb1 /src
parent51ad2b7e532296fde314e8157475b667b18ae82a (diff)
Add rotations example
+Fix scatter rangegradient Task-number: QTRD-2801 Change-Id: I1515b0a500cd995471b3de1e0b5356099bc19ede Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/datavisualization/data/qbar3dseries.cpp2
-rw-r--r--src/datavisualization/engine/scatter3drenderer.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/datavisualization/data/qbar3dseries.cpp b/src/datavisualization/data/qbar3dseries.cpp
index 6e681b7e..f4b990e9 100644
--- a/src/datavisualization/data/qbar3dseries.cpp
+++ b/src/datavisualization/data/qbar3dseries.cpp
@@ -120,7 +120,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
* A convenience property for defining the series rotation \a angle in degrees.
*
* \note: When reading this property, it is calculated from Abstract3DSeries::meshRotation value
- * with floating point precision and always returns a value from zero to 360 degrees.
+ * using floating point precision and always returns a value from zero to 360 degrees.
*
* \sa Abstract3DSeries::meshRotation
*/
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index a2321546..bed3070b 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -717,7 +717,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
dotShader->setUniformValue(dotShader->color(), dotColor);
} else if (colorStyle == Q3DTheme::ColorStyleRangeGradient) {
dotShader->setUniformValue(dotShader->gradientMin(),
- (item.position().y() + 1.0f) / 2.0f);
+ (item.translation().y() + 1.0f) / 2.0f);
}
#if !defined(QT_OPENGL_ES_2)
if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {