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/qmlcustominput/doc/src/qmlcustominput.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/qmlcustominput/doc/src/qmlcustominput.qdoc')
| -rw-r--r-- | examples/datavisualization/qmlcustominput/doc/src/qmlcustominput.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/datavisualization/qmlcustominput/doc/src/qmlcustominput.qdoc b/examples/datavisualization/qmlcustominput/doc/src/qmlcustominput.qdoc index 4685790a..5c29939f 100644 --- a/examples/datavisualization/qmlcustominput/doc/src/qmlcustominput.qdoc +++ b/examples/datavisualization/qmlcustominput/doc/src/qmlcustominput.qdoc @@ -42,7 +42,7 @@ \include examples-run.qdocinc - \section1 Removing default input handling + \section1 Removing Default Input Handling The default input handling mechanism is disabled by setting the inputHandler property to null. @@ -51,7 +51,7 @@ \snippet qmlcustominput/qml/qmlcustominput/main.qml 1 \dots 0 - \section1 Implementing custom selection handling + \section1 Implementing Custom Selection Handling The on mouseover selection handling is implemented using standard MouseArea to capture the mouse events. The mouse area is configured to capture hover events and has two custom properties for \c mouseX and \c mouseY @@ -68,7 +68,7 @@ \snippet qmlcustominput/qml/qmlcustominput/main.qml 4 - \section1 Implementing custom zoom handling + \section1 Implementing Custom Zoom Handling The camera has a zoom factor that represents amount of zoom in percentages. In this example the zoom range is limited between 10% and 500%. This range is then divided to four subranges where angleDelta is scaled to different amount of zoom change @@ -78,7 +78,7 @@ \snippet qmlcustominput/qml/qmlcustominput/main.qml 5 \dots - \section1 Implementing custom camera handling + \section1 Implementing Custom Camera Handling The camera is animated to constantly rotate around the graph with two animations. The rotation around the graph is done with a simple NumberAnimation that just increments during 20 seconds from 0 degrees to 360 degrees and sets the \l Q3DCamera::xRotation property. |