From e7e01ec065d3874d28e9e28d213783c4275d8813 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 25 Nov 2013 09:46:24 +0200 Subject: Fix documentation related to multiseries changes. Also fixed some other miscellaneous issues. Task-number: QTRD-2558 Change-Id: I2da3f7e64fbbbb287ddb7845cb0a15006dc4d6f5 Reviewed-by: Mika Salmela --- src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp | 4 +++- .../doc/snippets/doc_src_q3dscatter_construction.cpp | 4 +++- .../doc/snippets/doc_src_q3dsurface_construction.cpp | 4 +++- src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src/datavisualization/doc/snippets') diff --git a/src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp b/src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp index 7c47183c..6d855ecb 100644 --- a/src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp +++ b/src/datavisualization/doc/snippets/doc_src_q3dbars_construction.cpp @@ -33,9 +33,11 @@ int main(int argc, char **argv) bars.columnAxis()->setRange(0, 4); //! [0] //! [1] + QBar3DSeries *series = new QBar3DSeries; QBarDataRow *data = new QBarDataRow; *data << 1.0 << 3.0 << 7.5 << 5.0 << 2.2; - bars.activeDataProxy()->addRow(data); + series->dataProxy()->addRow(data); + bars.addSeries(series); //! [1] //! [2] bars.show(); diff --git a/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp b/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp index cce43fec..949afadc 100644 --- a/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp +++ b/src/datavisualization/doc/snippets/doc_src_q3dscatter_construction.cpp @@ -29,9 +29,11 @@ int main(int argc, char **argv) Q3DScatter scatter; //! [0] //! [1] + QScatter3DSeries *series = new QScatter3DSeries; QScatterDataArray data; data << QVector3D(0.5f, 0.5f, 0.5f) << QVector3D(-0.3f, -0.5f, -0.4f) << QVector3D(0.0f, -0.3f, 0.2f); - scatter.activeDataProxy()->addItems(data); + series->dataProxy()->addItems(data); + scatter.addSeries(series); //! [1] //! [2] scatter.show(); diff --git a/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp b/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp index 67587efc..d0833ca2 100644 --- a/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp +++ b/src/datavisualization/doc/snippets/doc_src_q3dsurface_construction.cpp @@ -41,7 +41,9 @@ int main(int argc, char **argv) //! [2] //! [3] - surface.activeDataProxy()->resetArray(data); + QSurface3DSeries *series = new QSurface3DSeries; + series->dataProxy()->resetArray(data); + surface.addSeries(series); //! [3] //! [4] surface.show(); diff --git a/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp b/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp index d32bde0e..e0a9fa58 100644 --- a/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp +++ b/src/datavisualization/doc/snippets/doc_src_qtdatavisualization.cpp @@ -116,5 +116,5 @@ for (int i = 0; i < 10; i++) { } newProxy->resetArray(dataArray); -graph->setActiveDataProxy(newProxy); +graph->addSeries(new QBar3DSeries(newProxy)); //! [10] -- cgit v1.2.3