From 3e7dc5bd1769e4578733f7ce0f4eba72346b6d98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 16 Jan 2014 09:29:38 +0200 Subject: Docs updated after namespace macro removal - some links do not work Task-number: QTRD-2594 Change-Id: I255a4c12fe09e1a708c068a68073c1c99d6382b6 Reviewed-by: Miikka Heikkinen --- src/datavisualization/axis/qabstract3daxis.cpp | 8 +- src/datavisualization/axis/qcategory3daxis.cpp | 9 +- src/datavisualization/axis/qvalue3daxis.cpp | 9 +- .../data/abstractitemmodelhandler.cpp | 5 + src/datavisualization/data/abstractrenderitem.cpp | 5 + src/datavisualization/data/baritemmodelhandler.cpp | 5 + src/datavisualization/data/barrenderitem.cpp | 15 ++ src/datavisualization/data/barrenderitem_p.h | 20 ++- src/datavisualization/data/labelitem.cpp | 5 + src/datavisualization/data/qabstract3dseries.cpp | 112 ++++++++------ src/datavisualization/data/qabstractdataproxy.cpp | 8 +- src/datavisualization/data/qbar3dseries.cpp | 8 +- src/datavisualization/data/qbardataitem.cpp | 6 +- src/datavisualization/data/qbardataproxy.cpp | 20 ++- .../data/qheightmapsurfacedataproxy.cpp | 8 +- .../data/qitemmodelbardataproxy.cpp | 50 +++--- .../data/qitemmodelscatterdataproxy.cpp | 32 ++-- .../data/qitemmodelsurfacedataproxy.cpp | 50 +++--- src/datavisualization/data/qscatter3dseries.cpp | 8 +- src/datavisualization/data/qscatterdataitem.cpp | 6 +- src/datavisualization/data/qscatterdataproxy.cpp | 14 +- src/datavisualization/data/qsurface3dseries.cpp | 8 +- src/datavisualization/data/qsurfacedataitem.cpp | 6 +- src/datavisualization/data/qsurfacedataproxy.cpp | 20 ++- .../data/scatteritemmodelhandler.cpp | 5 + src/datavisualization/data/scatterrenderitem.cpp | 10 ++ src/datavisualization/data/scatterrenderitem_p.h | 34 ++-- .../data/surfaceitemmodelhandler.cpp | 5 + .../doc/qtdatavisualization.qdocconf | 2 + .../doc/src/qtdatavisualization.qdoc | 3 +- .../engine/abstract3dcontroller.cpp | 10 ++ .../engine/abstract3drenderer.cpp | 5 + src/datavisualization/engine/axisrendercache.cpp | 5 + src/datavisualization/engine/bars3dcontroller.cpp | 10 ++ src/datavisualization/engine/bars3drenderer.cpp | 5 + src/datavisualization/engine/drawer.cpp | 5 + src/datavisualization/engine/q3dbars.cpp | 6 +- src/datavisualization/engine/q3dbox.cpp | 8 +- src/datavisualization/engine/q3dbox.h | 172 +++++++++------------ src/datavisualization/engine/q3dcamera.cpp | 8 +- src/datavisualization/engine/q3dlight.cpp | 8 +- src/datavisualization/engine/q3dobject.cpp | 6 +- src/datavisualization/engine/q3dscatter.cpp | 6 +- src/datavisualization/engine/q3dscene.cpp | 13 +- src/datavisualization/engine/q3dsurface.cpp | 6 +- src/datavisualization/engine/qabstract3dgraph.cpp | 6 +- .../engine/scatter3dcontroller.cpp | 10 ++ src/datavisualization/engine/scatter3drenderer.cpp | 5 + src/datavisualization/engine/selectionpointer.cpp | 5 + src/datavisualization/engine/seriesrendercache.cpp | 5 + .../engine/surface3dcontroller.cpp | 10 ++ src/datavisualization/engine/surface3drenderer.cpp | 5 + .../global/datavisualizationglobal_p.h | 8 +- src/datavisualization/input/q3dinputhandler.cpp | 7 +- src/datavisualization/input/q3dinputhandler.h | 4 +- .../input/qabstract3dinputhandler.cpp | 8 +- .../input/qtouch3dinputhandler.cpp | 6 +- src/datavisualization/theme/q3dtheme.cpp | 13 +- src/datavisualization/theme/thememanager.cpp | 5 + .../utils/abstractobjecthelper.cpp | 5 + src/datavisualization/utils/camerahelper.cpp | 5 + src/datavisualization/utils/meshloader.cpp | 5 + src/datavisualization/utils/objecthelper.cpp | 5 + src/datavisualization/utils/shaderhelper.cpp | 5 + src/datavisualization/utils/surfaceobject.cpp | 5 + src/datavisualization/utils/texturehelper.cpp | 5 + src/datavisualization/utils/utils.cpp | 5 + src/datavisualization/utils/vertexindexer.cpp | 5 + 68 files changed, 622 insertions(+), 289 deletions(-) diff --git a/src/datavisualization/axis/qabstract3daxis.cpp b/src/datavisualization/axis/qabstract3daxis.cpp index d2c0f6e8..99a4a91d 100644 --- a/src/datavisualization/axis/qabstract3daxis.cpp +++ b/src/datavisualization/axis/qabstract3daxis.cpp @@ -22,7 +22,7 @@ namespace QtDataVisualization { /*! - * \class QAbstract3DAxis + * \class QtDataVisualization::QAbstract3DAxis * \inmodule QtDataVisualization * \brief QAbstract3DAxis is base class for axes of a graph. * \since Qt Data Visualization 1.0 @@ -37,7 +37,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QAbstract3DAxis + * \instantiates QtDataVisualization::QAbstract3DAxis * \brief AbstractAxis3D is base type for axes of a graph. * * This type is uncreatable, but contains properties that are exposed via subtypes. @@ -255,6 +255,10 @@ bool QAbstract3DAxis::isAutoAdjustRange() const */ // QAbstract3DAxisPrivate +/*! + * \class QtDataVisualization::QAbstract3DAxisPrivate + * \internal + */ QAbstract3DAxisPrivate::QAbstract3DAxisPrivate(QAbstract3DAxis *q, QAbstract3DAxis::AxisType type) : QObject(0), diff --git a/src/datavisualization/axis/qcategory3daxis.cpp b/src/datavisualization/axis/qcategory3daxis.cpp index 0dfe2e4a..a29fb376 100644 --- a/src/datavisualization/axis/qcategory3daxis.cpp +++ b/src/datavisualization/axis/qcategory3daxis.cpp @@ -24,7 +24,7 @@ namespace QtDataVisualization { /*! - * \class QCategory3DAxis + * \class QtDataVisualization::QCategory3DAxis * \inmodule QtDataVisualization * \brief The QCategory3DAxis class is used for manipulating an axis of a graph. * \since Qt Data Visualization 1.0 @@ -41,7 +41,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QCategory3DAxis + * \instantiates QtDataVisualization::QCategory3DAxis * \inherits AbstractAxis3D * \brief The CategoryAxis3D type is used for manipulating an axis of a graph. * @@ -117,6 +117,11 @@ QCategory3DAxisPrivate *QCategory3DAxis::dptr() return static_cast(d_ptr.data()); } +/*! + * \class QtDataVisualization::QCategory3DAxisPrivate + * \internal + */ + QCategory3DAxisPrivate::QCategory3DAxisPrivate(QCategory3DAxis *q) : QAbstract3DAxisPrivate(q, QAbstract3DAxis::AxisTypeCategory), m_labelsExplicitlySet(false) diff --git a/src/datavisualization/axis/qvalue3daxis.cpp b/src/datavisualization/axis/qvalue3daxis.cpp index b34d7511..deee9bac 100644 --- a/src/datavisualization/axis/qvalue3daxis.cpp +++ b/src/datavisualization/axis/qvalue3daxis.cpp @@ -23,7 +23,7 @@ namespace QtDataVisualization { /*! - * \class QValue3DAxis + * \class QtDataVisualization::QValue3DAxis * \inmodule QtDataVisualization * \brief The QValue3DAxis class is used for manipulating an axis of a graph. * \since Qt Data Visualization 1.0 @@ -41,7 +41,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QValue3DAxis + * \instantiates QtDataVisualization::QValue3DAxis * \inherits AbstractAxis3D * \brief The ValueAxis3D type is used for manipulating an axis of a graph. * @@ -184,6 +184,11 @@ const QValue3DAxisPrivate *QValue3DAxis::dptrc() const return static_cast(d_ptr.data()); } +/*! + * \class QtDataVisualization::QValue3DAxisPrivate + * \internal + */ + QValue3DAxisPrivate::QValue3DAxisPrivate(QValue3DAxis *q) : QAbstract3DAxisPrivate(q, QAbstract3DAxis::AxisTypeValue), m_segmentCount(5), diff --git a/src/datavisualization/data/abstractitemmodelhandler.cpp b/src/datavisualization/data/abstractitemmodelhandler.cpp index 6cae79c8..33fe7791 100644 --- a/src/datavisualization/data/abstractitemmodelhandler.cpp +++ b/src/datavisualization/data/abstractitemmodelhandler.cpp @@ -21,6 +21,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::AbstractItemModelHandler + * \internal + */ + AbstractItemModelHandler::AbstractItemModelHandler(QObject *parent) : QObject(parent), resolvePending(0) diff --git a/src/datavisualization/data/abstractrenderitem.cpp b/src/datavisualization/data/abstractrenderitem.cpp index 268c1e9b..9ed51e43 100644 --- a/src/datavisualization/data/abstractrenderitem.cpp +++ b/src/datavisualization/data/abstractrenderitem.cpp @@ -20,6 +20,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::AbstractRenderItem + * \internal + */ + AbstractRenderItem::AbstractRenderItem() : m_selectionLabelItem(0) { diff --git a/src/datavisualization/data/baritemmodelhandler.cpp b/src/datavisualization/data/baritemmodelhandler.cpp index bd6f127b..5147e631 100644 --- a/src/datavisualization/data/baritemmodelhandler.cpp +++ b/src/datavisualization/data/baritemmodelhandler.cpp @@ -20,6 +20,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::BarItemModelHandler + * \internal + */ + BarItemModelHandler::BarItemModelHandler(QItemModelBarDataProxy *proxy, QObject *parent) : AbstractItemModelHandler(parent), m_proxy(proxy), diff --git a/src/datavisualization/data/barrenderitem.cpp b/src/datavisualization/data/barrenderitem.cpp index 678d6ba0..be96936e 100644 --- a/src/datavisualization/data/barrenderitem.cpp +++ b/src/datavisualization/data/barrenderitem.cpp @@ -21,6 +21,21 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::BarRenderItem + * \internal + */ + +/*! + * \typedef QtDataVisualization::BarRenderItemRow + * \internal + */ + +/*! + * \typedef QtDataVisualization::BarRenderItemArray + * \internal + */ + BarRenderItem::BarRenderItem() : AbstractRenderItem(), m_value(0), diff --git a/src/datavisualization/data/barrenderitem_p.h b/src/datavisualization/data/barrenderitem_p.h index 5a44e2fd..f44ba2b4 100644 --- a/src/datavisualization/data/barrenderitem_p.h +++ b/src/datavisualization/data/barrenderitem_p.h @@ -47,7 +47,15 @@ public: inline const QPoint &position() const { return m_position; } // Actual cached data value of the bar (needed to trigger label reformats) - inline void setValue(float value); + inline void setValue(float value) + { + m_value = value; + // Force reformatting on next access by setting label string to null string + if (!m_sliceLabel.isNull()) + setSliceLabel(QString()); + if (!m_selectionLabel.isNull()) + setSelectionLabel(QString()); + } inline float value() const { return m_value; } // Normalized bar height @@ -77,16 +85,6 @@ protected: friend class QBarDataItem; }; -void BarRenderItem::setValue(float value) -{ - m_value = value; - // Force reformatting on next access by setting label string to null string - if (!m_sliceLabel.isNull()) - setSliceLabel(QString()); - if (!m_selectionLabel.isNull()) - setSelectionLabel(QString()); -} - typedef QVector BarRenderItemRow; typedef QVector BarRenderItemArray; diff --git a/src/datavisualization/data/labelitem.cpp b/src/datavisualization/data/labelitem.cpp index 78e8d0f2..658912fc 100644 --- a/src/datavisualization/data/labelitem.cpp +++ b/src/datavisualization/data/labelitem.cpp @@ -20,6 +20,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::LabelItem + * \internal + */ + LabelItem::LabelItem() : m_size(QSize(0, 0)), m_textureId(0) 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 @@ -33,18 +33,75 @@ namespace QtDataVisualization { * \sa QBar3DSeries, QScatter3DSeries, QSurface3DSeries, {Qt Data Visualization Data Handling} */ +/*! + * \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. * \sa Bar3DSeries, Scatter3DSeries, Surface3DSeries, {Qt Data Visualization Data Handling} */ +/*! + * \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. @@ -167,53 +224,6 @@ namespace QtDataVisualization { * \sa itemLabelFormat */ -/*! - * \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 */ @@ -519,6 +529,10 @@ QString QAbstract3DSeries::name() const } // QAbstract3DSeriesPrivate +/*! + * \class QtDataVisualization::QAbstract3DSeriesPrivate + * \internal + */ QAbstract3DSeriesPrivate::QAbstract3DSeriesPrivate(QAbstract3DSeries *q, QAbstract3DSeries::SeriesType type) : QObject(0), diff --git a/src/datavisualization/data/qabstractdataproxy.cpp b/src/datavisualization/data/qabstractdataproxy.cpp index 631bd8ac..ce377d2d 100644 --- a/src/datavisualization/data/qabstractdataproxy.cpp +++ b/src/datavisualization/data/qabstractdataproxy.cpp @@ -23,7 +23,7 @@ namespace QtDataVisualization { /*! - * \class QAbstractDataProxy + * \class QtDataVisualization::QAbstractDataProxy * \inmodule QtDataVisualization * \brief Base class for all QtDataVisualization data proxies. * \since Qt Data Visualization 1.0 @@ -37,7 +37,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QAbstractDataProxy + * \instantiates QtDataVisualization::QAbstractDataProxy * \brief Base type for all QtDataVisualization data proxies. * * This type is uncreatable, but contains properties that are exposed via subtypes. @@ -91,6 +91,10 @@ QAbstractDataProxy::DataType QAbstractDataProxy::type() const } // QAbstractDataProxyPrivate +/*! + * \class QtDataVisualization::QAbstractDataProxyPrivate + * \internal + */ QAbstractDataProxyPrivate::QAbstractDataProxyPrivate(QAbstractDataProxy *q, QAbstractDataProxy::DataType type) : QObject(0), diff --git a/src/datavisualization/data/qbar3dseries.cpp b/src/datavisualization/data/qbar3dseries.cpp index d7403712..edee80f5 100644 --- a/src/datavisualization/data/qbar3dseries.cpp +++ b/src/datavisualization/data/qbar3dseries.cpp @@ -22,7 +22,7 @@ namespace QtDataVisualization { /*! - * \class QBar3DSeries + * \class QtDataVisualization::QBar3DSeries * \inmodule QtDataVisualization * \brief Base series class for Q3DBars. * \since Qt Data Visualization 1.0 @@ -69,7 +69,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QBar3DSeries + * \instantiates QtDataVisualization::QBar3DSeries * \inherits Abstract3DSeries * \brief Base series type for Bars3D. * @@ -209,6 +209,10 @@ const QBar3DSeriesPrivate *QBar3DSeries::dptrc() const } // QBar3DSeriesPrivate +/*! + * \class QtDataVisualization::QBar3DSeriesPrivate + * \internal + */ QBar3DSeriesPrivate::QBar3DSeriesPrivate(QBar3DSeries *q) : QAbstract3DSeriesPrivate(q, QAbstract3DSeries::SeriesTypeBar), diff --git a/src/datavisualization/data/qbardataitem.cpp b/src/datavisualization/data/qbardataitem.cpp index 0d69bc95..cd4178ab 100644 --- a/src/datavisualization/data/qbardataitem.cpp +++ b/src/datavisualization/data/qbardataitem.cpp @@ -21,7 +21,7 @@ namespace QtDataVisualization { /*! - * \class QBarDataItem + * \class QtDataVisualization::QBarDataItem * \inmodule QtDataVisualization * \brief The QBarDataItem class provides a container for resolved data to be added to bar graphs. * \since Qt Data Visualization 1.0 @@ -99,6 +99,10 @@ void QBarDataItem::createExtraData() d_ptr = new QBarDataItemPrivate; } +/*! + * \class QtDataVisualization::QBarDataItemPrivate + * \internal + */ QBarDataItemPrivate::QBarDataItemPrivate() { } diff --git a/src/datavisualization/data/qbardataproxy.cpp b/src/datavisualization/data/qbardataproxy.cpp index 5c89f7d4..93645f38 100644 --- a/src/datavisualization/data/qbardataproxy.cpp +++ b/src/datavisualization/data/qbardataproxy.cpp @@ -23,7 +23,7 @@ namespace QtDataVisualization { /*! - * \class QBarDataProxy + * \class QtDataVisualization::QBarDataProxy * \inmodule QtDataVisualization * \brief Base proxy class for Q3DBars. * \since Qt Data Visualization 1.0 @@ -47,12 +47,24 @@ namespace QtDataVisualization { * \sa {Qt Data Visualization Data Handling} */ +/*! + * \typedef QtDataVisualization::QBarDataRow + * + * A vector of QBarDataItems. + */ + +/*! + * \typedef QtDataVisualization::QBarDataArray + * + * A list of pointers to QBarDataRows. + */ + /*! * \qmltype BarDataProxy * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QBarDataProxy + * \instantiates QtDataVisualization::QBarDataProxy * \inherits AbstractDataProxy * \brief Base proxy type for Bars3D. * @@ -481,6 +493,10 @@ const QBarDataProxyPrivate *QBarDataProxy::dptrc() const // QBarDataProxyPrivate +/*! + * \class QtDataVisualization::QBarDataProxyPrivate + * \internal + */ QBarDataProxyPrivate::QBarDataProxyPrivate(QBarDataProxy *q) : QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeBar), m_dataArray(new QBarDataArray) diff --git a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp index 96d6e45a..21f7ae8e 100644 --- a/src/datavisualization/data/qheightmapsurfacedataproxy.cpp +++ b/src/datavisualization/data/qheightmapsurfacedataproxy.cpp @@ -25,7 +25,7 @@ const float defaultMinValue = 0.0f; const float defaultMaxValue = 10.0f; /*! - * \class QHeightMapSurfaceDataProxy + * \class QtDataVisualization::QHeightMapSurfaceDataProxy * \inmodule QtDataVisualization * \brief Base proxy class for Q3DSurface. * \since Qt Data Visualization 1.0 @@ -46,7 +46,7 @@ const float defaultMaxValue = 10.0f; * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QHeightMapSurfaceDataProxy + * \instantiates QtDataVisualization::QHeightMapSurfaceDataProxy * \inherits SurfaceDataProxy * \brief Base proxy type for Surface3D. * @@ -300,6 +300,10 @@ const QHeightMapSurfaceDataProxyPrivate *QHeightMapSurfaceDataProxy::dptrc() con // QHeightMapSurfaceDataProxyPrivate // +/*! + * \class QtDataVisualization::QHeightMapSurfaceDataProxyPrivate + * \internal + */ QHeightMapSurfaceDataProxyPrivate::QHeightMapSurfaceDataProxyPrivate(QHeightMapSurfaceDataProxy *q) : QSurfaceDataProxyPrivate(q), m_minXValue(defaultMinValue), diff --git a/src/datavisualization/data/qitemmodelbardataproxy.cpp b/src/datavisualization/data/qitemmodelbardataproxy.cpp index 77c0463e..52a8cbb5 100644 --- a/src/datavisualization/data/qitemmodelbardataproxy.cpp +++ b/src/datavisualization/data/qitemmodelbardataproxy.cpp @@ -23,7 +23,7 @@ namespace QtDataVisualization { /*! - * \class QItemModelBarDataProxy + * \class QtDataVisualization::QItemModelBarDataProxy * \inmodule QtDataVisualization * \brief Proxy class for presenting data in item models with Q3DBars. * \since Qt Data Visualization 1.0 @@ -66,7 +66,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QItemModelBarDataProxy + * \instantiates QtDataVisualization::QItemModelBarDataProxy * \inherits BarDataProxy * \brief Proxy class for presenting data in item models with Bars3D. * @@ -446,6 +446,31 @@ const QItemModelBarDataProxyPrivate *QItemModelBarDataProxy::dptrc() const return static_cast(d_ptr.data()); } +// QItemModelBarDataProxyPrivate + +/*! + * \class QtDataVisualization::QItemModelBarDataProxyPrivate + * \internal + */ +QItemModelBarDataProxyPrivate::QItemModelBarDataProxyPrivate(QItemModelBarDataProxy *q) + : QBarDataProxyPrivate(q), + m_itemModelHandler(new BarItemModelHandler(q)), + m_useModelCategories(false), + m_autoRowCategories(true), + m_autoColumnCategories(true) +{ +} + +QItemModelBarDataProxyPrivate::~QItemModelBarDataProxyPrivate() +{ + delete m_itemModelHandler; +} + +QItemModelBarDataProxy *QItemModelBarDataProxyPrivate::qptr() +{ + return static_cast(q_ptr); +} + void QItemModelBarDataProxyPrivate::connectItemModelHandler() { QObject::connect(m_itemModelHandler, &BarItemModelHandler::itemModelChanged, @@ -468,25 +493,4 @@ void QItemModelBarDataProxyPrivate::connectItemModelHandler() m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); } -// QItemModelBarDataProxyPrivate - -QItemModelBarDataProxyPrivate::QItemModelBarDataProxyPrivate(QItemModelBarDataProxy *q) - : QBarDataProxyPrivate(q), - m_itemModelHandler(new BarItemModelHandler(q)), - m_useModelCategories(false), - m_autoRowCategories(true), - m_autoColumnCategories(true) -{ -} - -QItemModelBarDataProxyPrivate::~QItemModelBarDataProxyPrivate() -{ - delete m_itemModelHandler; -} - -QItemModelBarDataProxy *QItemModelBarDataProxyPrivate::qptr() -{ - return static_cast(q_ptr); -} - } diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp index e2ba8fec..869d8e8c 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy.cpp +++ b/src/datavisualization/data/qitemmodelscatterdataproxy.cpp @@ -23,7 +23,7 @@ namespace QtDataVisualization { /*! - * \class QItemModelScatterDataProxy + * \class QtDataVisualization::QItemModelScatterDataProxy * \inmodule QtDataVisualization * \brief Proxy class for presenting data in item models with Q3DScatter. * \since Qt Data Visualization 1.0 @@ -52,7 +52,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QItemModelScatterDataProxy + * \instantiates QtDataVisualization::QItemModelScatterDataProxy * \inherits ScatterDataProxy * \brief Proxy class for presenting data in item models with Scatter3D. * @@ -235,20 +235,12 @@ const QItemModelScatterDataProxyPrivate *QItemModelScatterDataProxy::dptrc() con return static_cast(d_ptr.data()); } -void QItemModelScatterDataProxyPrivate::connectItemModelHandler() -{ - QObject::connect(m_itemModelHandler, &ScatterItemModelHandler::itemModelChanged, - qptr(), &QItemModelScatterDataProxy::itemModelChanged); - QObject::connect(qptr(), &QItemModelScatterDataProxy::xPosRoleChanged, - m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); - QObject::connect(qptr(), &QItemModelScatterDataProxy::yPosRoleChanged, - m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); - QObject::connect(qptr(), &QItemModelScatterDataProxy::zPosRoleChanged, - m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); -} - // QItemModelScatterDataProxyPrivate +/*! + * \class QtDataVisualization::QItemModelScatterDataProxyPrivate + * \internal + */ QItemModelScatterDataProxyPrivate::QItemModelScatterDataProxyPrivate(QItemModelScatterDataProxy *q) : QScatterDataProxyPrivate(q), m_itemModelHandler(new ScatterItemModelHandler(q)) @@ -265,4 +257,16 @@ QItemModelScatterDataProxy *QItemModelScatterDataProxyPrivate::qptr() return static_cast(q_ptr); } +void QItemModelScatterDataProxyPrivate::connectItemModelHandler() +{ + QObject::connect(m_itemModelHandler, &ScatterItemModelHandler::itemModelChanged, + qptr(), &QItemModelScatterDataProxy::itemModelChanged); + QObject::connect(qptr(), &QItemModelScatterDataProxy::xPosRoleChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(qptr(), &QItemModelScatterDataProxy::yPosRoleChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); + QObject::connect(qptr(), &QItemModelScatterDataProxy::zPosRoleChanged, + m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); +} + } diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp index 7ca9842e..b387bd7b 100644 --- a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp +++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp @@ -25,7 +25,7 @@ namespace QtDataVisualization { // TODO: CHECK DOCUMENTATION! /*! - * \class QItemModelSurfaceDataProxy + * \class QtDataVisualization::QItemModelSurfaceDataProxy * \inmodule QtDataVisualization * \brief Proxy class for presenting data in item models with Q3DSurface. * \since Qt Data Visualization 1.0 @@ -69,7 +69,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QItemModelSurfaceDataProxy + * \instantiates QtDataVisualization::QItemModelSurfaceDataProxy * \inherits SurfaceDataProxy * \brief Proxy class for presenting data in item models with Surface3D. * @@ -456,6 +456,31 @@ const QItemModelSurfaceDataProxyPrivate *QItemModelSurfaceDataProxy::dptrc() con return static_cast(d_ptr.data()); } +// QItemModelSurfaceDataProxyPrivate + +/*! + * \class QtDataVisualization::QItemModelSurfaceDataProxyPrivate + * \internal + */ +QItemModelSurfaceDataProxyPrivate::QItemModelSurfaceDataProxyPrivate(QItemModelSurfaceDataProxy *q) + : QSurfaceDataProxyPrivate(q), + m_itemModelHandler(new SurfaceItemModelHandler(q)), + m_useModelCategories(false), + m_autoRowCategories(true), + m_autoColumnCategories(true) +{ +} + +QItemModelSurfaceDataProxyPrivate::~QItemModelSurfaceDataProxyPrivate() +{ + delete m_itemModelHandler; +} + +QItemModelSurfaceDataProxy *QItemModelSurfaceDataProxyPrivate::qptr() +{ + return static_cast(q_ptr); +} + void QItemModelSurfaceDataProxyPrivate::connectItemModelHandler() { QObject::connect(m_itemModelHandler, &SurfaceItemModelHandler::itemModelChanged, @@ -478,25 +503,4 @@ void QItemModelSurfaceDataProxyPrivate::connectItemModelHandler() m_itemModelHandler, &AbstractItemModelHandler::handleMappingChanged); } -// QItemModelSurfaceDataProxyPrivate - -QItemModelSurfaceDataProxyPrivate::QItemModelSurfaceDataProxyPrivate(QItemModelSurfaceDataProxy *q) - : QSurfaceDataProxyPrivate(q), - m_itemModelHandler(new SurfaceItemModelHandler(q)), - m_useModelCategories(false), - m_autoRowCategories(true), - m_autoColumnCategories(true) -{ -} - -QItemModelSurfaceDataProxyPrivate::~QItemModelSurfaceDataProxyPrivate() -{ - delete m_itemModelHandler; -} - -QItemModelSurfaceDataProxy *QItemModelSurfaceDataProxyPrivate::qptr() -{ - return static_cast(q_ptr); -} - } diff --git a/src/datavisualization/data/qscatter3dseries.cpp b/src/datavisualization/data/qscatter3dseries.cpp index 38e564f5..edc64989 100644 --- a/src/datavisualization/data/qscatter3dseries.cpp +++ b/src/datavisualization/data/qscatter3dseries.cpp @@ -22,7 +22,7 @@ namespace QtDataVisualization { /*! - * \class QScatter3DSeries + * \class QtDataVisualization::QScatter3DSeries * \inmodule QtDataVisualization * \brief Base series class for Q3DScatter. * \since Qt Data Visualization 1.0 @@ -65,7 +65,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QScatter3DSeries + * \instantiates QtDataVisualization::QScatter3DSeries * \inherits Abstract3DSeries * \brief Base series type for Scatter3D. * @@ -234,6 +234,10 @@ const QScatter3DSeriesPrivate *QScatter3DSeries::dptrc() const // QScatter3DSeriesPrivate +/*! + * \class QtDataVisualization::QScatter3DSeriesPrivate + * \internal + */ QScatter3DSeriesPrivate::QScatter3DSeriesPrivate(QScatter3DSeries *q) : QAbstract3DSeriesPrivate(q, QAbstract3DSeries::SeriesTypeScatter), m_selectedItem(Scatter3DController::invalidSelectionIndex()), diff --git a/src/datavisualization/data/qscatterdataitem.cpp b/src/datavisualization/data/qscatterdataitem.cpp index cb6d5c70..56d8cd35 100644 --- a/src/datavisualization/data/qscatterdataitem.cpp +++ b/src/datavisualization/data/qscatterdataitem.cpp @@ -21,7 +21,7 @@ namespace QtDataVisualization { /*! - * \class QScatterDataItem + * \class QtDataVisualization::QScatterDataItem * \inmodule QtDataVisualization * \brief The QScatterDataItem class provides a container for resolved data to be added to scatter * graphs. @@ -140,6 +140,10 @@ void QScatterDataItem::createExtraData() d_ptr = new QScatterDataItemPrivate; } +/*! + * \class QtDataVisualization::QScatterDataItemPrivate + * \internal + */ QScatterDataItemPrivate::QScatterDataItemPrivate() { } diff --git a/src/datavisualization/data/qscatterdataproxy.cpp b/src/datavisualization/data/qscatterdataproxy.cpp index a58149a1..c9292727 100644 --- a/src/datavisualization/data/qscatterdataproxy.cpp +++ b/src/datavisualization/data/qscatterdataproxy.cpp @@ -23,7 +23,7 @@ namespace QtDataVisualization { /*! - * \class QScatterDataProxy + * \class QtDataVisualization::QScatterDataProxy * \inmodule QtDataVisualization * \brief Base proxy class for Q3DScatter. * \since Qt Data Visualization 1.0 @@ -35,12 +35,18 @@ namespace QtDataVisualization { * \sa {Qt Data Visualization Data Handling} */ +/*! + * \typedef QtDataVisualization::QScatterDataArray + * + * A vector of QScatterDataItems. + */ + /*! * \qmltype ScatterDataProxy * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QScatterDataProxy + * \instantiates QtDataVisualization::QScatterDataProxy * \inherits AbstractDataProxy * \brief Base proxy class for Scatter3D. * @@ -277,6 +283,10 @@ const QScatterDataProxyPrivate *QScatterDataProxy::dptrc() const // QScatterDataProxyPrivate +/*! + * \class QtDataVisualization::QScatterDataProxyPrivate + * \internal + */ QScatterDataProxyPrivate::QScatterDataProxyPrivate(QScatterDataProxy *q) : QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeScatter), m_dataArray(new QScatterDataArray) diff --git a/src/datavisualization/data/qsurface3dseries.cpp b/src/datavisualization/data/qsurface3dseries.cpp index 0994e010..c34c1415 100644 --- a/src/datavisualization/data/qsurface3dseries.cpp +++ b/src/datavisualization/data/qsurface3dseries.cpp @@ -22,7 +22,7 @@ namespace QtDataVisualization { /*! - * \class QSurface3DSeries + * \class QtDataVisualization::QSurface3DSeries * \inmodule QtDataVisualization * \brief Base series class for Q3DSurface. * \since Qt Data Visualization 1.0 @@ -68,7 +68,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QSurface3DSeries + * \instantiates QtDataVisualization::QSurface3DSeries * \inherits Abstract3DSeries * \brief Base series type for Surfaces3D. * @@ -302,6 +302,10 @@ const QSurface3DSeriesPrivate *QSurface3DSeries::dptrc() const // QSurface3DSeriesPrivate +/*! + * \class QtDataVisualization::QSurface3DSeriesPrivate + * \internal + */ QSurface3DSeriesPrivate::QSurface3DSeriesPrivate(QSurface3DSeries *q) : QAbstract3DSeriesPrivate(q, QAbstract3DSeries::SeriesTypeSurface), m_selectedPoint(Surface3DController::invalidSelectionPosition()), diff --git a/src/datavisualization/data/qsurfacedataitem.cpp b/src/datavisualization/data/qsurfacedataitem.cpp index 291038e2..b531d6b6 100644 --- a/src/datavisualization/data/qsurfacedataitem.cpp +++ b/src/datavisualization/data/qsurfacedataitem.cpp @@ -21,7 +21,7 @@ namespace QtDataVisualization { /*! - * \class QSurfaceDataItem + * \class QtDataVisualization::QSurfaceDataItem * \inmodule QtDataVisualization * \brief The QSurfaceDataItem class provides a container for resolved data to be added to surface * graphs. @@ -132,6 +132,10 @@ void QSurfaceDataItem::createExtraData() d_ptr = new QSurfaceDataItemPrivate; } +/*! + * \class QtDataVisualization::QSurfaceDataItemPrivate + * \internal + */ QSurfaceDataItemPrivate::QSurfaceDataItemPrivate() { } diff --git a/src/datavisualization/data/qsurfacedataproxy.cpp b/src/datavisualization/data/qsurfacedataproxy.cpp index e3a6cb13..dbfcfa86 100644 --- a/src/datavisualization/data/qsurfacedataproxy.cpp +++ b/src/datavisualization/data/qsurfacedataproxy.cpp @@ -23,7 +23,7 @@ namespace QtDataVisualization { /*! - * \class QSurfaceDataProxy + * \class QtDataVisualization::QSurfaceDataProxy * \inmodule QtDataVisualization * \brief Base proxy class for Q3DSurface. * \since Qt Data Visualization 1.0 @@ -56,12 +56,24 @@ namespace QtDataVisualization { * \sa {Qt Data Visualization Data Handling} */ +/*! + * \typedef QtDataVisualization::QSurfaceDataRow + * + * A vector of QSurfaceDataItems. + */ + +/*! + * \typedef QtDataVisualization::QSurfaceDataArray + * + * A list of pointers to QSurfaceDataRows. + */ + /*! * \qmltype SurfaceDataProxy * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QSurfaceDataProxy + * \instantiates QtDataVisualization::QSurfaceDataProxy * \inherits AbstractDataProxy * \brief Base proxy class for Surface3D. * @@ -347,6 +359,10 @@ const QSurfaceDataProxyPrivate *QSurfaceDataProxy::dptrc() const // QSurfaceDataProxyPrivate // +/*! + * \class QtDataVisualization::QSurfaceDataProxyPrivate + * \internal + */ QSurfaceDataProxyPrivate::QSurfaceDataProxyPrivate(QSurfaceDataProxy *q) : QAbstractDataProxyPrivate(q, QAbstractDataProxy::DataTypeSurface), m_dataArray(new QSurfaceDataArray) diff --git a/src/datavisualization/data/scatteritemmodelhandler.cpp b/src/datavisualization/data/scatteritemmodelhandler.cpp index f5bac672..ac7e69e8 100644 --- a/src/datavisualization/data/scatteritemmodelhandler.cpp +++ b/src/datavisualization/data/scatteritemmodelhandler.cpp @@ -21,6 +21,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::ScatterItemModelHandler + * \internal + */ + ScatterItemModelHandler::ScatterItemModelHandler(QItemModelScatterDataProxy *proxy, QObject *parent) : AbstractItemModelHandler(parent), m_proxy(proxy), diff --git a/src/datavisualization/data/scatterrenderitem.cpp b/src/datavisualization/data/scatterrenderitem.cpp index be6d3852..5b31c5b2 100644 --- a/src/datavisualization/data/scatterrenderitem.cpp +++ b/src/datavisualization/data/scatterrenderitem.cpp @@ -22,6 +22,16 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::ScatterRenderItem + * \internal + */ + +/*! + * \typedef ScatterRenderItemArray + * \internal + */ + ScatterRenderItem::ScatterRenderItem() : AbstractRenderItem(), m_visible(false) diff --git a/src/datavisualization/data/scatterrenderitem_p.h b/src/datavisualization/data/scatterrenderitem_p.h index 7b7d51f6..5e596505 100644 --- a/src/datavisualization/data/scatterrenderitem_p.h +++ b/src/datavisualization/data/scatterrenderitem_p.h @@ -43,10 +43,23 @@ public: virtual ~ScatterRenderItem(); inline const QVector3D &position() const { return m_position; } - inline void setPosition(const QVector3D &pos); + inline void setPosition(const QVector3D &pos) + { + if (m_position != pos) { + m_position = pos; + // Force reformatting on next access by setting label string to null string + if (!m_selectionLabel.isNull()) + setSelectionLabel(QString()); + } + } inline QQuaternion rotation() const { return m_rotation; } - inline void setRotation(const QQuaternion &rotation); + inline void setRotation(const QQuaternion &rotation) + { + if (m_rotation != rotation) + m_rotation = rotation; + } + inline bool isVisible() const { return m_visible; } inline void setVisible(bool visible) { m_visible = visible; } @@ -63,23 +76,6 @@ protected: friend class QScatterDataItem; }; - -void ScatterRenderItem::setPosition(const QVector3D &pos) -{ - if (m_position != pos) { - m_position = pos; - // Force reformatting on next access by setting label string to null string - if (!m_selectionLabel.isNull()) - setSelectionLabel(QString()); - } -} - -void ScatterRenderItem::setRotation(const QQuaternion &rotation) -{ - if (m_rotation != rotation) - m_rotation = rotation; -} - typedef QVector ScatterRenderItemArray; } diff --git a/src/datavisualization/data/surfaceitemmodelhandler.cpp b/src/datavisualization/data/surfaceitemmodelhandler.cpp index ac1a8b81..3256e660 100644 --- a/src/datavisualization/data/surfaceitemmodelhandler.cpp +++ b/src/datavisualization/data/surfaceitemmodelhandler.cpp @@ -20,6 +20,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::SurfaceItemModelHandler + * \internal + */ + SurfaceItemModelHandler::SurfaceItemModelHandler(QItemModelSurfaceDataProxy *proxy, QObject *parent) : AbstractItemModelHandler(parent), m_proxy(proxy), diff --git a/src/datavisualization/doc/qtdatavisualization.qdocconf b/src/datavisualization/doc/qtdatavisualization.qdocconf index 7a7fa0b1..29fd17f8 100644 --- a/src/datavisualization/doc/qtdatavisualization.qdocconf +++ b/src/datavisualization/doc/qtdatavisualization.qdocconf @@ -15,6 +15,8 @@ sourcedirs += .. depends += qtcore \ qtgui +indexes += $QTDIR/doc/html/qt.index + qhp.projects = qtdatavisualization qhp.qtdatavisualization.file = qtdatavisualization.qhp diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc index e23940ea..c07f161b 100644 --- a/src/datavisualization/doc/src/qtdatavisualization.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc @@ -19,7 +19,6 @@ /*! \namespace QtDataVisualization \inmodule QtDataVisualization - \target QtDataVisualization namespace QtDataVisualization namespace holds all the classes and enumerations in the QtDataVisualization module. @@ -300,7 +299,7 @@ /*! * \fn QSurfaceFormat QtDataVisualization::qDefaultSurfaceFormat(bool antialias = true) - * \relates QAbstract3DGraph + * \relates QtDataVisualization::QAbstract3DGraph * * Anti-aliasing is turned on by default on C++ and turned off on QML, except in OpenGL ES2 * environments, where anti-aliasing is not supported by Qt Data Visualization. diff --git a/src/datavisualization/engine/abstract3dcontroller.cpp b/src/datavisualization/engine/abstract3dcontroller.cpp index 82d60865..9ec6f087 100644 --- a/src/datavisualization/engine/abstract3dcontroller.cpp +++ b/src/datavisualization/engine/abstract3dcontroller.cpp @@ -35,6 +35,16 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::Abstract3DController + * \internal + */ + +/*! + * \class QtDataVisualization::Abstract3DChangeBitField + * \internal + */ + Abstract3DController::Abstract3DController(QRect initialViewport, Q3DScene *scene, QObject *parent) : QObject(parent), m_themeManager(new ThemeManager(this)), diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp index 9c7cfb39..9b4ae6ab 100644 --- a/src/datavisualization/engine/abstract3drenderer.cpp +++ b/src/datavisualization/engine/abstract3drenderer.cpp @@ -29,6 +29,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::Abstract3DRenderer + * \internal + */ + Abstract3DRenderer::Abstract3DRenderer(Abstract3DController *controller) : QObject(0), m_hasNegativeValues(false), diff --git a/src/datavisualization/engine/axisrendercache.cpp b/src/datavisualization/engine/axisrendercache.cpp index 9fcd8b5d..5598563a 100644 --- a/src/datavisualization/engine/axisrendercache.cpp +++ b/src/datavisualization/engine/axisrendercache.cpp @@ -22,6 +22,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::AxisRenderCache + * \internal + */ + AxisRenderCache::AxisRenderCache() : m_type(QAbstract3DAxis::AxisTypeNone), m_min(0.0f), diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp index 986b9a0e..b152909d 100644 --- a/src/datavisualization/engine/bars3dcontroller.cpp +++ b/src/datavisualization/engine/bars3dcontroller.cpp @@ -32,6 +32,16 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::Bars3DController + * \internal + */ + +/*! + * \class QtDataVisualization::Bars3DChangeBitField + * \internal + */ + Bars3DController::Bars3DController(QRect boundRect, Q3DScene *scene) : Abstract3DController(boundRect, scene), m_selectedBar(invalidSelectionPosition()), diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index 02b26821..97e21fc6 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -40,6 +40,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::Bars3DRenderer + * \internal + */ + const GLfloat labelMargin = 0.05f; const GLfloat gridLineWidth = 0.005f; diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp index ec36befd..a2905e32 100644 --- a/src/datavisualization/engine/drawer.cpp +++ b/src/datavisualization/engine/drawer.cpp @@ -40,6 +40,11 @@ StaticLibInitializer staticLibInitializer; namespace QtDataVisualization { +/*! + * \class QtDataVisualization::Drawer + * \internal + */ + // Vertex array buffer for point const GLfloat point_data[] = {0.0f, 0.0f, 0.0f}; diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp index 3b8d837d..9a6ff6d5 100644 --- a/src/datavisualization/engine/q3dbars.cpp +++ b/src/datavisualization/engine/q3dbars.cpp @@ -27,7 +27,7 @@ namespace QtDataVisualization { /*! - * \class Q3DBars + * \class QtDataVisualization::Q3DBars * \inmodule QtDataVisualization * \brief The Q3DBars class provides methods for rendering 3D bar graphs. * \since Qt Data Visualization 1.0 @@ -351,6 +351,10 @@ const Q3DBarsPrivate *Q3DBars::dptrc() const return static_cast(d_ptr.data()); } +/*! + * \class QtDataVisualization::Q3DBarsPrivate + * \internal + */ Q3DBarsPrivate::Q3DBarsPrivate(Q3DBars *q) : QAbstract3DGraphPrivate(q) { diff --git a/src/datavisualization/engine/q3dbox.cpp b/src/datavisualization/engine/q3dbox.cpp index ce5f76b1..bbfa4ddc 100644 --- a/src/datavisualization/engine/q3dbox.cpp +++ b/src/datavisualization/engine/q3dbox.cpp @@ -23,7 +23,7 @@ namespace QtDataVisualization { /*! - \class Q3DBox + \class QtDataVisualization::Q3DBox \inmodule QtDataVisualization \brief The Q3DBox class represents an axis-aligned box in 3D space. \since Qt Data Visualization 1.0 @@ -404,13 +404,17 @@ Q3DBox Q3DBox::transformed(const QMatrix4x4& matrix) const /*! \fn bool qFuzzyCompare(const Q3DBox& box1, const Q3DBox& box2) - \relates Q3DBox + \relates QtDataVisualization::Q3DBox Returns true if \a box1 and \a box2 are almost equal; false otherwise. */ #ifndef QT_NO_DEBUG_STREAM +/*! + \fn operator<<(QDebug dbg, const Q3DBox &box) + \internal + */ QDebug operator<<(QDebug dbg, const Q3DBox &box) { if (box.isFinite()) { diff --git a/src/datavisualization/engine/q3dbox.h b/src/datavisualization/engine/q3dbox.h index e89f1cca..fcf46bdf 100644 --- a/src/datavisualization/engine/q3dbox.h +++ b/src/datavisualization/engine/q3dbox.h @@ -29,25 +29,71 @@ class Q3DBox; // Needed to circumvent an issue with qdoc. If this line is remove class QT_DATAVISUALIZATION_EXPORT Q3DBox { public: - Q3DBox(); - Q3DBox(const QVector3D& corner1, const QVector3D& corner2); + inline Q3DBox() : boxtype(Null), mincorner(0, 0, 0), maxcorner(0, 0, 0) {} + inline Q3DBox(const QVector3D& corner1, const QVector3D& corner2): boxtype(Finite), + mincorner(qMin(corner1.x(), corner2.x()), + qMin(corner1.y(), corner2.y()), + qMin(corner1.z(), corner2.z())), + maxcorner(qMax(corner1.x(), corner2.x()), + qMax(corner1.y(), corner2.y()), + qMax(corner1.z(), corner2.z())) {} + + inline bool isNull() const { return (boxtype == Null); } + inline bool isFinite() const { return (boxtype == Finite); } + inline bool isInfinite() const { return (boxtype == Infinite); } + + inline QVector3D minimum() const { return mincorner; } + inline QVector3D maximum() const { return maxcorner; } + inline void setExtents(const QVector3D& corner1, const QVector3D& corner2) + { + boxtype = Finite; + mincorner = QVector3D(qMin(corner1.x(), corner2.x()), + qMin(corner1.y(), corner2.y()), + qMin(corner1.z(), corner2.z())); + maxcorner = QVector3D(qMax(corner1.x(), corner2.x()), + qMax(corner1.y(), corner2.y()), + qMax(corner1.z(), corner2.z())); + } - bool isNull() const; - bool isFinite() const; - bool isInfinite() const; + inline void setToNull() + { + boxtype = Null; + mincorner = QVector3D(0, 0, 0); + maxcorner = QVector3D(0, 0, 0); + } - QVector3D minimum() const; - QVector3D maximum() const; - void setExtents(const QVector3D& corner1, const QVector3D& corner2); + inline void setToInfinite() + { + boxtype = Infinite; + mincorner = QVector3D(0, 0, 0); + maxcorner = QVector3D(0, 0, 0); + } - void setToNull(); - void setToInfinite(); + inline QVector3D size() const { return maxcorner - mincorner; } + inline QVector3D center() const { return (mincorner + maxcorner) * 0.5f; } - QVector3D size() const; - QVector3D center() const; + inline bool contains(const QVector3D& point) const + { + if (boxtype == Finite) { + return (point.x() >= mincorner.x() && point.x() <= maxcorner.x() && + point.y() >= mincorner.y() && point.y() <= maxcorner.y() && + point.z() >= mincorner.z() && point.z() <= maxcorner.z()); + } else if (boxtype == Infinite) { + return true; + } else { + return false; + } + } - bool contains(const QVector3D& point) const; - bool contains(const Q3DBox& box) const; + inline bool contains(const Q3DBox& box) const + { + if (box.boxtype == Finite) + return contains(box.mincorner) && contains(box.maxcorner); + else if (box.boxtype == Infinite) + return (boxtype == Infinite); + else + return false; + } bool intersects(const Q3DBox& box) const; void intersect(const Q3DBox& box); @@ -62,8 +108,19 @@ public: void transform(const QMatrix4x4& matrix); Q3DBox transformed(const QMatrix4x4& matrix) const; - bool operator==(const Q3DBox& box) const; - bool operator!=(const Q3DBox& box) const; + inline bool operator==(const Q3DBox& box) const + { + return (boxtype == box.boxtype && + mincorner == box.mincorner && + maxcorner == box.maxcorner); + } + + inline bool operator!=(const Q3DBox& box) const + { + return (boxtype != box.boxtype || + mincorner != box.mincorner || + maxcorner != box.maxcorner); + } friend bool qFuzzyCompare(const Q3DBox& box1, const Q3DBox& box2); @@ -79,89 +136,6 @@ private: QVector3D mincorner, maxcorner; }; -inline Q3DBox::Q3DBox() : boxtype(Null), mincorner(0, 0, 0), maxcorner(0, 0, 0) {} - -inline Q3DBox::Q3DBox(const QVector3D& corner1, const QVector3D& corner2) - : boxtype(Finite), - mincorner(qMin(corner1.x(), corner2.x()), - qMin(corner1.y(), corner2.y()), - qMin(corner1.z(), corner2.z())), - maxcorner(qMax(corner1.x(), corner2.x()), - qMax(corner1.y(), corner2.y()), - qMax(corner1.z(), corner2.z())) {} - -inline bool Q3DBox::isNull() const { return (boxtype == Null); } -inline bool Q3DBox::isFinite() const { return (boxtype == Finite); } -inline bool Q3DBox::isInfinite() const { return (boxtype == Infinite); } - -inline QVector3D Q3DBox::minimum() const { return mincorner; } -inline QVector3D Q3DBox::maximum() const { return maxcorner; } - -inline void Q3DBox::setExtents(const QVector3D& corner1, const QVector3D& corner2) -{ - boxtype = Finite; - mincorner = QVector3D(qMin(corner1.x(), corner2.x()), - qMin(corner1.y(), corner2.y()), - qMin(corner1.z(), corner2.z())); - maxcorner = QVector3D(qMax(corner1.x(), corner2.x()), - qMax(corner1.y(), corner2.y()), - qMax(corner1.z(), corner2.z())); -} - -inline void Q3DBox::setToNull() -{ - boxtype = Null; - mincorner = QVector3D(0, 0, 0); - maxcorner = QVector3D(0, 0, 0); -} - -inline void Q3DBox::setToInfinite() -{ - boxtype = Infinite; - mincorner = QVector3D(0, 0, 0); - maxcorner = QVector3D(0, 0, 0); -} - -inline QVector3D Q3DBox::size() const { return maxcorner - mincorner; } -inline QVector3D Q3DBox::center() const { return (mincorner + maxcorner) * 0.5f; } - -inline bool Q3DBox::contains(const QVector3D& point) const -{ - if (boxtype == Finite) { - return (point.x() >= mincorner.x() && point.x() <= maxcorner.x() && - point.y() >= mincorner.y() && point.y() <= maxcorner.y() && - point.z() >= mincorner.z() && point.z() <= maxcorner.z()); - } else if (boxtype == Infinite) { - return true; - } else { - return false; - } -} - -inline bool Q3DBox::contains(const Q3DBox& box) const -{ - if (box.boxtype == Finite) - return contains(box.mincorner) && contains(box.maxcorner); - else if (box.boxtype == Infinite) - return (boxtype == Infinite); - else - return false; -} - -inline bool Q3DBox::operator==(const Q3DBox& box) const -{ - return (boxtype == box.boxtype && - mincorner == box.mincorner && - maxcorner == box.maxcorner); -} - -inline bool Q3DBox::operator!=(const Q3DBox& box) const -{ - return (boxtype != box.boxtype || - mincorner != box.mincorner || - maxcorner != box.maxcorner); -} - inline bool qFuzzyCompare(const Q3DBox& box1, const Q3DBox& box2) { return box1.boxtype == box2.boxtype && diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp index c9460c44..a045d7bb 100644 --- a/src/datavisualization/engine/q3dcamera.cpp +++ b/src/datavisualization/engine/q3dcamera.cpp @@ -29,7 +29,7 @@ namespace QtDataVisualization { /*! - * \class Q3DCamera + * \class QtDataVisualization::Q3DCamera * \inmodule QtDataVisualization * \brief Representation of a camera in 3D space. * \since Qt Data Visualization 1.0 @@ -81,7 +81,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates Q3DCamera + * \instantiates QtDataVisualization::Q3DCamera * \brief Representation of a camera in 3D space. * * Camera3D represents a basic orbit around centerpoint 3D camera that is used when rendering the @@ -760,6 +760,10 @@ void Q3DCamera::setCameraPosition(float horizontal, float vertical, float zoom) setYRotation(vertical); } +/*! + * \class QtDataVisualization::Q3DCameraPrivate + * \internal + */ Q3DCameraPrivate::Q3DCameraPrivate(Q3DCamera *q) : q_ptr(q), m_isViewMatrixUpdateActive(true), diff --git a/src/datavisualization/engine/q3dlight.cpp b/src/datavisualization/engine/q3dlight.cpp index 73ddc0fe..6b5c456f 100644 --- a/src/datavisualization/engine/q3dlight.cpp +++ b/src/datavisualization/engine/q3dlight.cpp @@ -23,7 +23,7 @@ namespace QtDataVisualization { /*! - * \class Q3DLight + * \class QtDataVisualization::Q3DLight * \inmodule QtDataVisualization * \brief Representation of a light source in 3D space. * \since Qt Data Visualization 1.0 @@ -36,7 +36,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates Q3DLight + * \instantiates QtDataVisualization::Q3DLight * \brief Representation of a light source in 3D space. * * Light3D represents a monochrome non variable light source in 3D space. @@ -59,6 +59,10 @@ Q3DLight::~Q3DLight() { } +/*! + * \class QtDataVisualization::Q3DLightPrivate + * \internal + */ Q3DLightPrivate::Q3DLightPrivate(Q3DLight *q) : q_ptr(q) { diff --git a/src/datavisualization/engine/q3dobject.cpp b/src/datavisualization/engine/q3dobject.cpp index 1ef78add..946a41cc 100644 --- a/src/datavisualization/engine/q3dobject.cpp +++ b/src/datavisualization/engine/q3dobject.cpp @@ -23,7 +23,7 @@ namespace QtDataVisualization { /*! - \class Q3DObject + \class QtDataVisualization::Q3DObject \inmodule QtDataVisualization \brief Simple baseclass for all the objects in the 3D scene. \since Qt Data Visualization 1.0 @@ -109,6 +109,10 @@ bool Q3DObject::isDirty() const return d_ptr->m_isDirty; } +/*! + * \class QtDataVisualization::Q3DObjectPrivate + * \internal + */ Q3DObjectPrivate::Q3DObjectPrivate(Q3DObject *q) : q_ptr(q), m_isDirty(true) diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp index d6805232..99e6c096 100644 --- a/src/datavisualization/engine/q3dscatter.cpp +++ b/src/datavisualization/engine/q3dscatter.cpp @@ -26,7 +26,7 @@ namespace QtDataVisualization { /*! - * \class Q3DScatter + * \class QtDataVisualization::Q3DScatter * \inmodule QtDataVisualization * \brief The Q3DScatter class provides methods for rendering 3D scatter graphs. * \since Qt Data Visualization 1.0 @@ -241,6 +241,10 @@ QList Q3DScatter::axes() const return retList; } +/*! + * \class QtDataVisualization::Q3DScatterPrivate + * \internal + */ Q3DScatterPrivate::Q3DScatterPrivate(Q3DScatter *q) : QAbstract3DGraphPrivate(q) { diff --git a/src/datavisualization/engine/q3dscene.cpp b/src/datavisualization/engine/q3dscene.cpp index cb70876b..4712cf18 100644 --- a/src/datavisualization/engine/q3dscene.cpp +++ b/src/datavisualization/engine/q3dscene.cpp @@ -28,7 +28,7 @@ namespace QtDataVisualization { /*! - * \class Q3DScene + * \class QtDataVisualization::Q3DScene * \inmodule QtDataVisualization * \brief Q3DScene class provides description of the 3D scene being visualized. * \since Qt Data Visualization 1.0 @@ -46,12 +46,17 @@ namespace QtDataVisualization { * \note Not all visualizations support the secondary 2D slicing view. */ +/*! + * \class QtDataVisualization::Q3DSceneChangeBitField + * \internal + */ + /*! * \qmltype Scene3D * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates Q3DScene + * \instantiates QtDataVisualization::Q3DScene * \brief Scene3D type provides description of the 3D scene being visualized. * * The 3D scene contains a single active camera and a single active light source. @@ -456,6 +461,10 @@ void Q3DScene::setLightPositionRelativeToCamera(const QVector3D &relativePositio distanceModifier)); } +/*! + * \class QtDataVisualization::Q3DScenePrivate + * \internal + */ Q3DScenePrivate::Q3DScenePrivate(Q3DScene *q) : QObject(0), q_ptr(q), diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp index 84e2c455..dd5cfab6 100644 --- a/src/datavisualization/engine/q3dsurface.cpp +++ b/src/datavisualization/engine/q3dsurface.cpp @@ -26,7 +26,7 @@ namespace QtDataVisualization { /*! - * \class Q3DSurface + * \class QtDataVisualization::Q3DSurface * \inmodule QtDataVisualization * \brief The Q3DSurface class provides methods for rendering 3D surface plots. * \since Qt Data Visualization 1.0 @@ -264,6 +264,10 @@ QList Q3DSurface::axes() const /////////////////// PRIVATE /////////////////////////////////// +/*! + * \class QtDataVisualization::Q3DSurfacePrivate + * \internal + */ Q3DSurfacePrivate::Q3DSurfacePrivate(Q3DSurface *q) : QAbstract3DGraphPrivate(q) { diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp index 2d62a4ee..ef6e1de5 100644 --- a/src/datavisualization/engine/qabstract3dgraph.cpp +++ b/src/datavisualization/engine/qabstract3dgraph.cpp @@ -32,7 +32,7 @@ namespace QtDataVisualization { /*! - * \class QAbstract3DGraph + * \class QtDataVisualization::QAbstract3DGraph * \inmodule QtDataVisualization * \brief The QAbstract3DGraph class provides a window and render loop for graphs. * \since Qt Data Visualization 1.0 @@ -421,6 +421,10 @@ void QAbstract3DGraph::wheelEvent(QWheelEvent *event) d_ptr->m_visualController->wheelEvent(event); } +/*! + * \class QtDataVisualization::QAbstract3DGraphPrivate + * \internal + */ QAbstract3DGraphPrivate::QAbstract3DGraphPrivate(QAbstract3DGraph *q) : QObject(0), q_ptr(q), diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp index e6e47cb5..b2964c9c 100644 --- a/src/datavisualization/engine/scatter3dcontroller.cpp +++ b/src/datavisualization/engine/scatter3dcontroller.cpp @@ -29,6 +29,16 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::Scatter3DController + * \internal + */ + +/*! + * \class QtDataVisualization::Scatter3DChangeBitField + * \internal + */ + Scatter3DController::Scatter3DController(QRect boundRect, Q3DScene *scene) : Abstract3DController(boundRect, scene), m_renderer(0), diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp index 606f1379..d2c3eee5 100644 --- a/src/datavisualization/engine/scatter3drenderer.cpp +++ b/src/datavisualization/engine/scatter3drenderer.cpp @@ -43,6 +43,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::Scatter3DRenderer + * \internal + */ + //#define USE_UNIFORM_SCALING // Scale x and z uniformly, or based on autoscaled values const GLfloat aspectRatio = 2.0f; // Forced ratio of x and z to y. Dynamic will make it look odd. diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp index 0ce9ce22..fc2081b1 100644 --- a/src/datavisualization/engine/selectionpointer.cpp +++ b/src/datavisualization/engine/selectionpointer.cpp @@ -34,6 +34,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::SelectionPointer + * \internal + */ + const GLfloat sliceUnits = 2.5; SelectionPointer::SelectionPointer(Drawer *drawer) diff --git a/src/datavisualization/engine/seriesrendercache.cpp b/src/datavisualization/engine/seriesrendercache.cpp index 5ea9a117..98f1d19e 100644 --- a/src/datavisualization/engine/seriesrendercache.cpp +++ b/src/datavisualization/engine/seriesrendercache.cpp @@ -24,6 +24,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::SeriesRenderCache + * \internal + */ + const QString smoothString(QStringLiteral("Smooth")); SeriesRenderCache::SeriesRenderCache() diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp index 53535b9d..7ed69466 100644 --- a/src/datavisualization/engine/surface3dcontroller.cpp +++ b/src/datavisualization/engine/surface3dcontroller.cpp @@ -32,6 +32,16 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::Surface3DController + * \internal + */ + +/*! + * \class QtDataVisualization::Surface3DChangeBitField + * \internal + */ + Surface3DController::Surface3DController(QRect rect, Q3DScene *scene) : Abstract3DController(rect, scene), m_renderer(0), diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index 5f54ed79..da7656f3 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -40,6 +40,11 @@ static const int ID_TO_RGBA_MASK = 0xff; namespace QtDataVisualization { +/*! + * \class QtDataVisualization::Surface3DRenderer + * \internal + */ + //#define SHOW_DEPTH_TEXTURE_SCENE // TODO Uniform scaling is broken on surface diff --git a/src/datavisualization/global/datavisualizationglobal_p.h b/src/datavisualization/global/datavisualizationglobal_p.h index 6ceb9658..c061c05c 100644 --- a/src/datavisualization/global/datavisualizationglobal_p.h +++ b/src/datavisualization/global/datavisualizationglobal_p.h @@ -45,10 +45,10 @@ static const GLfloat defaultRatio = 1.0f / 1.6f; // default aspect ratio 16:10 static const float gridLineOffset = 0.0001f; // Offset for lifting grid lines off background // Default light position. To have shadows working correctly, light should be as far as camera, or a bit further // y position is added to the minimum height (or can be thought to be that much above or below the camera) -static const QVector3D defaultLightPos(0.0f, 0.5f, 0.0f); -static const QVector3D zeroVector(0.0f, 0.0f, 0.0f); -static const QVector3D upVector(0.0f, 1.0f, 0.0f); -static const QVector3D cameraDistanceVector(0.0f, 0.0f, cameraDistance); +static const QVector3D defaultLightPos = QVector3D(0.0f, 0.5f, 0.0f); +static const QVector3D zeroVector = QVector3D(0.0f, 0.0f, 0.0f); +static const QVector3D upVector = QVector3D(0.0f, 1.0f, 0.0f); +static const QVector3D cameraDistanceVector = QVector3D(0.0f, 0.0f, cameraDistance); // Skip color == selection texture's background color static const QVector3D selectionSkipColor = QVector3D(255.0f, 255.0f, 255.0f); diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp index 80e02d5e..0a79db27 100644 --- a/src/datavisualization/input/q3dinputhandler.cpp +++ b/src/datavisualization/input/q3dinputhandler.cpp @@ -35,7 +35,7 @@ const int farZoomRangeDivider = 120; const float rotationSpeed = 100.0f; /*! - * \class Q3DInputHandler + * \class QtDataVisualization::Q3DInputHandler * \inmodule QtDataVisualization * \brief Basic wheel mouse based input handler. * \since Qt Data Visualization 1.0 @@ -190,4 +190,9 @@ void Q3DInputHandler::wheelEvent(QWheelEvent *event) scene()->activeCamera()->setZoomLevel(zoomLevel); } +/*! + * \class QtDataVisualization::Q3DInputHandlerPrivate + * \internal + */ + } diff --git a/src/datavisualization/input/q3dinputhandler.h b/src/datavisualization/input/q3dinputhandler.h index cca2f983..7b5f3aca 100644 --- a/src/datavisualization/input/q3dinputhandler.h +++ b/src/datavisualization/input/q3dinputhandler.h @@ -23,7 +23,7 @@ namespace QtDataVisualization { -class Q3DInputHandler; // Workaround for qdoc bug, removing this will cause qdoc compiler to not find the class. +class Q3DInputHandlerPrivate; class QT_DATAVISUALIZATION_EXPORT Q3DInputHandler : public QAbstract3DInputHandler { @@ -41,6 +41,8 @@ public: private: Q_DISABLE_COPY(Q3DInputHandler) + + QScopedPointer *d_ptr; }; } diff --git a/src/datavisualization/input/qabstract3dinputhandler.cpp b/src/datavisualization/input/qabstract3dinputhandler.cpp index 9e599535..32f60a6c 100644 --- a/src/datavisualization/input/qabstract3dinputhandler.cpp +++ b/src/datavisualization/input/qabstract3dinputhandler.cpp @@ -20,7 +20,7 @@ namespace QtDataVisualization { /*! - * \class QAbstract3DInputHandler + * \class QtDataVisualization::QAbstract3DInputHandler * \inmodule QtDataVisualization * \brief The base class for implementations of input handlers. * \since Qt Data Visualization 1.0 @@ -55,7 +55,7 @@ namespace QtDataVisualization { * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates QAbstract3DInputHandler + * \instantiates QtDataVisualization::QAbstract3DInputHandler * \brief Base type for all QtDataVisualization input handlers. * * This type is uncreatable. @@ -228,6 +228,10 @@ QPoint QAbstract3DInputHandler::previousInputPos() const } +/*! + * \class QtDataVisualization::QAbstract3DInputHandlerPrivate + * \internal + */ QAbstract3DInputHandlerPrivate::QAbstract3DInputHandlerPrivate(QAbstract3DInputHandler *q) : q_ptr(q), m_prevDistance(0), diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp index 0dd5b469..f5be97df 100644 --- a/src/datavisualization/input/qtouch3dinputhandler.cpp +++ b/src/datavisualization/input/qtouch3dinputhandler.cpp @@ -36,7 +36,7 @@ const int minZoomLevel = 10; const int maxZoomLevel = 500; /*! - * \class QTouch3DInputHandler + * \class QtDataVisualization::QTouch3DInputHandler * \inmodule QtDataVisualization * \brief Basic touch display based input handler. * \since Qt Data Visualization 1.0 @@ -129,6 +129,10 @@ void QTouch3DInputHandler::touchEvent(QTouchEvent *event) } } +/*! + * \class QtDataVisualization::QTouch3DInputHandlerPrivate + * \internal + */ QTouch3DInputHandlerPrivate::QTouch3DInputHandlerPrivate(QTouch3DInputHandler *q) : q_ptr(q), m_holdTimer(0) diff --git a/src/datavisualization/theme/q3dtheme.cpp b/src/datavisualization/theme/q3dtheme.cpp index aec39637..c1915073 100644 --- a/src/datavisualization/theme/q3dtheme.cpp +++ b/src/datavisualization/theme/q3dtheme.cpp @@ -22,7 +22,7 @@ namespace QtDataVisualization { /*! - * \class Q3DTheme + * \class QtDataVisualization::Q3DTheme * \inmodule QtDataVisualization * \brief Q3DTheme class provides a visual style for graphs. * \since Qt Data Visualization 1.0 @@ -208,12 +208,17 @@ namespace QtDataVisualization { * A user-defined theme. See \l {Properties controlled by theme} for theme defaults. */ +/*! + * \class QtDataVisualization::Q3DThemeDirtyBitField + * \internal + */ + /*! * \qmltype Theme3D * \inqmlmodule QtDataVisualization * \since QtDataVisualization 1.0 * \ingroup datavisualization_qml - * \instantiates Q3DTheme + * \instantiates QtDataVisualization::Q3DTheme * \brief A visual style for graphs. * * This type is used to specify visual properties that affect the whole graph. There are several @@ -890,6 +895,10 @@ Q3DTheme::Theme Q3DTheme::type() const // Q3DThemePrivate +/*! + * \class QtDataVisualization::Q3DThemePrivate + * \internal + */ Q3DThemePrivate::Q3DThemePrivate(Q3DTheme *q) : QObject(0), m_themeId(Q3DTheme::ThemeUserDefined), diff --git a/src/datavisualization/theme/thememanager.cpp b/src/datavisualization/theme/thememanager.cpp index ab3eecc8..c695bd76 100644 --- a/src/datavisualization/theme/thememanager.cpp +++ b/src/datavisualization/theme/thememanager.cpp @@ -21,6 +21,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::ThemeManager + * \internal + */ + const float defaultBuiltInColorLevel = 0.7f; // for built-in gradient themes const float defaultColorLevel = 0.5f; // for built-in uniform themes diff --git a/src/datavisualization/utils/abstractobjecthelper.cpp b/src/datavisualization/utils/abstractobjecthelper.cpp index 3192648f..fd2921a0 100644 --- a/src/datavisualization/utils/abstractobjecthelper.cpp +++ b/src/datavisualization/utils/abstractobjecthelper.cpp @@ -22,6 +22,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::AbstractObjectHelper + * \internal + */ + AbstractObjectHelper::AbstractObjectHelper() : m_vertexbuffer(0), m_normalbuffer(0), diff --git a/src/datavisualization/utils/camerahelper.cpp b/src/datavisualization/utils/camerahelper.cpp index 9a07e783..1e9ce648 100644 --- a/src/datavisualization/utils/camerahelper.cpp +++ b/src/datavisualization/utils/camerahelper.cpp @@ -24,6 +24,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::CameraHelper + * \internal + */ + CameraHelper::CameraHelper(QObject *parent) : QObject(parent), m_position(0, 0.25, 3), diff --git a/src/datavisualization/utils/meshloader.cpp b/src/datavisualization/utils/meshloader.cpp index 08e56c39..d8d74ec9 100644 --- a/src/datavisualization/utils/meshloader.cpp +++ b/src/datavisualization/utils/meshloader.cpp @@ -28,6 +28,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::MeshLoader + * \internal + */ + QString slashTag = QStringLiteral("/"); bool MeshLoader::loadOBJ(const QString &path, diff --git a/src/datavisualization/utils/objecthelper.cpp b/src/datavisualization/utils/objecthelper.cpp index ce8f598a..f6a7ef40 100644 --- a/src/datavisualization/utils/objecthelper.cpp +++ b/src/datavisualization/utils/objecthelper.cpp @@ -25,6 +25,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::ObjectHelper + * \internal + */ + ObjectHelper::ObjectHelper(const QString &objectFile) : m_objectFile(objectFile) { diff --git a/src/datavisualization/utils/shaderhelper.cpp b/src/datavisualization/utils/shaderhelper.cpp index 6fcd2bd2..895d2bd9 100644 --- a/src/datavisualization/utils/shaderhelper.cpp +++ b/src/datavisualization/utils/shaderhelper.cpp @@ -22,6 +22,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::ShaderHelper + * \internal + */ + void discardDebugMsgs(QtMsgType type, const QMessageLogContext &context, const QString &msg) { Q_UNUSED(type) diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp index 1e00df0a..0fbec6dc 100644 --- a/src/datavisualization/utils/surfaceobject.cpp +++ b/src/datavisualization/utils/surfaceobject.cpp @@ -26,6 +26,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::SurfaceObject + * \internal + */ + SurfaceObject::SurfaceObject() { m_indicesType = GL_UNSIGNED_INT; diff --git a/src/datavisualization/utils/texturehelper.cpp b/src/datavisualization/utils/texturehelper.cpp index fc42b518..ecfb6aec 100644 --- a/src/datavisualization/utils/texturehelper.cpp +++ b/src/datavisualization/utils/texturehelper.cpp @@ -26,6 +26,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::TextureHelper + * \internal + */ + TextureHelper::TextureHelper() { initializeOpenGLFunctions(); diff --git a/src/datavisualization/utils/utils.cpp b/src/datavisualization/utils/utils.cpp index 69dbf92d..2a38c8f2 100644 --- a/src/datavisualization/utils/utils.cpp +++ b/src/datavisualization/utils/utils.cpp @@ -28,6 +28,11 @@ namespace QtDataVisualization { +/*! + * \class QtDataVisualization::Utils + * \internal + */ + #define NUM_IN_POWER(y, x) for (;y