diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-25 09:46:24 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-25 12:39:56 +0200 |
commit | e7e01ec065d3874d28e9e28d213783c4275d8813 (patch) | |
tree | cae322801171a81362477d0a4156f451ae8cc450 /src/datavisualization/engine | |
parent | 8b55f6d7a7d8772553d7d2cc3647fb7465b9dc32 (diff) |
Fix documentation related to multiseries changes.
Also fixed some other miscellaneous issues.
Task-number: QTRD-2558
Change-Id: I2da3f7e64fbbbb287ddb7845cb0a15006dc4d6f5
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/engine')
-rw-r--r-- | src/datavisualization/engine/abstract3drenderer.cpp | 4 | ||||
-rw-r--r-- | src/datavisualization/engine/bars3dcontroller.cpp | 4 | ||||
-rw-r--r-- | src/datavisualization/engine/q3dbars.cpp | 11 | ||||
-rw-r--r-- | src/datavisualization/engine/q3dscatter.cpp | 6 | ||||
-rw-r--r-- | src/datavisualization/engine/q3dscene.cpp | 15 | ||||
-rw-r--r-- | src/datavisualization/engine/q3dscene.h | 2 | ||||
-rw-r--r-- | src/datavisualization/engine/q3dsurface.cpp | 8 | ||||
-rw-r--r-- | src/datavisualization/engine/q3dsurface.h | 1 | ||||
-rw-r--r-- | src/datavisualization/engine/surface3dcontroller.cpp | 4 | ||||
-rw-r--r-- | src/datavisualization/engine/surface3dcontroller_p.h | 1 |
10 files changed, 27 insertions, 29 deletions
diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp index cd4f15b8..f9295865 100644 --- a/src/datavisualization/engine/abstract3drenderer.cpp +++ b/src/datavisualization/engine/abstract3drenderer.cpp @@ -178,11 +178,11 @@ void Abstract3DRenderer::updateScene(Q3DScene *scene) { updateInputPosition(scene->selectionQueryPosition()); - if (Q3DScene::noSelectionPoint() == scene->selectionQueryPosition()) { + if (Q3DScene::invalidSelectionPoint() == scene->selectionQueryPosition()) { updateSelectionState(SelectNone); } else { // Selections are one-shot, reset selection active to false before processing - scene->setSelectionQueryPosition(Q3DScene::noSelectionPoint()); + scene->setSelectionQueryPosition(Q3DScene::invalidSelectionPoint()); if (scene->isSlicingActive()) { if (scene->isPointInPrimarySubView(m_inputPosition)) diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp index e1a038cb..f289de46 100644 --- a/src/datavisualization/engine/bars3dcontroller.cpp +++ b/src/datavisualization/engine/bars3dcontroller.cpp @@ -204,8 +204,8 @@ void Bars3DController::handleSeriesVisibilityChangedBySender(QObject *sender) QPoint Bars3DController::invalidSelectionPosition() { - static QPoint noSelectionPos(-1, -1); - return noSelectionPos; + static QPoint invalidSelectionPos(-1, -1); + return invalidSelectionPos; } void Bars3DController::setAxisX(Q3DAbstractAxis *axis) diff --git a/src/datavisualization/engine/q3dbars.cpp b/src/datavisualization/engine/q3dbars.cpp index 00eb145c..93901811 100644 --- a/src/datavisualization/engine/q3dbars.cpp +++ b/src/datavisualization/engine/q3dbars.cpp @@ -46,8 +46,8 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * These default axes can be modified via axis accessors, but as soon any axis is set explicitly * for the orientation, the default axis for that orientation is destroyed. * - * Q3DBars supports more than one series visible at the same time, but all series added to the - * graph must have proxies with identical row and column counts for the graph to draw properly. + * Q3DBars supports more than one series visible at the same time. It is not necessary for all series + * to have the same amount of rows and columns. * Row and column labels are taken from the first added series, unless explicitly defined to * row and column axes. * @@ -67,8 +67,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * * \snippet doc_src_q3dbars_construction.cpp 0 * - * Now Q3DBars is ready to receive data to be rendered. Add one row of 5 qreals into the data - * set: + * Now Q3DBars is ready to receive data to be rendered. Create a series with one row of 5 values: * * \snippet doc_src_q3dbars_construction.cpp 1 * @@ -96,7 +95,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE */ /*! - * Constructs a new 3D bar window. + * Constructs a new 3D bar graph. */ Q3DBars::Q3DBars() : d_ptr(new Q3DBarsPrivate(this, geometry())) @@ -138,7 +137,7 @@ Q3DBars::Q3DBars() } /*! - * Destroys the 3D bar window. + * Destroys the 3D bar graph. */ Q3DBars::~Q3DBars() { diff --git a/src/datavisualization/engine/q3dscatter.cpp b/src/datavisualization/engine/q3dscatter.cpp index f336bda3..d32c8ca2 100644 --- a/src/datavisualization/engine/q3dscatter.cpp +++ b/src/datavisualization/engine/q3dscatter.cpp @@ -55,7 +55,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * * \snippet doc_src_q3dscatter_construction.cpp 0 * - * Now Q3DScatter is ready to receive data to be rendered. Add one set of 3 QVector3D items: + * Now Q3DScatter is ready to receive data to be rendered. Add one series of 3 QVector3D items: * * \snippet doc_src_q3dscatter_construction.cpp 1 * @@ -79,7 +79,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE */ /*! - * Constructs a new 3D scatter window. + * Constructs a new 3D scatter graph. */ Q3DScatter::Q3DScatter() : d_ptr(new Q3DScatterPrivate(this, geometry())) @@ -121,7 +121,7 @@ Q3DScatter::Q3DScatter() } /*! - * Destroys the 3D scatter window. + * Destroys the 3D scatter graph. */ Q3DScatter::~Q3DScatter() { diff --git a/src/datavisualization/engine/q3dscene.cpp b/src/datavisualization/engine/q3dscene.cpp index 71e3c5a3..46b374cf 100644 --- a/src/datavisualization/engine/q3dscene.cpp +++ b/src/datavisualization/engine/q3dscene.cpp @@ -180,9 +180,9 @@ void Q3DScene::setSecondarySubViewport(const QRect &secondarySubViewport) /*! * \property Q3DScene::selectionQueryPosition * This property contains the coordinates for the user input that should be processed - * by the scene as selection. If this is set to value other than Q3DScene()::noSelectionPoint() the + * by the scene as selection. If this is set to value other than Q3DScene()::invalidSelectionPoint() the * graph tries to select a data item at the given \a point within the main viewport. - * After the rendering pass the property is returned to its default state of Q3DScene()::noSelectionPoint(). + * After the rendering pass the property is returned to its default state of Q3DScene()::invalidSelectionPoint(). */ void Q3DScene::setSelectionQueryPosition(const QPoint &point) { @@ -199,10 +199,13 @@ QPoint Q3DScene::selectionQueryPosition() const return d_ptr->m_selectionQueryPosition; } -const QPoint Q3DScene::noSelectionPoint() +/*! + * \return a QPoint signifying an invalid selection position. + */ +const QPoint Q3DScene::invalidSelectionPoint() { - static const QPoint noSelectionPos(-1, -1); - return noSelectionPos; + static const QPoint invalidSelectionPos(-1, -1); + return invalidSelectionPos; } /*! @@ -369,7 +372,7 @@ Q3DScenePrivate::Q3DScenePrivate(Q3DScene *q) : m_light(), m_isUnderSideCameraEnabled(false), m_isSlicingActive(false), - m_selectionQueryPosition(Q3DScene::noSelectionPoint()) + m_selectionQueryPosition(Q3DScene::invalidSelectionPoint()) { } diff --git a/src/datavisualization/engine/q3dscene.h b/src/datavisualization/engine/q3dscene.h index 5f034687..52de85bb 100644 --- a/src/datavisualization/engine/q3dscene.h +++ b/src/datavisualization/engine/q3dscene.h @@ -61,7 +61,7 @@ public: void setSelectionQueryPosition(const QPoint &point); QPoint selectionQueryPosition() const; - static const QPoint noSelectionPoint(); + static const QPoint invalidSelectionPoint(); void setSlicingActive(bool isSlicing); bool isSlicingActive() const; diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp index 1655c338..664f76e7 100644 --- a/src/datavisualization/engine/q3dsurface.cpp +++ b/src/datavisualization/engine/q3dsurface.cpp @@ -68,7 +68,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE * * \snippet doc_src_q3dsurface_construction.cpp 2 * - * For the active data proxy set pointer of the data element: + * Create a new series and set data to it: * * \snippet doc_src_q3dsurface_construction.cpp 3 * @@ -92,7 +92,7 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE */ /*! - * Constructs a new 3D surface window. + * Constructs a new 3D surface graph. */ Q3DSurface::Q3DSurface() : d_ptr(new Q3DSurfacePrivate(this, geometry())) @@ -107,8 +107,6 @@ Q3DSurface::Q3DSurface() &Q3DSurface::themeChanged); QObject::connect(d_ptr->m_shared, &Abstract3DController::shadowQualityChanged, this, &Q3DSurface::shadowQualityChanged); - QObject::connect(d_ptr->m_shared, &Surface3DController::surfaceVisibleChanged, this, - &Q3DSurface::surfaceVisibleChanged); QObject::connect(d_ptr->m_shared, &Abstract3DController::gridVisibleChanged, this, &Q3DSurface::gridVisibleChanged); QObject::connect(d_ptr->m_shared, &Abstract3DController::backgroundVisibleChanged, this, @@ -124,7 +122,7 @@ Q3DSurface::Q3DSurface() } /*! - * Destroys the 3D surface window. + * Destroys the 3D surface graph. */ Q3DSurface::~Q3DSurface() { diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h index 9bc04f78..e34bdad3 100644 --- a/src/datavisualization/engine/q3dsurface.h +++ b/src/datavisualization/engine/q3dsurface.h @@ -104,7 +104,6 @@ signals: void labelStyleChanged(QDataVis::LabelStyle style); void themeChanged(Q3DTheme *theme); void shadowQualityChanged(QDataVis::ShadowQuality quality); - void surfaceVisibleChanged(bool visible); void gridVisibleChanged(bool visible); void backgroundVisibleChanged(bool visible); void smoothSurfaceEnabledChanged(bool enabled); diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp index 31c8b178..b1271c50 100644 --- a/src/datavisualization/engine/surface3dcontroller.cpp +++ b/src/datavisualization/engine/surface3dcontroller.cpp @@ -130,8 +130,8 @@ void Surface3DController::handleSeriesVisibilityChangedBySender(QObject *sender) QPoint Surface3DController::invalidSelectionPosition() { - static QPoint noSelectionPoint(-1, -1); - return noSelectionPoint; + static QPoint invalidSelectionPoint(-1, -1); + return invalidSelectionPoint; } void Surface3DController::addSeries(QAbstract3DSeries *series) diff --git a/src/datavisualization/engine/surface3dcontroller_p.h b/src/datavisualization/engine/surface3dcontroller_p.h index 56419d75..7a0b7f0e 100644 --- a/src/datavisualization/engine/surface3dcontroller_p.h +++ b/src/datavisualization/engine/surface3dcontroller_p.h @@ -109,7 +109,6 @@ public slots: signals: void smoothSurfaceEnabledChanged(bool enable); - void surfaceVisibleChanged(bool visible); void surfaceGridEnabledChanged(bool enable); private: |