Default graphs for qmldesigner

+Some doc changes

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

6 files changed, 131 insertions, 10 deletions

diff --git a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
index 07d15d23..01645040 100644
--- a/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
+++ b/src/datavisualization/data/qitemmodelsurfacedataproxy.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
  *
  * 2) For models that do not have data already neatly sorted into rows and columns, such as
  *    QAbstractListModel based models, you can define a role from the model to map for each of row,
- *    column and value.
+ *    column and Y-position.
  *
  * 3) If you do not want to include all data contained in the model, or the autogenerated rows and
  *    columns are not ordered as you wish, you can specify which rows and columns should be included
@@ -109,7 +109,8 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 /*!
  * \qmlproperty string ItemModelSurfaceDataProxy::xPosRole
- * The X position role of the mapping.
+ * The X position role of the mapping. If this role is not defined, columnRole is used to
+ * determine the X-coordinate value of resolved QSurfaceDataItems.
  */
 
 /*!
@@ -119,7 +120,8 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
 /*!
  * \qmlproperty string ItemModelSurfaceDataProxy::zPosRole
- * The Z position role of the mapping.
+ * The Z position role of the mapping. If this role is not defined, rowRole is used to
+ * determine the Z-coordinate value of resolved QSurfaceDataItems.
  */
 
 /*!
@@ -366,6 +368,8 @@ QString QItemModelSurfaceDataProxy::columnRole() const
  * \property QItemModelSurfaceDataProxy::xPosRole
  *
  * Defines the X position \a role for the mapping.
+ * If this role is not defined, columnRole is used to determine the X-coordinate
+ * value of resolved QSurfaceDataItems.
  */
 void QItemModelSurfaceDataProxy::setXPosRole(const QString &role)
 {
@@ -402,6 +406,8 @@ QString QItemModelSurfaceDataProxy::yPosRole() const
  * \property QItemModelSurfaceDataProxy::zPosRole
  *
  * Defines the Z position \a role for the mapping.
+ * If this role is not defined, rowRole is used to determine the Z-coordinate
+ * value of resolved QSurfaceDataItems.
  */
 void QItemModelSurfaceDataProxy::setZPosRole(const QString &role)
 {
diff --git a/src/datavisualizationqml2/designer/default/Bars3D.qml b/src/datavisualizationqml2/designer/default/Bars3D.qml
new file mode 100644
index 00000000..9f8c72e3
--- /dev/null
+++ b/src/datavisualizationqml2/designer/default/Bars3D.qml
@@ -0,0 +1,38 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtDataVisualization 1.0
+
+Bars3D {
+    width: 300
+    height: 300
+    Bar3DSeries {
+        ItemModelBarDataProxy {
+            itemModel: ListModel {
+                ListElement{ row: "row 1"; column: "column 1"; value: "1"; }
+                ListElement{ row: "row 1"; column: "column 2"; value: "2"; }
+                ListElement{ row: "row 1"; column: "column 3"; value: "3"; }
+            }
+
+            rowRole: "row"
+            columnRole: "column"
+            valueRole: "value"
+        }
+    }
+}
diff --git a/src/datavisualizationqml2/designer/default/Scatter3D.qml b/src/datavisualizationqml2/designer/default/Scatter3D.qml
new file mode 100644
index 00000000..d38a9755
--- /dev/null
+++ b/src/datavisualizationqml2/designer/default/Scatter3D.qml
@@ -0,0 +1,38 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtDataVisualization 1.0
+
+Scatter3D {
+    width: 300
+    height: 300
+    Scatter3DSeries {
+        ItemModelScatterDataProxy {
+            itemModel: ListModel {
+                ListElement{ x: "1"; y: "2"; z: "3"; }
+                ListElement{ x: "2"; y: "3"; z: "4"; }
+                ListElement{ x: "3"; y: "4"; z: "1"; }
+            }
+
+            xPosRole: "x"
+            yPosRole: "y"
+            zPosRole: "z"
+        }
+    }
+}
diff --git a/src/datavisualizationqml2/designer/default/Surface3D.qml b/src/datavisualizationqml2/designer/default/Surface3D.qml
new file mode 100644
index 00000000..fde097df
--- /dev/null
+++ b/src/datavisualizationqml2/designer/default/Surface3D.qml
@@ -0,0 +1,39 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVisualization module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtDataVisualization 1.0
+
+Surface3D {
+    width: 300
+    height: 300
+    Surface3DSeries {
+        ItemModelSurfaceDataProxy {
+            itemModel: ListModel {
+                ListElement{ row: "1"; column: "1"; y: "1"; }
+                ListElement{ row: "1"; column: "2"; y: "2"; }
+                ListElement{ row: "2"; column: "1"; y: "3"; }
+                ListElement{ row: "2"; column: "2"; y: "4"; }
+            }
+
+            rowRole: "row"
+            columnRole: "column"
+            yPosRole: "y"
+        }
+    }
+}
diff --git a/src/datavisualizationqml2/designer/designer.pri b/src/datavisualizationqml2/designer/designer.pri
index db7c9b96..e22fb618 100644
--- a/src/datavisualizationqml2/designer/designer.pri
+++ b/src/datavisualizationqml2/designer/designer.pri
@@ -1,7 +1,10 @@
 QML_FILES += \
     $$PWD/Bars3DSpecifics.qml \
     $$PWD/Scatter3DSpecifics.qml \
-    $$PWD/Surface3DSpecifics.qml
+    $$PWD/Surface3DSpecifics.qml \
+    $$PWD/default/Bars3D.qml \
+    $$PWD/default/Scatter3D.qml \
+    $$PWD/default/Surface3D.qml
 
 QML_FILES += $$PWD/qtdatavisualization.metainfo
 
diff --git a/src/datavisualizationqml2/designer/qtdatavisualization.metainfo b/src/datavisualizationqml2/designer/qtdatavisualization.metainfo
index 3d4e61a8..60b2b2c2 100644
--- a/src/datavisualizationqml2/designer/qtdatavisualization.metainfo
+++ b/src/datavisualizationqml2/designer/qtdatavisualization.metainfo
@@ -10,8 +10,7 @@ MetaInfo {
             version: "1.0"
             requiredImport: "QtDataVisualization"
 
-            Property { name: "width"; type: "int"; value: 300; }
-            Property { name: "height"; type: "int"; value: 300; }
+            QmlSource { source: "default/Bars3D.qml" }
         }
     }
     Type {
@@ -25,8 +24,7 @@ MetaInfo {
             version: "1.0"
             requiredImport: "QtDataVisualization"
 
-            Property { name: "width"; type: "int"; value: 300; }
-            Property { name: "height"; type: "int"; value: 300; }
+            QmlSource { source: "default/Scatter3D.qml" }
         }
     }
     Type {
@@ -40,8 +38,7 @@ MetaInfo {
             version: "1.0"
             requiredImport: "QtDataVisualization"
 
-            Property { name: "width"; type: "int"; value: 300; }
-            Property { name: "height"; type: "int"; value: 300; }
+            QmlSource { source: "default/Surface3D.qml" }
         }
     }
 }