diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:47:32 +0100 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2016-12-12 12:23:04 +0200 |
| commit | 54910f8cf827d6f9474de9f6f88b3a158a058c56 (patch) | |
| tree | f8b425821436f02d099299799f794d26345e0d5a /examples/datavisualization/scatter/doc/src/scatter.qdoc | |
| parent | 470330e69b7ee34beb27ed905fcb923d9cfdae31 (diff) | |
| parent | 21c82c7e0db0a567c11ed80eac955d86ad0e1dff (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
tests/auto/cpptest/q3dscene/tst_scene.cpp
tests/auto/qmltest/scene3d/tst_scene.qml
Change-Id: I0aef5e7d8fe202e7f4c7565922938d1627ab8124
Diffstat (limited to 'examples/datavisualization/scatter/doc/src/scatter.qdoc')
| -rw-r--r-- | examples/datavisualization/scatter/doc/src/scatter.qdoc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/examples/datavisualization/scatter/doc/src/scatter.qdoc b/examples/datavisualization/scatter/doc/src/scatter.qdoc index e7733ca5..1b574ef6 100644 --- a/examples/datavisualization/scatter/doc/src/scatter.qdoc +++ b/examples/datavisualization/scatter/doc/src/scatter.qdoc @@ -47,7 +47,9 @@ \image scatter-example.png - \section1 Creating the application + \include examples-run.qdocinc + + \section1 Creating the Application First, in main.cpp, we create a QApplication, instantiate Q3DScatter, and a window container for it: @@ -76,7 +78,7 @@ \snippet scatter/main.cpp 3 - \section1 Setting up the graph + \section1 Setting up the Graph Let's set up some visual qualities for the graph in the constructor of the \c ScatterDataModifier class we instantiated in the application main: @@ -93,7 +95,7 @@ That concludes setting up the graph. - \section1 Adding data to the graph + \section1 Adding Data to the Graph The last thing we do in the \c ScatterDataModifier constructor is to add data to the graph: @@ -121,7 +123,7 @@ Now our graph has the data and is ready to be used. There isn't much interaction yet, though, so let's continue by adding some widgets to play with. - \section1 Using widgets to control the graph + \section1 Using Widgets to Control the Graph First, back in the application main, we'll create some widgets: @@ -153,5 +155,5 @@ \li Label font \endlist - \section1 Example contents + \section1 Example Contents */ |