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/rotations/doc | |
| 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/rotations/doc')
| -rw-r--r-- | examples/datavisualization/rotations/doc/src/rotations.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/datavisualization/rotations/doc/src/rotations.qdoc b/examples/datavisualization/rotations/doc/src/rotations.qdoc index d28b872c..52db3c67 100644 --- a/examples/datavisualization/rotations/doc/src/rotations.qdoc +++ b/examples/datavisualization/rotations/doc/src/rotations.qdoc @@ -47,7 +47,7 @@ \include examples-run.qdocinc - \section1 Using rotations + \section1 Using Rotations In this example we want to orient the arrow items tangentially to the origin. This requires rotating them, which can be achieved by specifying rotation quaternion to each item: @@ -60,7 +60,7 @@ for Y-axis and one for Z-axis, and then multiply these together to get the total rotation, which we set to the data item. - \section1 Using custom item meshes + \section1 Using Custom Item Meshes The narrow arrow mesh we use for magnetic field arrow items is not a standard mesh. Instead we supply our own \c{narrowarrow.obj} file which contains the object definition for the mesh @@ -68,7 +68,7 @@ \snippet rotations/scatterdatamodifier.cpp 3 - \section1 Using range gradient + \section1 Using Range Gradient Setting the color style to range gradient in a series means that the item is colored according to its relative Y-value on the visible Y-coordinate range. We want the arrows on the bottom @@ -77,5 +77,5 @@ \snippet rotations/scatterdatamodifier.cpp 4 - \section1 Example contents + \section1 Example Contents */ |