diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-27 13:10:44 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-27 13:13:58 +0200 |
commit | b368e57e59351736f9ad06834a743a7c1b49d368 (patch) | |
tree | 3b7d42569905d8cde0ca7571cd664428354a50dd /examples/qmlbars/qml/qmlbars/main.qml | |
parent | eb3d0514ca886db33776522ea00f27b69bc86ad1 (diff) | |
parent | 05d06fbc61f07e400b519a9b020c2473398627c1 (diff) |
Merge branch 'develop'v1.0.0-beta1
Change-Id: I1c9a255eb8f30a24b665856d3711f0abe77c6ef4
Diffstat (limited to 'examples/qmlbars/qml/qmlbars/main.qml')
-rw-r--r-- | examples/qmlbars/qml/qmlbars/main.qml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/examples/qmlbars/qml/qmlbars/main.qml b/examples/qmlbars/qml/qmlbars/main.qml index 0581f834..0ff060ca 100644 --- a/examples/qmlbars/qml/qmlbars/main.qml +++ b/examples/qmlbars/qml/qmlbars/main.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** @@ -43,7 +43,7 @@ Item { selectedSeries: barSeries function handleSelectionChange(series, position) { - if (position != series.invalidSelectionPosition()) { + if (position != series.invalidSelectionPosition) { selectedSeries = series } @@ -76,7 +76,7 @@ Item { anchors.bottom: mainview.bottom Bars3D { - id: testGraph + id: barGraph width: dataView.width height: dataView.height shadowQuality: AbstractGraph3D.ShadowQualityMedium @@ -189,7 +189,7 @@ Item { clip: true //! [1] onClicked: { - if (testGraph.rowAxis.max !== 6) { + if (barGraph.rowAxis.max !== 6) { text = "Show 2010 - 2012" modelProxy.autoRowCategories = true secondaryProxy.autoRowCategories = true @@ -213,11 +213,11 @@ Item { text: "Hide Shadows" clip: true onClicked: { - if (testGraph.shadowQuality == AbstractGraph3D.ShadowQualityNone) { - testGraph.shadowQuality = AbstractGraph3D.ShadowQualityMedium; + if (barGraph.shadowQuality == AbstractGraph3D.ShadowQualityNone) { + barGraph.shadowQuality = AbstractGraph3D.ShadowQualityMedium; text = "Hide Shadows" } else { - testGraph.shadowQuality = AbstractGraph3D.ShadowQualityNone; + barGraph.shadowQuality = AbstractGraph3D.ShadowQualityNone; text = "Show Shadows" } } @@ -233,17 +233,17 @@ Item { onClicked: { if (!secondarySeries.visible) { text = "Show Both" - testGraph.valueAxis = graphAxes.expenses + barGraph.valueAxis = graphAxes.expenses barSeries.visible = false secondarySeries.visible = true } else if (!barSeries.visible){ barSeries.visible = true text = "Show Income" - testGraph.valueAxis = graphAxes.income + barGraph.valueAxis = graphAxes.income } else { secondarySeries.visible = false text = "Show Expenses" - testGraph.valueAxis = graphAxes.income + barGraph.valueAxis = graphAxes.income } } //! [0] |