diff options
author | Mika Salmela <mika.salmela@digia.com> | 2013-12-18 11:50:03 +0200 |
---|---|---|
committer | Mika Salmela <mika.salmela@digia.com> | 2013-12-18 11:51:20 +0200 |
commit | 07aba602fc82ac31684988f8e8e22521d2b3c982 (patch) | |
tree | 7ae1da139e8661bf157f996fe71844031d2995f4 /examples/qmlscatter/qml/qmlscatter/data.qml | |
parent | cf0cf6ca67aec8ae480bb705443ea17f5ab9f9e2 (diff) | |
parent | ea0442bc81ae034d22c5742b6075dee993fdd54d (diff) |
Merge branch 'develop' into mergebranch
Conflicts:
examples/qmlbars/qml/qmlbars/main.qml
examples/qmlscatter/qml/qmlscatter/main.qml
examples/qmlsurface/qml/qmlsurface/main.qml
src/datavisualization/data/qitemmodelbardatamapping.cpp
src/datavisualization/data/qitemmodelscatterdatamapping.cpp
src/datavisualization/data/qitemmodelsurfacedatamapping.cpp
src/datavisualization/engine/drawer.cpp
Change-Id: I731ebdb2cc5cee8f2cb32becee96d1fc1b3e5de1
Diffstat (limited to 'examples/qmlscatter/qml/qmlscatter/data.qml')
-rw-r--r-- | examples/qmlscatter/qml/qmlscatter/data.qml | 41 |
1 files changed, 16 insertions, 25 deletions
diff --git a/examples/qmlscatter/qml/qmlscatter/data.qml b/examples/qmlscatter/qml/qmlscatter/data.qml index 4ad9d7fc..bf4853df 100644 --- a/examples/qmlscatter/qml/qmlscatter/data.qml +++ b/examples/qmlscatter/qml/qmlscatter/data.qml @@ -20,27 +20,12 @@ import QtQuick 2.1 import QtDataVisualization 1.0 Item { - //! [3] - property alias proxy: modelProxy - //! [3] - //! [1] - ScatterDataMapping { - id: scatterMapping - xPosRole: "xPos" - yPosRole: "yPos" - zPosRole: "zPos" - } + property alias model: dataModel + property alias modelTwo: dataModelTwo + property alias modelThree: dataModelThree //! [1] - //! [2] - ItemModelScatterDataProxy { - id: modelProxy - activeMapping: scatterMapping - itemModel: dataModel - } - //! [2] - //! [0] ListModel { id: dataModel @@ -68,7 +53,10 @@ Item { ListElement{ xPos: -7.9 ; yPos: 3.4 ; zPos: -2.78 } ListElement{ xPos: -7.4 ; yPos: 3.12 ; zPos: -3.1 } ListElement{ xPos: -7.54 ; yPos: 2.8 ; zPos: -3.68 } + } + ListModel { + id: dataModelTwo ListElement{ xPos: 2.25 ; yPos: 1.36 ; zPos: -1.3 } ListElement{ xPos: -2 ; yPos: -0.08 ; zPos: 1 } ListElement{ xPos: 2.65 ; yPos: -1.2 ; zPos: 2.7 } @@ -1069,20 +1057,23 @@ Item { ListElement{ xPos: 0.85 ; yPos: -2.92 ; zPos: 3.4 } ListElement{ xPos: -0.7 ; yPos: 2.52 ; zPos: 1 } ListElement{ xPos: -3.4 ; yPos: 0.6 ; zPos: 0.9 } + } + ListModel { + id: dataModelThree ListElement{ xPos: 8.0; yPos: -2.0; zPos: 4.0 } ListElement{ xPos: 7.8; yPos: -2.2; zPos: 5.0 } ListElement{ xPos: 7.6; yPos: -2.4; zPos: 4.5 } - ListElement{ xPos: 7.4; yPos: -2.6; zPos: 3.8 } + ListElement{ xPos: 9.4; yPos: -2.6; zPos: 3.8 } ListElement{ xPos: 7.2; yPos: -2.8; zPos: 4.8 } - ListElement{ xPos: 7.0; yPos: -2.3; zPos: 4.1 } + ListElement{ xPos: 9.0; yPos: -2.3; zPos: 4.1 } ListElement{ xPos: 6.9; yPos: -3.3; zPos: 4.9 } ListElement{ xPos: 6.7; yPos: -3.5; zPos: 3.5 } ListElement{ xPos: 6.5; yPos: -3.7; zPos: 3.3 } ListElement{ xPos: 6.3; yPos: -3.4; zPos: 3.7 } ListElement{ xPos: 7.9 ; yPos: -3.32 ; zPos: 2.48 } ListElement{ xPos: 6.2 ; yPos: -4.04 ; zPos: 3.4 } - ListElement{ xPos: 8.06 ; yPos: -4.6 ; zPos: 4.08 } + ListElement{ xPos: 9.06 ; yPos: -4.6 ; zPos: 4.08 } ListElement{ xPos: 5.98 ; yPos: -2.26 ; zPos: 2.82 } ListElement{ xPos: 5.46 ; yPos: -3.9 ; zPos: 3.2 } ListElement{ xPos: 8.14 ; yPos: -3.34 ; zPos: 3.42 } @@ -1093,13 +1084,13 @@ Item { ListElement{ xPos: 8.64 ; yPos: -3.04 ; zPos: 2.62 } ListElement{ xPos: 7.82 ; yPos: -3.68 ; zPos: 2.96 } ListElement{ xPos: 7.1 ; yPos: -3.6 ; zPos: 4.22 } - ListElement{ xPos: 7.6 ; yPos: -3.88 ; zPos: 3.9 } - ListElement{ xPos: 7.46 ; yPos: -4.2 ; zPos: 3.32 } + ListElement{ xPos: 8.6 ; yPos: -3.88 ; zPos: 3.9 } + ListElement{ xPos: 8.46 ; yPos: -4.2 ; zPos: 3.32 } ListElement{ xPos: 6.98 ; yPos: -3.94 ; zPos: 3.1 } ListElement{ xPos: 7.36 ; yPos: -4.24 ; zPos: 1.72 } - ListElement{ xPos: 8.42 ; yPos: -4.52 ; zPos: 2.62 } + ListElement{ xPos: 9.42 ; yPos: -4.52 ; zPos: 2.62 } ListElement{ xPos: 6.04 ; yPos: -4.48 ; zPos: 2.74 } - ListElement{ xPos: 8.7 ; yPos: -3.92 ; zPos: 3.82 } + ListElement{ xPos: 10.0 ; yPos: -3.92 ; zPos: 3.82 } ListElement{ xPos: 6.76 ; yPos: -3.5 ; zPos: 2.92 } ListElement{ xPos: 7 ; yPos: -4.42 ; zPos: 2.62 } ListElement{ xPos: 5.32 ; yPos: -3.28 ; zPos: 3.34 } |