diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-03 08:19:19 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-03 13:10:01 +0200 |
| commit | 91a94a743b4cfd30ef77aa73837050d44620469b (patch) | |
| tree | ccb410d11e2a369476b502e3c064f2bea036ec8a /examples | |
| parent | e895c5085f6097983bdd617c39ea5184541d6c4d (diff) | |
Remove unnecessary triplication of data from qmlscatter example
Change-Id: Ia7f26aee12dd53bfee4729fbac220ae27cb5f351
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qmlscatter/doc/src/qmlscatter.qdoc | 5 | ||||
| -rw-r--r-- | examples/qmlscatter/qml/qmlscatter/main.qml | 17 |
2 files changed, 6 insertions, 16 deletions
diff --git a/examples/qmlscatter/doc/src/qmlscatter.qdoc b/examples/qmlscatter/doc/src/qmlscatter.qdoc index 06719ffc..0a758751 100644 --- a/examples/qmlscatter/doc/src/qmlscatter.qdoc +++ b/examples/qmlscatter/doc/src/qmlscatter.qdoc @@ -119,12 +119,11 @@ \section1 Adding data to the graph - Let's create a \c Data item inside the \c mainView and name it \c {seriesOneData}: + Let's create a \c Data item inside the \c mainView and name it \c seriesData: \snippet ../examples/qmlscatter/qml/qmlscatter/main.qml 4 - We'll add two more of these: \c seriesTwoData and \c seriesThreeData to add to the three series - we're going to have. They are added similarly as \c {seriesOneData}. + The \c seriesData item contains the data models for all three series we use in this example. This is the component that holds our data in \c {data.qml}. It has an \c Item as the main component. diff --git a/examples/qmlscatter/qml/qmlscatter/main.qml b/examples/qmlscatter/qml/qmlscatter/main.qml index 62727f84..e0a7f26b 100644 --- a/examples/qmlscatter/qml/qmlscatter/main.qml +++ b/examples/qmlscatter/qml/qmlscatter/main.qml @@ -30,18 +30,9 @@ Item { //! [4] Data { - id: seriesOneData + id: seriesData } //! [4] - - Data { - id: seriesTwoData - } - - Data { - id: seriesThreeData - } - //! [8] //! [9] Item { @@ -87,7 +78,7 @@ Item { //! [11] ItemModelScatterDataProxy { - itemModel: seriesOneData.model + itemModel: seriesData.model xPosRole: "xPos" yPosRole: "yPos" zPosRole: "zPos" @@ -104,7 +95,7 @@ Item { //! [12] ItemModelScatterDataProxy { - itemModel: seriesTwoData.modelTwo + itemModel: seriesData.modelTwo xPosRole: "xPos" yPosRole: "yPos" zPosRole: "zPos" @@ -117,7 +108,7 @@ Item { mesh: Abstract3DSeries.MeshMinimal ItemModelScatterDataProxy { - itemModel: seriesThreeData.modelThree + itemModel: seriesData.modelThree xPosRole: "xPos" yPosRole: "yPos" zPosRole: "zPos" |