QML: Invokables to properties

Task-number: QTRD-2188

Change-Id: Id0edd2c1fb98621c0b3bf590ff1f0b7239fd7225
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

1 files changed, 124 insertions, 25 deletions

diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml
index 7decbb10..6238529d 100644
--- a/examples/qmlscatter/qml/qmlscatter/main.qml
+++ b/examples/qmlscatter/qml/qmlscatter/main.qml
@@ -41,13 +41,6 @@ Item {
 
         ListModel {
             id: dataModel
-            ListElement{ xPos: -1.0; yPos: 4.3; zPos: -0.5 }
-            ListElement{ xPos: 1.0; yPos: 0.105; zPos: 0.5 }
-            ListElement{ xPos: 0.5; yPos: -4.65; zPos: -0.5 }
-            ListElement{ xPos: -0.5; yPos: 0.225; zPos: 0.5 }
-            ListElement{ xPos: 0.0; yPos: 0.0; zPos: 0.0 }
-            ListElement{ xPos: 0.0; yPos: 2.0; zPos: 0.0 }
-            ListElement{ xPos: 0.0; yPos: -2.0; zPos: 0.0 }
             ListElement{ xPos: -10.0; yPos: 4.9; zPos: -5.0 }
             ListElement{ xPos: 10.0; yPos: 4.9; zPos: -5.0 }
             ListElement{ xPos: -10.0; yPos: 4.9; zPos: 5.0 }
@@ -56,6 +49,25 @@ Item {
             ListElement{ xPos: 10.0; yPos: -4.9; zPos: -5.0 }
             ListElement{ xPos: -10.0; yPos: -4.9; zPos: 5.0 }
             ListElement{ xPos: 10.0; yPos: -4.9; zPos: 5.0 }
+
+            ListElement{ xPos: -1.0; yPos: 0.3; zPos: -0.5 }
+            ListElement{ xPos: 1.0; yPos: 2.105; zPos: 0.5 }
+            ListElement{ xPos: 0.5; yPos: -0.65; zPos: -0.5 }
+            ListElement{ xPos: -0.5; yPos: 1.225; zPos: 0.5 }
+            ListElement{ xPos: 0.0; yPos: 0.0; zPos: 0.0 }
+            ListElement{ xPos: 0.0; yPos: 2.0; zPos: 0.0 }
+            ListElement{ xPos: 0.0; yPos: -0.5; zPos: 0.0 }
+
+            ListElement{ xPos: 6.0; yPos: 0.0; zPos: 4.0 }
+            ListElement{ xPos: 5.8; yPos: 0.2; zPos: 5.0 }
+            ListElement{ xPos: 5.6; yPos: 0.4; zPos: 4.5 }
+            ListElement{ xPos: 5.4; yPos: 0.6; zPos: 3.8 }
+            ListElement{ xPos: 5.2; yPos: 0.8; zPos: 4.8 }
+            ListElement{ xPos: 5.0; yPos: 0.3; zPos: 4.1 }
+            ListElement{ xPos: 4.9; yPos: -0.3; zPos: 4.9 }
+            ListElement{ xPos: 4.7; yPos: -0.5; zPos: 3.5 }
+            ListElement{ xPos: 4.5; yPos: -0.7; zPos: 3.3 }
+            ListElement{ xPos: 4.3; yPos: -0.4; zPos: 3.7 }
         }
 
         Scatter3D {
@@ -64,47 +76,134 @@ Item {
             height: dataView.height
             fontSize: 30.0
             mapping: scatterMapping
+            shadowQuality: Scatter3D.ShadowNone
+            selectionMode: Scatter3D.ModeItem
+            labelTransparency: Scatter3D.TransparencyNoBackground
 
             Component.onCompleted: {
                 console.log("testscatter complete");
-                shadowQuality = Scatter3D.ShadowNone
-                selectionMode = Scatter3D.ModeItem
-                labelTransparency = Scatter3D.TransparencyNoBackground
                 data = dataModel
             }
         }
     }
 
-    Component.onCompleted: {
-        console.log("mainview complete");
-    }
-
     Rectangle {
         id: shadowToggle
-        color: "#FFFFFF"
-        x: 0
-        y: 0
-        width: parent.width
-        height: 60
+        width: 120
+        height: 30
 
         TextArea {
-            id: buttonText
-            text: "Toggle Shadows"
+            id: shadowText
+            text: "Toggle Shadows On"
             anchors.fill: parent
-            textColor: "#000000"
         }
 
         MouseArea {
             anchors.fill: parent
             onClicked: {
                 if (testscatter.shadowQuality === Scatter3D.ShadowNone) {
-                    testscatter.shadowQuality = Scatter3D.ShadowLow;
-                    buttonText.textColor = "#999999";
+                    testscatter.shadowQuality = Scatter3D.ShadowMedium;
+                    shadowText.text = "Toggle Shadows Off";
                 } else {
                     testscatter.shadowQuality = Scatter3D.ShadowNone;
-                    buttonText.textColor = "#000000";
+                    shadowText.text = "Toggle Shadows On";
+                }
+            }
+        }
+    }
+    Rectangle {
+        id: smoothToggle
+        width: 140
+        height: 30
+        anchors.left: shadowToggle.right
+
+        TextArea {
+            id: smoothText
+            text: "Toggle Smooth Objects On"
+            anchors.fill: parent
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+                if (testscatter.objectSmooth === false) {
+                    smoothText.text = "Toggle Smooth Objects Off"
+                    testscatter.objectSmooth = true;
+                } else {
+                    smoothText.text = "Toggle Smooth Objects On"
+                    testscatter.objectSmooth = false;
+                }
+            }
+        }
+    }
+    Rectangle {
+        id: cameraToggle
+        width: 130
+        height: 30
+        anchors.left: smoothToggle.right
+
+        TextArea {
+            text: "Toggle Camera Preset"
+            anchors.fill: parent
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+                if (testscatter.cameraPreset === Scatter3D.PresetFront) {
+                    testscatter.cameraPreset = Scatter3D.PresetIsometricRightHigh;
+                } else {
+                    testscatter.cameraPreset = Scatter3D.PresetFront;
                 }
             }
         }
     }
+    Rectangle {
+        id: themeToggle
+        width: 120
+        height: 30
+        anchors.left: cameraToggle.right
+
+        TextArea {
+            text: "Toggle Theme"
+            anchors.fill: parent
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+                if (testscatter.theme === Scatter3D.ThemeBlueCerulean) {
+                    testscatter.theme = Scatter3D.ThemeSystem;
+                } else {
+                    testscatter.theme = Scatter3D.ThemeBlueCerulean;
+                }
+            }
+        }
+    }
+    Rectangle {
+        id: backgroundToggle
+        width: 130
+        height: 30
+        anchors.left: themeToggle.right
+
+        TextArea {
+            id: backgroundText
+            text: "Toggle Background Off"
+            anchors.fill: parent
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: {
+                if (testscatter.backgroundVisible === true) {
+                    testscatter.backgroundVisible = false;
+                    backgroundText.text = "Toggle Background On";
+                } else {
+                    testscatter.backgroundVisible = true;
+                    backgroundText.text = "Toggle Background Off";
+                }
+            }
+        }
+    }
+
 }