Item size per series for scatter

Task-number: QTRD-2568

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

2 files changed, 56 insertions, 7 deletions

diff --git a/examples/qmlscatter/qml/qmlscatter/data.qml b/examples/qmlscatter/qml/qmlscatter/data.qml
index b8b2a77b..e5e7d11f 100644
--- a/examples/qmlscatter/qml/qmlscatter/data.qml
+++ b/examples/qmlscatter/qml/qmlscatter/data.qml
@@ -23,6 +23,8 @@ Item {
     //! [3]
     property alias model: dataModel
     //! [3]
+    property alias modelTwo: dataModelTwo
+    property alias modelThree: dataModelThree
 
     //! [0]
     ListModel {
@@ -51,7 +53,10 @@ Item {
         ListElement{ xPos: -7.9 ; yPos: 3.4 ; zPos: -2.78 }
         ListElement{ xPos: -7.4 ; yPos: 3.12 ; zPos: -3.1 }
         ListElement{ xPos: -7.54 ; yPos: 2.8 ; zPos: -3.68 }
+    }
 
+    ListModel {
+        id: dataModelTwo
         ListElement{ xPos: 2.25 ; yPos: 1.36 ; zPos: -1.3 }
         ListElement{ xPos: -2 ; yPos: -0.08 ; zPos: 1 }
         ListElement{ xPos: 2.65 ; yPos: -1.2 ; zPos: 2.7 }
@@ -1052,7 +1057,10 @@ Item {
         ListElement{ xPos: 0.85 ; yPos: -2.92 ; zPos: 3.4 }
         ListElement{ xPos: -0.7 ; yPos: 2.52 ; zPos: 1 }
         ListElement{ xPos: -3.4 ; yPos: 0.6 ; zPos: 0.9 }
+    }
 
+    ListModel {
+        id: dataModelThree
         ListElement{ xPos: 8.0; yPos: -2.0; zPos: 4.0 }
         ListElement{ xPos: 7.8; yPos: -2.2; zPos: 5.0 }
         ListElement{ xPos: 7.6; yPos: -2.4; zPos: 4.5 }
diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml
index 636239bf..179980be 100644
--- a/examples/qmlscatter/qml/qmlscatter/main.qml
+++ b/examples/qmlscatter/qml/qmlscatter/main.qml
@@ -30,10 +30,18 @@ Item {
 
     //! [4]
     Data {
-        id: graphData
+        id: seriesOneData
     }
     //! [4]
 
+    Data {
+        id: seriesTwoData
+    }
+
+    Data {
+        id: seriesThreeData
+    }
+
     //! [8]
     //! [9]
     Item {
@@ -69,13 +77,20 @@ Item {
             axisY.subSegmentCount: 2
             axisY.labelFormat: "%.2f"
             //! [6]
+            // TODO: Remove once QTRD-2605 is fixed
+            axisX.min: -10
+            axisX.max: 10
+            axisY.min: -5
+            axisY.max: 5
+            axisZ.min: -5
+            axisZ.max: 5
             //! [5]
             Scatter3DSeries {
                 id: scatterSeries
-                itemLabelFormat: "X:@xLabel Y:@yLabel Z:@zLabel"
+                itemLabelFormat: "Series 1: X:@xLabel Y:@yLabel Z:@zLabel"
 
                 ItemModelScatterDataProxy {
-                    itemModel: graphData.model
+                    itemModel: seriesOneData.model
                     xPosRole: "xPos"
                     yPosRole: "yPos"
                     zPosRole: "zPos"
@@ -83,6 +98,32 @@ Item {
             }
 
             //! [5]
+            Scatter3DSeries {
+                id: scatterSeriesTwo
+                itemLabelFormat: "Series 2: X:@xLabel Y:@yLabel Z:@zLabel"
+                itemSize: 0.1
+                mesh: Abstract3DSeries.MeshCube
+
+                ItemModelScatterDataProxy {
+                    itemModel: seriesTwoData.modelTwo
+                    xPosRole: "xPos"
+                    yPosRole: "yPos"
+                    zPosRole: "zPos"
+                }
+            }
+            Scatter3DSeries {
+                id: scatterSeriesThree
+                itemLabelFormat: "Series 3: X:@xLabel Y:@yLabel Z:@zLabel"
+                itemSize: 0.2
+                mesh: Abstract3DSeries.MeshMinimal
+
+                ItemModelScatterDataProxy {
+                    itemModel: seriesThreeData.modelThree
+                    xPosRole: "xPos"
+                    yPosRole: "yPos"
+                    zPosRole: "zPos"
+                }
+            }
         }
     }
 
@@ -106,14 +147,14 @@ Item {
     NewButton {
         id: smoothToggle
         width: parent.width / 6
-        text: "Use Smooth Dots"
+        text: "Use Smooth for Series One"
         anchors.left: shadowToggle.right
         onClicked: {
             if (scatterSeries.meshSmooth === false) {
-                text = "Use Flat Dots";
+                text = "Use Flat for Series One";
                 scatterSeries.meshSmooth = true;
             } else {
-                text = "Use Smooth Dots"
+                text = "Use Smooth for Series One"
                 scatterSeries.meshSmooth = false;
             }
         }
@@ -142,7 +183,7 @@ Item {
             if (scatterGraph.theme.type === Theme3D.ThemeArmyBlue) {
                 // Ownership of the theme is transferred and old theme is destroyed when setting
                 // a new one, so we need to create them dynamically
-                scatterGraph.theme = Qt.createQmlObject('import QtDataVisualization 1.0; Theme3D {type: Theme3D.ThemeIsabelle}', parent);
+                scatterGraph.theme = Qt.createQmlObject('import QtDataVisualization 1.0; Theme3D {type: Theme3D.ThemeIsabelle; font.family: "Lucida Handwriting"; font.pointSize: 40}', parent);
             } else {
                 scatterGraph.theme = Qt.createQmlObject('import QtDataVisualization 1.0; Theme3D {type: Theme3D.ThemeArmyBlue}', parent);
             }