summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-02-11 14:28:37 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-02-11 14:38:35 +0200
commitda3a9d21f5dbbc50d6db9cde81a96f7af9bba093 (patch)
tree28ea9a36598300591ee1ca28a04d079fcb2ce074
parent64acaf065f8f04b78713196fec4d71993f858053 (diff)
Remove mentions about only supporting single surface
Change-Id: I3daec1f80eb0c984c1ecc6e3defe81c795dd0077 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
-rw-r--r--examples/surface/doc/src/surface.qdoc3
-rw-r--r--src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc2
-rw-r--r--src/datavisualization/engine/q3dsurface.cpp10
3 files changed, 3 insertions, 12 deletions
diff --git a/examples/surface/doc/src/surface.qdoc b/examples/surface/doc/src/surface.qdoc
index bf53192f..5397b503 100644
--- a/examples/surface/doc/src/surface.qdoc
+++ b/examples/surface/doc/src/surface.qdoc
@@ -86,8 +86,7 @@
code. First we set the decorative issues like enable the grid for the surface and
select the flat shading mode. Next lines define the axis label format and value
ranges. Finally we make sure the correct series is added to the
- graph. We need to first remove the other series, since surface graphs only support a single
- series at a time:
+ graph:
\snippet ../examples/surface/surfacegraph.cpp 3
diff --git a/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc b/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc
index 0cc2a5ab..576496b9 100644
--- a/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization-qml-surface3d.qdoc
@@ -88,13 +88,11 @@
* This property holds the series of the graph.
* By default, this property contains an empty list.
* To set the series, either use the addSeries() function or define them as children of the graph.
- * \note The surface graph currently supports only a single series at a time.
*/
/*!
* \qmlmethod void Surface3D::addSeries(Surface3DSeries series)
* Adds the \a series to the graph.
- * \note The surface graph currently supports only a single series at a time.
*/
/*!
diff --git a/src/datavisualization/engine/q3dsurface.cpp b/src/datavisualization/engine/q3dsurface.cpp
index 5705cc30..7724cb24 100644
--- a/src/datavisualization/engine/q3dsurface.cpp
+++ b/src/datavisualization/engine/q3dsurface.cpp
@@ -32,8 +32,8 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
* \since Qt Data Visualization 1.0
*
* This class enables developers to render 3D surface plots and to view them by rotating the scene
- * freely. The surface plotting includes also gridline that can be set on or off.
- * The visual appearance of the surface can be changed by controlling the smooth status.
+ * freely. The visual properties of the surface such as draw mode and shading can be controlled
+ * via QSurface3DSeries.
*
* The Q3DSurface supports selection by showing a highlighted ball on the data point where the user has clicked
* with left mouse button (when default input handler is in use) or selected via QSurface3DSeries.
@@ -49,8 +49,6 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
* 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.
*
- * Q3DSurface supports only single series at a time.
- *
* \section1 How to construct a minimal Q3DSurface graph
*
* First, construct Q3DSurface. Since we are running the graph as top level window
@@ -113,8 +111,6 @@ Q3DSurface::~Q3DSurface()
/*!
* Adds the \a series to the graph.
- *
- * \note The surface graph currently supports only a single series at a time.
*/
void Q3DSurface::addSeries(QSurface3DSeries *series)
{
@@ -131,8 +127,6 @@ void Q3DSurface::removeSeries(QSurface3DSeries *series)
/*!
* \return list of series added to this graph.
- *
- * \note The surface graph currently supports only a single series at a time.
*/
QList<QSurface3DSeries *> Q3DSurface::seriesList() const
{