Expose data proxy in QML

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

2 files changed, 8 insertions, 5 deletions

diff --git a/examples/qmlscatter/qml/qmlscatter/data.qml b/examples/qmlscatter/qml/qmlscatter/data.qml
index 93352713..30fce67a 100644
--- a/examples/qmlscatter/qml/qmlscatter/data.qml
+++ b/examples/qmlscatter/qml/qmlscatter/data.qml
@@ -22,6 +22,7 @@ import com.digia.QtDataVis3D 1.0
 Item {
     property alias mapping: scatterMapping
     property alias model: dataModel
+    property alias proxy: modelProxy
 
     ScatterDataMapping {
         id: scatterMapping
@@ -30,6 +31,12 @@ Item {
         zPosRole: "zPos"
     }
 
+    ItemModelScatterDataProxy {
+        id: modelProxy
+        activeMapping: scatterMapping
+        itemModel: dataModel
+    }
+
     ListModel {
         id: dataModel
         ListElement{ xPos: -10.0; yPos: 5.0; zPos: -5.0 }
diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml
index 9645341b..9fcce132 100644
--- a/examples/qmlscatter/qml/qmlscatter/main.qml
+++ b/examples/qmlscatter/qml/qmlscatter/main.qml
@@ -40,7 +40,7 @@ Item {
             height: dataView.height
             font.family: "Lucida Handwriting"
             font.pointSize: 40
-            mapping: chartData.mapping
+            dataProxy: chartData.proxy
             theme: Scatter3D.ThemeHighContrast
             shadowQuality: Scatter3D.ShadowSoftLow
             selectionMode: Scatter3D.ModeItem
@@ -54,10 +54,6 @@ Item {
             axisY.segmentCount: 2
             axisY.subSegmentCount: 2
             axisY.labelFormat: "%.2f"
-
-            Component.onCompleted: {
-                data = chartData.model
-            }
         }
     }