Updated plugins.qmltypes and Specifics.qml

Task-number: QTRD-3011
Task-number: QTRD-3140
Change-Id: Ie69e750b233eb3b20ef505b2c145943a32d20f6d
Change-Id: Ie69e750b233eb3b20ef505b2c145943a32d20f6d
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

3 files changed, 38 insertions, 2 deletions

diff --git a/src/datavisualizationqml2/designer/Scatter3DSpecifics.qml b/src/datavisualizationqml2/designer/Scatter3DSpecifics.qml
index 26c49f9b..1e2556ec 100644
--- a/src/datavisualizationqml2/designer/Scatter3DSpecifics.qml
+++ b/src/datavisualizationqml2/designer/Scatter3DSpecifics.qml
@@ -106,6 +106,21 @@ Column {
                     Layout.fillWidth: true
                 }
             }
+            Label {
+                text: qsTr("aspectRatio")
+                toolTip: qsTr("Horizontal to Vertical Aspect Ratio")
+                Layout.fillWidth: true
+            }
+            SecondColumnLayout {
+                SpinBox {
+                    backendValue: backendValues.aspectRatio
+                    minimumValue: 0.1
+                    maximumValue: 10.0
+                    stepSize: 0.1
+                    decimals: 1
+                    Layout.fillWidth: true
+                }
+            }
         }
     }
 }
diff --git a/src/datavisualizationqml2/designer/Surface3DSpecifics.qml b/src/datavisualizationqml2/designer/Surface3DSpecifics.qml
index f6c4129e..65a65d37 100644
--- a/src/datavisualizationqml2/designer/Surface3DSpecifics.qml
+++ b/src/datavisualizationqml2/designer/Surface3DSpecifics.qml
@@ -226,6 +226,21 @@ Column {
                     Layout.fillWidth: true
                 }
             }
+            Label {
+                text: qsTr("aspectRatio")
+                toolTip: qsTr("Horizontal to Vertical Aspect Ratio")
+                Layout.fillWidth: true
+            }
+            SecondColumnLayout {
+                SpinBox {
+                    backendValue: backendValues.aspectRatio
+                    minimumValue: 0.1
+                    maximumValue: 10.0
+                    stepSize: 0.1
+                    decimals: 1
+                    Layout.fillWidth: true
+                }
+            }
 
             // Kept for debugging
             Label { }
diff --git a/src/datavisualizationqml2/plugins.qmltypes b/src/datavisualizationqml2/plugins.qmltypes
index 0bd76543..99fa53de 100644
--- a/src/datavisualizationqml2/plugins.qmltypes
+++ b/src/datavisualizationqml2/plugins.qmltypes
@@ -97,6 +97,7 @@ Module {
         }
         Property { name: "orthoProjection"; revision: 1; type: "bool" }
         Property { name: "selectedElement"; revision: 1; type: "ElementType"; isReadonly: true }
+        Property { name: "aspectRatio"; revision: 1; type: "double" }
         Signal {
             name: "selectionModeChanged"
             Parameter { name: "mode"; type: "AbstractDeclarative::SelectionFlags" }
@@ -149,6 +150,11 @@ Module {
             revision: 1
             Parameter { name: "enabled"; type: "bool" }
         }
+        Signal {
+            name: "aspectRatioChanged"
+            revision: 1
+            Parameter { name: "ratio"; type: "double" }
+        }
         Method {
             name: "handleAxisXChanged"
             Parameter { name: "axis"; type: "QAbstract3DAxis"; isPointer: true }
@@ -568,7 +574,7 @@ Module {
         }
         Property { name: "xRotation"; type: "double" }
         Property { name: "yRotation"; type: "double" }
-        Property { name: "zoomLevel"; type: "int" }
+        Property { name: "zoomLevel"; type: "double" }
         Property { name: "cameraPreset"; type: "CameraPreset" }
         Property { name: "wrapXRotation"; type: "bool" }
         Property { name: "wrapYRotation"; type: "bool" }
@@ -582,7 +588,7 @@ Module {
         }
         Signal {
             name: "zoomLevelChanged"
-            Parameter { name: "zoomLevel"; type: "int" }
+            Parameter { name: "zoomLevel"; type: "double" }
         }
         Signal {
             name: "cameraPresetChanged"