diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-08 11:30:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-08 11:46:38 +0100 |
| commit | 3f5c27908314074f177454ddcb1c18fce123fa6c (patch) | |
| tree | 4fca1ae043413014e997a04a562e7ee6b4ae9270 /examples/datavisualization/texturesurface | |
| parent | 779f6d8c23e75f12a830a4229db55f28ad1537b7 (diff) | |
| parent | 90aff7026205d71efde65f1783a06af82e528287 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
examples/datavisualization/bars/doc/src/bars.qdoc
examples/datavisualization/custominput/doc/src/custominput.qdoc
examples/datavisualization/customitems/doc/src/customitems.qdoc
examples/datavisualization/draggableaxes/doc/src/draggableaxes.qdoc
examples/datavisualization/itemmodel/doc/src/itemmodel.qdoc
examples/datavisualization/qmlaxisdrag/doc/src/qmlaxisdrag.qdoc
examples/datavisualization/qmlaxisformatter/doc/src/qmlaxisformatter.qdoc
examples/datavisualization/qmlcustominput/doc/src/qmlcustominput.qdoc
examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc
examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc
examples/datavisualization/qmlspectrogram/doc/src/qmlspectrogram.qdoc
examples/datavisualization/qmlsurface/doc/src/qmlsurface.qdoc
examples/datavisualization/qmlsurfacelayers/doc/src/qmlsurfacelayers.qdoc
examples/datavisualization/rotations/doc/src/rotations.qdoc
examples/datavisualization/scatter/doc/src/scatter.qdoc
examples/datavisualization/surface/doc/src/surface.qdoc
examples/datavisualization/texturesurface/doc/src/texturesurface.qdoc
examples/datavisualization/volumetric/doc/src/volumetric.qdoc
src/datavisualization/doc/src/qtdatavisualization.qdoc
Change-Id: Ic15e77b1fee0708a235bf21815f72b854981537a
Diffstat (limited to 'examples/datavisualization/texturesurface')
| -rw-r--r-- | examples/datavisualization/texturesurface/doc/src/texturesurface.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/datavisualization/texturesurface/doc/src/texturesurface.qdoc b/examples/datavisualization/texturesurface/doc/src/texturesurface.qdoc index 2388a3a2..3de11983 100644 --- a/examples/datavisualization/texturesurface/doc/src/texturesurface.qdoc +++ b/examples/datavisualization/texturesurface/doc/src/texturesurface.qdoc @@ -47,7 +47,7 @@ \include examples-run.qdocinc - \section1 Texture to a surface series + \section1 Texture to a Surface Series The image to be set as a texture to a surface can be set using QSurface3DSeries::setTextureFile(). In this example we have added a check box to control if the texture is set or not. The @@ -57,7 +57,7 @@ \snippet texturesurface/surfacegraph.cpp 0 - \section1 Topographic surface series + \section1 Topographic Surface Series The topographic data for this example is obtained from National Land Survey of Finland. It provides a product called \c{Elevation Model 2 m}, which was suitable for our needs. We selected @@ -78,7 +78,7 @@ And then the actual decoding. \snippet texturesurface/topographicseries.cpp 1 - \section1 Use custom input handler to enable zooming and panning + \section1 Use Custom Input Handler to Enable Zooming and Panning For the panning the implementation is similar to the \l{Axis Range Dragging With Labels Example}. The difference is that in this example we follow only dragging of X and Z axis and we don't @@ -100,7 +100,7 @@ \snippet texturesurface/custominputhandler.cpp 2 - \section1 Highlight an area of the surface + \section1 Highlight an Area of the Surface The main idea on creating a highlight on the surface is to create a copy of the series and add a bit of offset to the y value. On this example the class \c HighlightSeries implements the @@ -117,7 +117,7 @@ \snippet texturesurface/highlightseries.cpp 1 - \section1 A gradient to the highlight series + \section1 A Gradient to the Highlight Series Since the \c HighlightSeries is QSurface3DSeries, we can use all the decoration methods series can have. In this example we added a gradient to emphasize the elevation. Because the suitable gradient |