From e1d3fe529ddce015f62cc7ca22c29e8950c9cd39 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Tue, 14 Jan 2014 12:03:24 +0200
Subject: Documentation additions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTRD-2735

Change-Id: I4b28ac2876ad025c262f861e7620aa4d6de6ff60
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 src/datavisualization/data/qabstract3dseries.cpp | 17 +++++++++++++++++
 src/datavisualization/data/qbar3dseries.cpp      |  2 ++
 src/datavisualization/data/qscatter3dseries.cpp  |  2 ++
 src/datavisualization/data/qscatterdataitem.cpp  | 10 ++++++++++
 src/datavisualization/data/qsurface3dseries.cpp  |  2 ++
 5 files changed, 33 insertions(+)

(limited to 'src/datavisualization/data')

diff --git a/src/datavisualization/data/qabstract3dseries.cpp b/src/datavisualization/data/qabstract3dseries.cpp
index 1aa4a46d..1afb63c4 100644
--- a/src/datavisualization/data/qabstract3dseries.cpp
+++ b/src/datavisualization/data/qabstract3dseries.cpp
@@ -158,6 +158,15 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  * \sa colorStyle
  */
 
+/*!
+ * \qmlproperty string Abstract3DSeries::name
+ *
+ * Sets the series name.
+ * Series name can be used in item label format with tag \c{@seriesName}.
+ *
+ * \sa itemLabelFormat
+ */
+
 /*!
  * \enum QAbstract3DSeries::SeriesType
  *
@@ -488,6 +497,14 @@ QLinearGradient QAbstract3DSeries::multiHighlightGradient() const
     return d_ptr->m_multiHighlightGradient;
 }
 
+/*!
+ * \property QAbstract3DSeries::name
+ *
+ * Sets the series name.
+ * Series name can be used in item label format with tag \c{@seriesName}.
+ *
+ * \sa itemLabelFormat
+ */
 void QAbstract3DSeries::setName(const QString &name)
 {
     if (d_ptr->m_name != name) {
diff --git a/src/datavisualization/data/qbar3dseries.cpp b/src/datavisualization/data/qbar3dseries.cpp
index fea0b359..cdf9333a 100644
--- a/src/datavisualization/data/qbar3dseries.cpp
+++ b/src/datavisualization/data/qbar3dseries.cpp
@@ -53,6 +53,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  *     \li @valueLabel    \li Item value formatted using the same format the value axis attached to the graph uses,
  *                            see \l{QValue3DAxis::setLabelFormat()} for more information.
  *   \row
+ *     \li @seriesName    \li Name of the series
+ *   \row
  *     \li %<format spec> \li Item value in specified format.
  * \endtable
  *
diff --git a/src/datavisualization/data/qscatter3dseries.cpp b/src/datavisualization/data/qscatter3dseries.cpp
index 5aa17ed3..10b2f84b 100644
--- a/src/datavisualization/data/qscatter3dseries.cpp
+++ b/src/datavisualization/data/qscatter3dseries.cpp
@@ -50,6 +50,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  *   \row
  *     \li @zLabel    \li Item value formatted using the same format the Z axis attached to the graph uses,
  *                            see \l{QValue3DAxis::setLabelFormat()} for more information.
+ *   \row
+ *     \li @seriesName \li Name of the series
  * \endtable
  *
  * For example:
diff --git a/src/datavisualization/data/qscatterdataitem.cpp b/src/datavisualization/data/qscatterdataitem.cpp
index 2c0c0d5a..18c67ee8 100644
--- a/src/datavisualization/data/qscatterdataitem.cpp
+++ b/src/datavisualization/data/qscatterdataitem.cpp
@@ -91,6 +91,16 @@ QScatterDataItem &QScatterDataItem::operator=(const QScatterDataItem &other)
  * \return position of this data item.
  */
 
+/*!
+ * \fn void QScatterDataItem::setRotation(const QQuaternion &rotation)
+ * Sets \a rotation to this data item.
+ */
+
+/*!
+ * \fn QQuaternion QScatterDataItem::rotation() const
+ * \return rotation of this data item.
+ */
+
 /*!
  * \fn void QScatterDataItem::setX(float value)
  * Sets the X component of the item position to the \a value.
diff --git a/src/datavisualization/data/qsurface3dseries.cpp b/src/datavisualization/data/qsurface3dseries.cpp
index 25405959..74b0ca90 100644
--- a/src/datavisualization/data/qsurface3dseries.cpp
+++ b/src/datavisualization/data/qsurface3dseries.cpp
@@ -53,6 +53,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
  *   \row
  *     \li @zLabel    \li Item value formatted using the same format as the Z axis attached to the graph uses,
  *                            see \l{QValue3DAxis::setLabelFormat()} for more information.
+ *   \row
+ *     \li @seriesName \li Name of the series
  * \endtable
  *
  * For example:
-- 
cgit v1.2.3