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/surface/doc/src/surface.qdoc | |
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/surface/doc/src/surface.qdoc')
-rw-r--r-- | examples/datavisualization/surface/doc/src/surface.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/datavisualization/surface/doc/src/surface.qdoc b/examples/datavisualization/surface/doc/src/surface.qdoc index e1cc8263..01743c61 100644 --- a/examples/datavisualization/surface/doc/src/surface.qdoc +++ b/examples/datavisualization/surface/doc/src/surface.qdoc @@ -52,7 +52,7 @@ \include examples-run.qdocinc - \section1 Creating the application + \section1 Creating the Application First, in \c main.cpp, we create a QApplication, instantiate Q3DSurface, and a window container for it: @@ -73,7 +73,7 @@ signals from widgets into methods in \c surfacegraph.cpp. Next chapter explains more about using Q3DSurface. - \section1 Setting up proxies and data + \section1 Setting up Proxies and Data First we instantiate a new QSurfaceDataProxy and attach it to a new QSurface3DSeries: @@ -109,7 +109,7 @@ \snippet surface/surfacegraph.cpp 4 - \section1 Selection modes + \section1 Selection Modes Q3Dsurface supports three different selection modes. These are demonstrated in the example with radio buttons, which the user can use to activate a suitable selection mode. @@ -117,7 +117,7 @@ \snippet surface/surfacegraph.h 0 - \section1 Axis ranges for studying the graph + \section1 Axis Ranges for Studying the Graph The example has four slider controls for adjusting the min and max values for X and Z axis. When selecting the proxy these sliders are adjusted so that one step on the slider @@ -138,7 +138,7 @@ \snippet surface/surfacegraph.cpp 6 - \section1 Custom surface gradients + \section1 Custom Surface Gradients The example demonstrates the custom surface gradients with two push buttons. The gradient can be defined with QLinearGradient where the desired colors are set to positions. The following |