From 297d23b2f73939953108c504c0264179cd2136af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 27 Feb 2014 09:04:44 +0200 Subject: Doc fixes - Q3DObject - Q3DTheme Change-Id: I9d5717beece4426b9611b6b81a4dcf388373de2b Change-Id: I9d5717beece4426b9611b6b81a4dcf388373de2b Reviewed-by: Miikka Heikkinen --- .../datavisualization/rotations/scatterdatamodifier.cpp | 4 ++-- src/datavisualization/engine/q3dobject.cpp | 2 +- src/datavisualization/theme/q3dtheme.cpp | 15 ++++++++------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/examples/datavisualization/rotations/scatterdatamodifier.cpp b/examples/datavisualization/rotations/scatterdatamodifier.cpp index 90af63ab..c4b439b1 100644 --- a/examples/datavisualization/rotations/scatterdatamodifier.cpp +++ b/examples/datavisualization/rotations/scatterdatamodifier.cpp @@ -111,13 +111,13 @@ void ScatterDataModifier::generateData() float xCenter = ellipse_a * qCos(horizontalAngle); float zCenter = ellipse_a * qSin(horizontalAngle); - // Rotate - arrow always tangential to origo + // Rotate - arrow always tangential to origin //! [0] QQuaternion yRotation = QQuaternion::fromAxisAndAngle(0.0f, 1.0f, 0.0f, horizontalAngle * radiansToDegrees); //! [0] for (float j = 0; j < m_arrowsPerLine; j++) { - // Calculate point on ellipse centered on origo and parallel to x-axis + // Calculate point on ellipse centered on origin and parallel to x-axis float verticalAngle = ((doublePi * j) / m_arrowsPerLine) + m_angleOffset; float xUnrotated = ellipse_a * qCos(verticalAngle); float y = ellipse_b * qSin(verticalAngle); diff --git a/src/datavisualization/engine/q3dobject.cpp b/src/datavisualization/engine/q3dobject.cpp index cda4a370..05edf287 100644 --- a/src/datavisualization/engine/q3dobject.cpp +++ b/src/datavisualization/engine/q3dobject.cpp @@ -33,7 +33,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION */ /*! - * Constructs a new 3D object with position set to origo by default. An + * Constructs a new 3D object with position set to origin by default. An * optional \a parent parameter can be given and is then passed to QObject constructor. */ Q3DObject::Q3DObject(QObject *parent) : diff --git a/src/datavisualization/theme/q3dtheme.cpp b/src/datavisualization/theme/q3dtheme.cpp index a3703779..83da96f8 100644 --- a/src/datavisualization/theme/q3dtheme.cpp +++ b/src/datavisualization/theme/q3dtheme.cpp @@ -56,20 +56,21 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION * \li List of colors for the objects in the graph. Colors are applied to series one by one. * If there are more series than colors, the color list is reused from the start. * The colors in this property are used if colorStyle is ColorStyleUniform. This can be - * overridden by setting the baseColor explicitly in series. + * overridden by setting the \l{QAbstract3DSeries::baseColor}{baseColor} explicitly in series. * \li Qt::black * \row * \li baseGradients * \li List of gradients for the objects in the graph. Gradients are applied to series one by * one. If there are more series than gradients, the gradient list is reused from the start. * The gradients in this property are used if colorStyle is ColorStyleObjectGradient or - * ColorStyleRangeGradient. This can be overridden by setting the baseGradient explicitly - * in series. + * ColorStyleRangeGradient. This can be overridden by setting the + * \l{QAbstract3DSeries::baseGradient}{baseGradient} explicitly in series. * \li QLinearGradient(). Essentially fully black. * \row * \li colorStyle * \li The color style of the objects in the graph. See ColorStyle for detailed description of - * the styles. This can be overridden by setting the colorStyle explicitly in series. + * the styles. This can be overridden by setting the + * \l{QAbstract3DSeries::colorStyle}{colorStyle} explicitly in series. * \li ColorStyleUniform * \row * \li \l font @@ -170,15 +171,15 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION * Color styles. * * \value ColorStyleUniform - * Objects are rendered in a single color. The color used is specified in baseColor, + * Objects are rendered in a single color. The color used is specified in baseColors, * singleHighlightColor and multiHighlightColor properties. * \value ColorStyleObjectGradient * Objects are colored using a full gradient for each object regardless of object height. The - * gradient used is specified in baseGradient, singleHighlightGradient and + * gradient used is specified in baseGradients, singleHighlightGradient and * multiHighlightGradient properties. * \value ColorStyleRangeGradient * Objects are colored using a portion of the full gradient determined by the object's - * height and its position on the Y-axis. The gradient used is specified in baseGradient, + * height and its position on the Y-axis. The gradient used is specified in baseGradients, * singleHighlightGradient and multiHighlightGradient properties. */ -- cgit v1.2.3