diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-05-12 12:55:10 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-05-12 13:11:39 +0300 |
commit | 3d7f8820a86a4852fe2df27df53b745cfa32eb94 (patch) | |
tree | 3c1dabe786e25a23998f8891f96054cc5d69a00d /tests/qmlmultitest | |
parent | 4dcef4be656aedb7c6c9e222f291a1a508641007 (diff) |
Enable mapping single role to multiple properties for scatter
Task-number: QTRD-3074
Change-Id: I7b1d338d28000eee7563a11a6069453f3e349c16
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'tests/qmlmultitest')
-rw-r--r-- | tests/qmlmultitest/qml/qmlmultitest/main.qml | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/tests/qmlmultitest/qml/qmlmultitest/main.qml b/tests/qmlmultitest/qml/qmlmultitest/main.qml index da34c0bf..84eb4294 100644 --- a/tests/qmlmultitest/qml/qmlmultitest/main.qml +++ b/tests/qmlmultitest/qml/qmlmultitest/main.qml @@ -144,19 +144,22 @@ Rectangle { Scatter3DSeries { itemLabelFormat: "Pop density at (@xLabel N, @zLabel E): @yLabel" + mesh: Abstract3DSeries.MeshCube ItemModelScatterDataProxy { itemModel: data.sharedData // Mapping model roles to scatter series item coordinates. xPosRole: "data" zPosRole: "data" yPosRole: "data" - // TODO scatter test -// xPosRolePattern: /^([asd]*)([fgh]*)([jkl]*)[^\/]*\/([^\/]*)\/.*$/ -// yPosRolePattern: /^([^\/]*)\/([^\/]*)\/(.*)$/ -// zPosRolePattern: /^([asd]*)([qwe]*)([tyu]*)([fgj]*)([^\/]*)\/[^\/]*\/.*$/ -// xPosRoleReplace: "\\4" -// yPosRoleReplace: "\\3" -// zPosRoleReplace: "\\5" + rotationRole: "coords" + xPosRolePattern: /^([asd]*)([fgh]*)([jkl]*)[^\/]*\/([^\/]*)\/.*$/ + yPosRolePattern: /^([^\/]*)\/([^\/]*)\/(.*)$/ + zPosRolePattern: /^([asd]*)([qwe]*)([tyu]*)([fgj]*)([^\/]*)\/[^\/]*\/.*$/ + rotationRolePattern: /(\d)\,(\d)/ + xPosRoleReplace: "\\4" + yPosRoleReplace: "\\3" + zPosRoleReplace: "\\5" + rotationRoleReplace: "@\\2\\1,0,1,0" } } } |