diff options
| author | Mika Salmela <mika.salmela@digia.com> | 2013-12-12 15:02:07 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-13 08:18:01 +0200 |
| commit | 132502c16e8ccb6d6fc627e2b5f6f89838d88c8e (patch) | |
| tree | 03ffd9e3721f435f99ec30cb90b4b77523076aea /examples/qmlsurface/qml/qmlsurface | |
| parent | be2532151087d48802836bea0cb5a5658cf3492a (diff) | |
Control for surface visibility features
Task-number: QTRD-2628
Change-Id: Ic03e2a71231665c478a918044ebd3e5b2d22b445
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'examples/qmlsurface/qml/qmlsurface')
| -rw-r--r-- | examples/qmlsurface/qml/qmlsurface/main.qml | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/examples/qmlsurface/qml/qmlsurface/main.qml b/examples/qmlsurface/qml/qmlsurface/main.qml index 03393c05..3b46446f 100644 --- a/examples/qmlsurface/qml/qmlsurface/main.qml +++ b/examples/qmlsurface/qml/qmlsurface/main.qml @@ -74,7 +74,7 @@ Item { Surface3DSeries { id: surfaceSeries flatShadingEnabled: false - surfaceGridEnabled: false + drawMode: Surface3DSeries.DrawSurface ItemModelSurfaceDataProxy { itemModel: surfaceData.model @@ -94,7 +94,7 @@ Item { Surface3DSeries { id: heightSeries flatShadingEnabled: false - surfaceGridEnabled: false + drawMode: Surface3DSeries.DrawSurface HeightMapSurfaceDataProxy { heightMapFile: ":/heightmaps/image" @@ -114,14 +114,14 @@ Item { text: "Show Surface Grid" //! [1] onClicked: { - if (surfaceSeries.surfaceGridEnabled === false) { - surfaceSeries.surfaceGridEnabled = true; - heightSeries.surfaceGridEnabled = true; - text = "Hide Surface Grid" - } else { - surfaceSeries.surfaceGridEnabled = false; - heightSeries.surfaceGridEnabled = false; + if (surfaceSeries.drawMode & Surface3DSeries.DrawWireframe) { + surfaceSeries.drawMode &= ~Surface3DSeries.DrawWireframe; + heightSeries.drawMode &= ~Surface3DSeries.DrawWireframe; text = "Show Surface Grid" + } else { + surfaceSeries.drawMode |= Surface3DSeries.DrawWireframe; + heightSeries.drawMode |= Surface3DSeries.DrawWireframe; + text = "Hide Surface Grid" } } //! [1] @@ -133,13 +133,13 @@ Item { width: surfaceGridToggle.width text: "Hide Surface" onClicked: { - if (surfaceSeries.visible === true) { - surfaceSeries.visible = false; - heightSeries.visible = false; + if (surfaceSeries.drawMode & Surface3DSeries.DrawSurface) { + surfaceSeries.drawMode &= ~Surface3DSeries.DrawSurface; + heightSeries.drawMode &= ~Surface3DSeries.DrawSurface; text = "Show Surface" } else { - surfaceSeries.visible = true; - heightSeries.visible = true; + surfaceSeries.drawMode |= Surface3DSeries.DrawSurface; + heightSeries.drawMode |= Surface3DSeries.DrawSurface; text = "Hide Surface" } } |