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/qmlsurface/doc/src/qmlsurface.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/qmlsurface/doc/src/qmlsurface.qdoc')
| -rw-r--r-- | examples/datavisualization/qmlsurface/doc/src/qmlsurface.qdoc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/examples/datavisualization/qmlsurface/doc/src/qmlsurface.qdoc b/examples/datavisualization/qmlsurface/doc/src/qmlsurface.qdoc index 55ec2bdd..f0a9f3f7 100644 --- a/examples/datavisualization/qmlsurface/doc/src/qmlsurface.qdoc +++ b/examples/datavisualization/qmlsurface/doc/src/qmlsurface.qdoc @@ -42,7 +42,9 @@ we skip explaining the application creation. For more detailed QML example documentation, see \l{Qt Quick 2 Scatter Example}. - \section1 Adding data to the graph + \include examples-run.qdocinc + + \section1 Adding Data to the Graph This example shows two methods to set data to surface graph, using the HeightMapSurfaceDataProxy and ItemModelSurfaceDataProxy. First we go through setting the data using the height map specific @@ -73,7 +75,7 @@ \dots 0 \snippet qmlsurface/qml/qmlsurface/main.qml 6 - \section1 Showing data + \section1 Showing Data In the \c main.qml, we set up the Surface3D element to show the data and various UI elements to illustrate few interesting features. @@ -115,5 +117,5 @@ 250 on height map proxy to show exaggerated height. At the same time the middle color position on the gradient is modified to match the value range change. - \section1 Example contents + \section1 Example Contents */ |