Expose data proxy in QML

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

2 files changed, 10 insertions, 15 deletions

diff --git a/examples/qmlbarchart/qml/qmlbarchart/data.qml b/examples/qmlbarchart/qml/qmlbarchart/data.qml
index f7fef334..29d26183 100644
--- a/examples/qmlbarchart/qml/qmlbarchart/data.qml
+++ b/examples/qmlbarchart/qml/qmlbarchart/data.qml
@@ -22,6 +22,7 @@ import com.digia.QtDataVis3D 1.0
 Item {
     property alias mapping: valueMapping
     property alias model: dataModel
+    property alias proxy: modelProxy
 
     BarDataMapping {
         id: valueMapping
@@ -33,6 +34,12 @@ Item {
             "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
     }
 
+    ItemModelBarDataProxy {
+        id: modelProxy
+        activeMapping: valueMapping
+        itemModel: dataModel
+    }
+
     ListModel {
         id: dataModel
         ListElement{ year: "2000"; month: "Jan"; expenses: "3";  income: "8" }
diff --git a/examples/qmlbarchart/qml/qmlbarchart/main.qml b/examples/qmlbarchart/qml/qmlbarchart/main.qml
index ea28d90a..e3536ce4 100644
--- a/examples/qmlbarchart/qml/qmlbarchart/main.qml
+++ b/examples/qmlbarchart/qml/qmlbarchart/main.qml
@@ -41,8 +41,6 @@ Item {
         height: parent.height
         anchors.right: parent.right;
 
-        property point storedSelection: Qt.point(-1, -1)
-
         Bars3D {
             id: testchart
             width: dataView.width
@@ -53,7 +51,7 @@ Item {
             theme: Bars3D.ThemeBrownSand
             rows: 4
             columns: 12
-            mapping: chartData.mapping
+            dataProxy: chartData.proxy
             barThickness: 0.5
             barSpacing: Qt.size(0.5, 0.5)
             barSpacingRelative: false
@@ -62,18 +60,9 @@ Item {
             columnAxis: chartAxes.column
             valueAxis: chartAxes.expenses
             itemLabelFormat: "@valueTitle for @colLabel, @rowLabel: @valueLabel"
-
-            onDataResolved: {
-                // Can't select a bar until data has been resolved from model to proxy
-                selectedBarPos = dataView.storedSelection
-            }
         }
     }
 
-    Component.onCompleted: {
-        testchart.data = chartData.model
-    }
-
     TableView {
         id: tableView
         x: 0
@@ -87,8 +76,8 @@ Item {
         model: chartData.model
 
         onCurrentRowChanged: {
-            var rowIndex = testchart.mapping.rowCategoryIndex(chartData.model.get(currentRow).year)
-            var colIndex = testchart.mapping.columnCategoryIndex(chartData.model.get(currentRow).month)
+            var rowIndex = chartData.proxy.activeMapping.rowCategoryIndex(chartData.model.get(currentRow).year)
+            var colIndex = chartData.proxy.activeMapping.columnCategoryIndex(chartData.model.get(currentRow).month)
             testchart.selectedBarPos = Qt.point(rowIndex, colIndex)
         }
     }
@@ -108,7 +97,6 @@ Item {
                 text = "Show Income"
                 testchart.valueAxis = chartAxes.expenses
             }
-            dataView.storedSelection = testchart.selectedBarPos
         }
     }