Misc fixes

+ Rectangle used as main item in qml examples to make ui consistent
+ Surface autoaxis adjustment fixes for multiseries case
+ Qmlsurface example UI tweaks

Change-Id: Ie75b0efc08f9a56ca709f079b28865e34caa8641
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

8 files changed, 46 insertions, 55 deletions

diff --git a/examples/datavisualization/qmlbars/qml/qmlbars/main.qml b/examples/datavisualization/qmlbars/qml/qmlbars/main.qml
index 0ff060ca..3711a504 100644
--- a/examples/datavisualization/qmlbars/qml/qmlbars/main.qml
+++ b/examples/datavisualization/qmlbars/qml/qmlbars/main.qml
@@ -23,7 +23,7 @@ import QtDataVisualization 1.0
 import QtQuick.Window 2.0
 import "."
 
-Item {
+Rectangle {
     id: mainview
     width: 1280
     height: 1024
diff --git a/examples/datavisualization/qmlcustominput/qml/qmlcustominput/main.qml b/examples/datavisualization/qmlcustominput/qml/qmlcustominput/main.qml
index cfac0f15..6fb213ce 100644
--- a/examples/datavisualization/qmlcustominput/qml/qmlcustominput/main.qml
+++ b/examples/datavisualization/qmlcustominput/qml/qmlcustominput/main.qml
@@ -21,7 +21,7 @@ import QtQuick.Layouts 1.0
 import QtDataVisualization 1.0
 import "."
 
-Item {
+Rectangle {
     id: mainView
     width: 1280
     height: 720
@@ -168,7 +168,7 @@ Item {
 
             onClicked: {
                 if (scatterGraph.shadowQuality === AbstractGraph3D.ShadowQualityNone) {
-                    scatterGraph.shadowQuality = AbstractGraph3D.ShadowQualitySoftMedium;
+                    scatterGraph.shadowQuality = AbstractGraph3D.ShadowQualityMedium;
                     text = "Hide Shadows";
                 } else {
                     scatterGraph.shadowQuality = AbstractGraph3D.ShadowQualityNone;
diff --git a/examples/datavisualization/qmllegend/qml/qmllegend/main.qml b/examples/datavisualization/qmllegend/qml/qmllegend/main.qml
index 6c488d6a..6999a67b 100644
--- a/examples/datavisualization/qmllegend/qml/qmllegend/main.qml
+++ b/examples/datavisualization/qmllegend/qml/qmllegend/main.qml
@@ -22,7 +22,7 @@ import QtQuick.Layouts 1.0
 import QtDataVisualization 1.0
 import "."
 
-Item {
+Rectangle {
     id: mainView
     width: 800
     height: 600
diff --git a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml
index 45fdc9c0..aef76823 100644
--- a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml
+++ b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml
@@ -21,7 +21,7 @@ import QtQuick.Layouts 1.0
 import QtDataVisualization 1.0
 import "."
 
-Item {
+Rectangle {
     id: mainView
     width: 800
     height: 600
diff --git a/examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc b/examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc
index 177cf7c1..06dfa8cc 100644
--- a/examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc
+++ b/examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc
@@ -70,17 +70,11 @@
     The last \c import just imports all the qml files in the same directory as our \c {main.qml},
     because that's where \c NewButton.qml and \c Data.qml are.
 
-    Then we create our main \c Item and call it \c mainView:
+    Then we create our main \c Rectangle and call it \c mainView:
 
     \snippet qmlscatter/qml/qmlscatter/main.qml 1
 
-    \note The Qt Creator application wizard will set a \c Rectangle item as the main item, which
-    is opaque white by default. This doesn't work for an application using Qt Data Visualization graphs,
-    because the graphs are rendered behind the other QML elements. When creating a new application,
-    you should change the main item type to \c Item instead, which is invisible.
-    This way the graph is not covered by the main item.
-
-    Then we'll add another \c Item inside the main \c Item, and call it \c dataView.
+    Then we'll add another \c Item inside the main \c Rectangle, and call it \c dataView.
     This will be the item to hold the Scatter3D graph. We'll anchor it to the parent bottom:
 
     \snippet qmlscatter/qml/qmlscatter/main.qml 9
diff --git a/examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml b/examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml
index beb4ccaa..69cb2834 100644
--- a/examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml
+++ b/examples/datavisualization/qmlscatter/qml/qmlscatter/main.qml
@@ -24,7 +24,7 @@ import "."
 //! [0]
 
 //! [1]
-Item {
+Rectangle {
     id: mainView
     //! [1]
 
diff --git a/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml b/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml
index 1fcedeea..9ace244d 100644
--- a/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml
+++ b/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml
@@ -21,12 +21,11 @@ import QtQuick.Layouts 1.0
 import QtDataVisualization 1.0
 import "."
 
-Item {
+Rectangle {
     id: mainview
     width: 1280
     height: 720
 
-    property int buttonMaximumWidth: surfaceGridToggle.width
     property int buttonMinimumHeight: seriesToggle.height
 
     Data {
@@ -35,9 +34,10 @@ Item {
 
     Item {
         id: surfaceView
-        width: mainview.width - buttonLayout.width
+        width: mainview.width
         height: mainview.height
-        anchors.right: mainview.right;
+        anchors.top: buttonLayout.bottom
+        anchors.left: mainview.left
 
         //! [0]
         ColorGradient {
@@ -49,7 +49,7 @@ Item {
         //! [0]
 
         Surface3D {
-            id: surfaceplot
+            id: surfacePlot
             width: surfaceView.width
             height: surfaceView.height
             //! [7]
@@ -99,35 +99,35 @@ Item {
                     flatShadingToggle.text = "Flat not supported"
                 }
             }
+            //! [4]
+            Surface3DSeries {
+                id: heightSeries
+                flatShadingEnabled: false
+                drawMode: Surface3DSeries.DrawSurface
+                visible: false
+
+                HeightMapSurfaceDataProxy {
+                    heightMapFile: ":/heightmaps/image"
+                    // We don't want the default data values set by heightmap proxy.
+                    minZValue: 30
+                    maxZValue: 60
+                    minXValue: 67
+                    maxXValue: 97
+                }
+            }
+            //! [4]
         }
     }
 
-    // TODO: Kept outside until surface supports multiple added series (QTRD-2579)
-    //! [4]
-    Surface3DSeries {
-        id: heightSeries
-        flatShadingEnabled: false
-        drawMode: Surface3DSeries.DrawSurface
-
-        HeightMapSurfaceDataProxy {
-            heightMapFile: ":/heightmaps/image"
-            // We don't want the default data values set by heightmap proxy.
-            minZValue: 30
-            maxZValue: 60
-            minXValue: 67
-            maxXValue: 97
-        }
-    }
-    //! [4]
-    ColumnLayout {
+    RowLayout {
         id: buttonLayout
+        width: parent.width
         anchors.top: parent.top
         anchors.left: parent.left
         spacing: 0
 
         NewButton {
             id: surfaceGridToggle
-            Layout.maximumWidth: buttonMaximumWidth
             Layout.fillWidth: true
             Layout.minimumHeight: buttonMinimumHeight
             text: "Show Surface Grid"
@@ -148,7 +148,6 @@ Item {
 
         NewButton {
             id: surfaceToggle
-            Layout.maximumWidth: buttonMaximumWidth
             Layout.fillWidth: true
             Layout.minimumHeight: buttonMinimumHeight
             text: "Hide Surface"
@@ -169,7 +168,6 @@ Item {
 
         NewButton {
             id: flatShadingToggle
-            Layout.maximumWidth: buttonMaximumWidth
             Layout.fillWidth: true
             Layout.minimumHeight: buttonMinimumHeight
 
@@ -192,16 +190,15 @@ Item {
 
         NewButton {
             id: backgroundToggle
-            Layout.maximumWidth: buttonMaximumWidth
             Layout.fillWidth: true
             Layout.minimumHeight: buttonMinimumHeight
             text: "Hide Background"
             onClicked: {
-                if (surfaceplot.theme.backgroundEnabled === true) {
-                    surfaceplot.theme.backgroundEnabled = false;
+                if (surfacePlot.theme.backgroundEnabled === true) {
+                    surfacePlot.theme.backgroundEnabled = false;
                     text = "Show Background"
                 } else {
-                    surfaceplot.theme.backgroundEnabled = true;
+                    surfacePlot.theme.backgroundEnabled = true;
                     text = "Hide Background"
                 }
             }
@@ -209,16 +206,15 @@ Item {
 
         NewButton {
             id: gridToggle
-            Layout.maximumWidth: buttonMaximumWidth
             Layout.fillWidth: true
             Layout.minimumHeight: buttonMinimumHeight
             text: "Hide Grid"
             onClicked: {
-                if (surfaceplot.theme.gridEnabled === true) {
-                    surfaceplot.theme.gridEnabled = false;
+                if (surfacePlot.theme.gridEnabled === true) {
+                    surfacePlot.theme.gridEnabled = false;
                     text = "Show Grid"
                 } else {
-                    surfaceplot.theme.gridEnabled = true;
+                    surfacePlot.theme.gridEnabled = true;
                     text = "Hide Grid"
                 }
             }
@@ -226,20 +222,21 @@ Item {
 
         NewButton {
             id: seriesToggle
-            Layout.maximumWidth: buttonMaximumWidth
             Layout.fillWidth: true
             Layout.minimumHeight: buttonMinimumHeight
             text: "Switch to Height Map Series"
             //! [3]
             onClicked: {
-                if (surfaceplot.seriesList[0] === heightSeries) {
-                    surfaceplot.axisY.max = 500.0
-                    surfaceplot.seriesList = [surfaceSeries]
+                if (surfaceSeries.visible === false) {
+                    surfacePlot.axisY.max = 500.0
+                    surfaceSeries.visible = true
+                    heightSeries.visible = false
                     middleGradient.position = 0.25
                     text = "Switch to Height Map Series"
                 } else {
-                    surfaceplot.axisY.max = 250.0
-                    surfaceplot.seriesList = [heightSeries]
+                    surfacePlot.axisY.max = 250.0
+                    surfaceSeries.visible = false
+                    heightSeries.visible = true
                     middleGradient.position = 0.50
                     text = "Switch to Item Model Series"
                 }
diff --git a/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml b/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml
index bd68ff69..2fe5f57a 100644
--- a/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml
+++ b/examples/datavisualization/qmlsurfacelayers/qml/qmlsurfacelayers/main.qml
@@ -22,7 +22,7 @@ import QtQuick.Controls 1.0
 import QtDataVisualization 1.0
 import "."
 
-Item {
+Rectangle {
     id: mainview
     width: 1280
     height: 720