diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-16 10:48:47 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-16 11:01:10 +0200 |
| commit | d2c37e276d17fb91163188878988894df993e69b (patch) | |
| tree | 75081e4f9ef26242213367aecd3eb49861e16e5f /tests | |
| parent | 3e7dc5bd1769e4578733f7ce0f4eba72346b6d98 (diff) | |
Implement generic clearSelection() method for graphs
Also fixed scene sync related bug on selection.
Task-number: QTRD-2606
Task-number: QTRD-2773
Change-Id: I057fd83ae5bf5ee94e413287fb2b3cefa455b156
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qmlmultigraph/qml/qmlmultigraph/main.qml | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/tests/qmlmultigraph/qml/qmlmultigraph/main.qml b/tests/qmlmultigraph/qml/qmlmultigraph/main.qml index 11c4ab2d..4f2f2052 100644 --- a/tests/qmlmultigraph/qml/qmlmultigraph/main.qml +++ b/tests/qmlmultigraph/qml/qmlmultigraph/main.qml @@ -44,6 +44,18 @@ Item { } } + Bar3DSeries { + itemLabelFormat: "@colLabel, @rowLabel: @valueLabel" + + ItemModelBarDataProxy { + itemModel: barDataModel + // Mapping model roles to bar series rows, columns, and values. + rowRole: "year" + columnRole: "city" + valueRole: "income" + } + } + onRowAxisChanged: { console.log("Bars: Row axis changed.") } @@ -57,14 +69,14 @@ Item { ListModel { id: barDataModel - ListElement{ year: "2012"; city: "Oulu"; expenses: "4200"; } - ListElement{ year: "2012"; city: "Rauma"; expenses: "2100"; } - ListElement{ year: "2012"; city: "Helsinki"; expenses: "7040"; } - ListElement{ year: "2012"; city: "Tampere"; expenses: "4330"; } - ListElement{ year: "2013"; city: "Oulu"; expenses: "3960"; } - ListElement{ year: "2013"; city: "Rauma"; expenses: "1990"; } - ListElement{ year: "2013"; city: "Helsinki"; expenses: "7230"; } - ListElement{ year: "2013"; city: "Tampere"; expenses: "4650"; } + ListElement{ year: "2012"; city: "Oulu"; expenses: "4200"; income: "8300"; } + ListElement{ year: "2012"; city: "Rauma"; expenses: "2100"; income: "6500"; } + ListElement{ year: "2012"; city: "Helsinki"; expenses: "7040"; income: "7500"; } + ListElement{ year: "2012"; city: "Tampere"; expenses: "4330"; income: "5800"; } + ListElement{ year: "2013"; city: "Oulu"; expenses: "3960"; income: "9000"; } + ListElement{ year: "2013"; city: "Rauma"; expenses: "1990"; income: "3000"; } + ListElement{ year: "2013"; city: "Helsinki"; expenses: "7230"; income: "9900"; } + ListElement{ year: "2013"; city: "Tampere"; expenses: "4650"; income: "7600"; } } Scatter3D { @@ -189,6 +201,18 @@ Item { surfaceGraph.axisZ = null } } + + NewButton { + id: clearSelectionsButton + Layout.fillHeight: true + Layout.fillWidth: true + text: "Clear Selections" + onClicked: { + barGraph.clearSelection() + scatterGraph.clearSelection() + surfaceGraph.clearSelection() + } + } } Rectangle { |