diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-11 13:22:54 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-15 08:24:15 +0200 |
| commit | 999ffa01d20f75a457da62d41c0fabfc32e5e1bb (patch) | |
| tree | c5267f6831d5ff61444f85b2110f7150e20d3451 /tests/qmlcamera | |
| parent | bbb874d0591215164b2030db60dc9d6a95f4c8fe (diff) | |
Basic multiseries support
Task-number: QTRD-2548
Change-Id: Iba324c0e8be56f2b3f8f6c6a992883c134a51a9d
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'tests/qmlcamera')
| -rw-r--r-- | tests/qmlcamera/qml/qmlcamera/Data.qml | 7 | ||||
| -rw-r--r-- | tests/qmlcamera/qml/qmlcamera/main.qml | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tests/qmlcamera/qml/qmlcamera/Data.qml b/tests/qmlcamera/qml/qmlcamera/Data.qml index 8b7057d5..2072aaed 100644 --- a/tests/qmlcamera/qml/qmlcamera/Data.qml +++ b/tests/qmlcamera/qml/qmlcamera/Data.qml @@ -23,6 +23,7 @@ Item { property alias mapping: valueMapping property alias model: dataModel property alias proxy: modelProxy + property alias series: barSeries BarDataMapping { id: valueMapping @@ -37,6 +38,12 @@ Item { itemModel: dataModel } + Bar3DSeries { + id: barSeries + dataProxy: modelProxy + itemLabelFormat: "@valueTitle for @colLabel, @rowLabel: @valueLabel" + } + ListModel { id: dataModel ListElement{ year: "2006"; month: "Jan"; expenses: "4"; income: "5" } diff --git a/tests/qmlcamera/qml/qmlcamera/main.qml b/tests/qmlcamera/qml/qmlcamera/main.qml index 4fff55e7..1f87d5eb 100644 --- a/tests/qmlcamera/qml/qmlcamera/main.qml +++ b/tests/qmlcamera/qml/qmlcamera/main.qml @@ -50,14 +50,13 @@ Item { font.pointSize: 35 theme: Bars3D.ThemeRetro labelStyle: Bars3D.LabelStyleFromTheme - dataProxy: chartData.proxy + seriesList: [chartData.series] barThickness: 0.5 barSpacing: Qt.size(0.5, 0.5) barSpacingRelative: false columnAxis: chartAxes.column valueAxis: chartAxes.expenses - itemLabelFormat: "@valueTitle for @colLabel, @rowLabel: @valueLabel" onSelectedBarChanged: { // Set camControlArea current row to selected bar |