diff options
Diffstat (limited to 'examples/qmlscatter')
| -rw-r--r-- | examples/qmlscatter/qml/qmlscatter/data.qml | 18 | ||||
| -rw-r--r-- | examples/qmlscatter/qml/qmlscatter/main.qml | 15 |
2 files changed, 14 insertions, 19 deletions
diff --git a/examples/qmlscatter/qml/qmlscatter/data.qml b/examples/qmlscatter/qml/qmlscatter/data.qml index 74993135..523aceb0 100644 --- a/examples/qmlscatter/qml/qmlscatter/data.qml +++ b/examples/qmlscatter/qml/qmlscatter/data.qml @@ -21,8 +21,8 @@ import QtDataVisualization 1.0 Item { //! [3] - property alias proxy: modelProxy - property alias series: scatterSeries + property alias mapping: scatterMapping + property alias model: dataModel //! [3] //! [1] @@ -34,20 +34,6 @@ Item { } //! [1] - //! [2] - ItemModelScatterDataProxy { - id: modelProxy - activeMapping: scatterMapping - itemModel: dataModel - } - //! [2] - - Scatter3DSeries { - id: scatterSeries - dataProxy: modelProxy - itemLabelFormat: "X:@xLabel Y:@yLabel Z:@zLabel" - } - //! [0] ListModel { id: dataModel diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml index 1e80b52a..6cae72f8 100644 --- a/examples/qmlscatter/qml/qmlscatter/main.qml +++ b/examples/qmlscatter/qml/qmlscatter/main.qml @@ -56,9 +56,6 @@ Item { theme: AbstractGraph3D.ThemeIsabelle shadowQuality: AbstractGraph3D.ShadowQualitySoftLow //! [3] - //! [5] - seriesList: [graphData.series] - //! [5] //! [6] axisX.segmentCount: 3 axisX.subSegmentCount: 2 @@ -70,6 +67,18 @@ Item { axisY.subSegmentCount: 2 axisY.labelFormat: "%.2f" //! [6] + //! [5] + Scatter3DSeries { + id: scatterSeries + itemLabelFormat: "X:@xLabel Y:@yLabel Z:@zLabel" + + ItemModelScatterDataProxy { + activeMapping: graphData.mapping + itemModel: graphData.model + } + } + + //! [5] } } |