summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/data/qabstract3dseries.cpp
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2014-01-16 09:29:38 +0200
committerTomi Korpipää <tomi.korpipaa@digia.com>2014-01-16 09:40:39 +0200
commit3e7dc5bd1769e4578733f7ce0f4eba72346b6d98 (patch)
treeeb768f3128237608b1a1c385877fc84d7d32dcd6 /src/datavisualization/data/qabstract3dseries.cpp
parentde93a42512e58c598427178373f0e3e59b04dec7 (diff)
Docs updated after namespace macro removal
- some links do not work Task-number: QTRD-2594 Change-Id: I255a4c12fe09e1a708c068a68073c1c99d6382b6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/data/qabstract3dseries.cpp')
-rw-r--r--src/datavisualization/data/qabstract3dseries.cpp112
1 files changed, 63 insertions, 49 deletions
diff --git a/src/datavisualization/data/qabstract3dseries.cpp b/src/datavisualization/data/qabstract3dseries.cpp
index 577a04a9..7c6798bc 100644
--- a/src/datavisualization/data/qabstract3dseries.cpp
+++ b/src/datavisualization/data/qabstract3dseries.cpp
@@ -24,7 +24,7 @@
namespace QtDataVisualization {
/*!
- * \class QAbstract3DSeries
+ * \class QtDataVisualization::QAbstract3DSeries
* \inmodule QtDataVisualization
* \brief Base class for all QtDataVisualization series.
* \since Qt Data Visualization 1.0
@@ -34,11 +34,21 @@ namespace QtDataVisualization {
*/
/*!
+ * \class QtDataVisualization::QAbstract3DSeriesChangeBitField
+ * \internal
+ */
+
+/*!
+ * \class QtDataVisualization::QAbstract3DSeriesThemeOverrideBitField
+ * \internal
+ */
+
+/*!
* \qmltype Abstract3DSeries
* \inqmlmodule QtDataVisualization
* \since QtDataVisualization 1.0
* \ingroup datavisualization_qml
- * \instantiates QAbstract3DSeries
+ * \instantiates QtDataVisualization::QAbstract3DSeries
* \brief Base type for all QtDataVisualization series.
*
* This type is uncreatable, but contains properties that are exposed via subtypes.
@@ -46,6 +56,53 @@ namespace QtDataVisualization {
*/
/*!
+ * \enum QAbstract3DSeries::SeriesType
+ *
+ * Type of the series.
+ *
+ * \value SeriesTypeNone
+ * No series type.
+ * \value SeriesTypeBar
+ * Series type for Q3DBars.
+ * \value SeriesTypeScatter
+ * Series type for Q3DScatter.
+ * \value SeriesTypeSurface
+ * Series type for Q3DSurface.
+ */
+
+/*!
+ * \enum QAbstract3DSeries::Mesh
+ *
+ * Predefined mesh types. All styles are not usable with all visualization types.
+ *
+ * \value MeshUserDefined
+ * User defined mesh, set via QAbstract3DSeries::userDefinedMesh property.
+ * \value MeshBar
+ * Basic rectangular bar.
+ * \value MeshCube
+ * Basic cube.
+ * \value MeshPyramid
+ * Four-sided pyramid.
+ * \value MeshCone
+ * Basic cone.
+ * \value MeshCylinder
+ * Basic cylinder.
+ * \value MeshBevelBar
+ * Slightly beveled (rounded) rectangular bar.
+ * \value MeshBevelCube
+ * Slightly beveled (rounded) cube.
+ * \value MeshSphere
+ * Sphere.
+ * \value MeshMinimal
+ * The minimal 3D mesh: a triangular pyramid. Usable only with Q3DScatter.
+ * \value MeshArrow
+ * Arrow pointing upwards.
+ * \value MeshPoint
+ * 2D point. Usable only with Q3DScatter.
+ * \b Note: Shadows and color gradients do not affect this style.
+ */
+
+/*!
* \qmlproperty Abstract3DSeries.SeriesType Abstract3DSeries::type
* The type of the series.
*/
@@ -168,53 +225,6 @@ namespace QtDataVisualization {
*/
/*!
- * \enum QAbstract3DSeries::SeriesType
- *
- * Type of the series.
- *
- * \value SeriesTypeNone
- * No series type.
- * \value SeriesTypeBar
- * Series type for Q3DBars.
- * \value SeriesTypeScatter
- * Series type for Q3DScatter.
- * \value SeriesTypeSurface
- * Series type for Q3DSurface.
- */
-
-/*!
- * \enum QAbstract3DSeries::Mesh
- *
- * Predefined mesh types. All styles are not usable with all visualization types.
- *
- * \value MeshUserDefined
- * User defined mesh, set via QAbstract3DSeries::userDefinedMesh property.
- * \value MeshBar
- * Basic rectangular bar.
- * \value MeshCube
- * Basic cube.
- * \value MeshPyramid
- * Four-sided pyramid.
- * \value MeshCone
- * Basic cone.
- * \value MeshCylinder
- * Basic cylinder.
- * \value MeshBevelBar
- * Slightly beveled (rounded) rectangular bar.
- * \value MeshBevelCube
- * Slightly beveled (rounded) cube.
- * \value MeshSphere
- * Sphere.
- * \value MeshMinimal
- * The minimal 3D mesh: a triangular pyramid. Usable only with Q3DScatter.
- * \value MeshArrow
- * Arrow pointing upwards.
- * \value MeshPoint
- * 2D point. Usable only with Q3DScatter.
- * \b Note: Shadows and color gradients do not affect this style.
- */
-
-/*!
* \internal
*/
QAbstract3DSeries::QAbstract3DSeries(QAbstract3DSeriesPrivate *d, QObject *parent) :
@@ -519,6 +529,10 @@ QString QAbstract3DSeries::name() const
}
// QAbstract3DSeriesPrivate
+/*!
+ * \class QtDataVisualization::QAbstract3DSeriesPrivate
+ * \internal
+ */
QAbstract3DSeriesPrivate::QAbstract3DSeriesPrivate(QAbstract3DSeries *q, QAbstract3DSeries::SeriesType type)
: QObject(0),