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/qmlaxisdrag | |
| 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/qmlaxisdrag')
| -rw-r--r-- | examples/datavisualization/qmlaxisdrag/doc/src/qmlaxisdrag.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/datavisualization/qmlaxisdrag/doc/src/qmlaxisdrag.qdoc b/examples/datavisualization/qmlaxisdrag/doc/src/qmlaxisdrag.qdoc index 564e837f..43bb7251 100644 --- a/examples/datavisualization/qmlaxisdrag/doc/src/qmlaxisdrag.qdoc +++ b/examples/datavisualization/qmlaxisdrag/doc/src/qmlaxisdrag.qdoc @@ -42,7 +42,7 @@ \include examples-run.qdocinc - \section1 Overriding default input handling + \section1 Overriding Default Input Handling First we deactivate the default input handling mechanism by setting the active input handler of Scatter3D graph to \c{null}: @@ -73,7 +73,7 @@ \dots 0 \snippet qmlaxisdrag/qml/qmlaxisdrag/main.qml 4 - \section1 Translating mouse movement to axis range change + \section1 Translating Mouse Movement to Axis Range Change in \c scatterGraph we will need to listen to \c onSelectedElementChanged signal. The signal is emitted after the selection query has been made in the \c{onPressed} of \c{inputArea}. We @@ -99,7 +99,7 @@ For a more sophisticated conversion from mouse movement to axis range update, see \l{Axis Range Dragging With Labels Example}{this example}. - \section1 Other features + \section1 Other Features The example also demonstrates how to use orthographic projection and how to update properties of a custom item on the fly. @@ -119,5 +119,5 @@ \snippet qmlaxisdrag/qml/qmlaxisdrag/main.qml 10 \dots - \section1 Example contents + \section1 Example Contents */ |