diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-18 14:19:33 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-18 14:37:50 +0200 |
| commit | 5273db8cbc592ee5d2da767e3a8e873f2a83784f (patch) | |
| tree | bc2573b712d79d93344612b3f4acbaa04ccf33c4 /examples | |
| parent | ea0442bc81ae034d22c5742b6075dee993fdd54d (diff) | |
Fix minor cosmetic issues in examples
Task-id: QTRD-2741
Change-Id: Ifdd49bc9541c2893a7c6f3629cde12e2d15ad7c0
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qmlcustominput/qml/qmlcustominput/main.qml | 2 | ||||
| -rw-r--r-- | examples/scatter/doc/src/scatter.qdoc | 2 | ||||
| -rw-r--r-- | examples/scatter/scatterdatamodifier.cpp | 1 | ||||
| -rw-r--r-- | examples/surface/surfacegraph.cpp | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/examples/qmlcustominput/qml/qmlcustominput/main.qml b/examples/qmlcustominput/qml/qmlcustominput/main.qml index f777fd6b..2a235986 100644 --- a/examples/qmlcustominput/qml/qmlcustominput/main.qml +++ b/examples/qmlcustominput/qml/qmlcustominput/main.qml @@ -182,7 +182,7 @@ Item { id: cameraToggle Layout.fillHeight: true Layout.minimumWidth: parent.width / 3 - text: "Animate Camera" + text: "Pause Camera" onClicked: { cameraAnimationX.paused = !cameraAnimationX.paused; diff --git a/examples/scatter/doc/src/scatter.qdoc b/examples/scatter/doc/src/scatter.qdoc index 173ea6e3..9bef441c 100644 --- a/examples/scatter/doc/src/scatter.qdoc +++ b/examples/scatter/doc/src/scatter.qdoc @@ -80,7 +80,7 @@ \snippet ../examples/scatter/scatterdatamodifier.cpp 1 And finally we create a QScatterDataProxy and the associated QScatter3DSeries. We set custom label format - for the series and add it to the graph: + and mesh smoothing for the series and add it to the graph: \snippet ../examples/scatter/scatterdatamodifier.cpp 2 diff --git a/examples/scatter/scatterdatamodifier.cpp b/examples/scatter/scatterdatamodifier.cpp index ade4eb59..6cdb1458 100644 --- a/examples/scatter/scatterdatamodifier.cpp +++ b/examples/scatter/scatterdatamodifier.cpp @@ -57,6 +57,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) QScatterDataProxy *proxy = new QScatterDataProxy; QScatter3DSeries *series = new QScatter3DSeries(proxy); series->setItemLabelFormat("@xTitle: @xLabel @yTitle: @yLabel @zTitle: @zLabel"); + series->setMeshSmooth(m_smooth); m_graph->addSeries(series); //! [2] diff --git a/examples/surface/surfacegraph.cpp b/examples/surface/surfacegraph.cpp index 24ab3715..7ebb6b72 100644 --- a/examples/surface/surfacegraph.cpp +++ b/examples/surface/surfacegraph.cpp @@ -49,6 +49,7 @@ SurfaceGraph::SurfaceGraph(Q3DSurface *surface) QImage heightMapImage(":/maps/mountain"); m_heightMapProxy = new QHeightMapSurfaceDataProxy(heightMapImage); m_heightMapSeries = new QSurface3DSeries(m_heightMapProxy); + m_heightMapSeries->setItemLabelFormat(QStringLiteral("(@xLabel, @zLabel): @yLabel")); m_heightMapProxy->setValueRanges(34.0f, 40.0f, 18.0f, 24.0f); //! [2] m_heightMapWidth = heightMapImage.width(); |