From 7206dc36f1be77515cf6759795b265c986b2e20b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= <tomi.korpipaa@digia.com>
Date: Mon, 3 Mar 2014 13:34:07 +0200
Subject: Disallow clearing all draw flags

Task-number: QTRD-2907

Change-Id: I89a45971bf67c533ecfe477cd685812c46574dd8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
---
 .../qmlsurface/qml/qmlsurface/main.qml               | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'examples/datavisualization')

diff --git a/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml b/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml
index c38c3146..f11d15f3 100644
--- a/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml
+++ b/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml
@@ -97,6 +97,8 @@ Rectangle {
                 onFlatShadingSupportedChanged: {
                     flatShadingToggle.text = "Flat not supported"
                 }
+
+                onDrawModeChanged: checkState()
             }
             //! [4]
             Surface3DSeries {
@@ -113,6 +115,8 @@ Rectangle {
                     minXValue: 67
                     maxXValue: 97
                 }
+
+                onDrawModeChanged: checkState()
             }
             //! [4]
         }
@@ -135,11 +139,9 @@ Rectangle {
                 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]
@@ -155,11 +157,9 @@ Rectangle {
                 if (surfaceSeries.drawMode & Surface3DSeries.DrawSurface) {
                     surfaceSeries.drawMode &= ~Surface3DSeries.DrawSurface;
                     heightSeries.drawMode &= ~Surface3DSeries.DrawSurface;
-                    text = "Show Surface"
                 } else {
                     surfaceSeries.drawMode |= Surface3DSeries.DrawSurface;
                     heightSeries.drawMode |= Surface3DSeries.DrawSurface;
-                    text = "Hide Surface"
                 }
             }
             //! [8]
@@ -242,4 +242,16 @@ Rectangle {
             //! [3]
         }
     }
+
+    function checkState() {
+        if (surfaceSeries.drawMode & Surface3DSeries.DrawSurface)
+            surfaceToggle.text = "Hide Surface"
+        else
+            surfaceToggle.text = "Show Surface"
+
+        if (surfaceSeries.drawMode & Surface3DSeries.DrawWireframe)
+            surfaceGridToggle.text = "Hide Surface Grid"
+        else
+            surfaceGridToggle.text = "Show Surface Grid"
+    }
 }
-- 
cgit v1.2.3