diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-24 08:26:09 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-01-24 08:27:55 +0200 |
| commit | 8802cf50ef296ce8cc56a2ba97fa237237f62d15 (patch) | |
| tree | fafd0f2fb8a99b13ccfb85128f547668c9240c31 /examples | |
| parent | f5a67847b72cf372f076657405769b024d5f6756 (diff) | |
Multiseries bars uniform scaling support added
Task-number: QTRD-2805
Change-Id: I7172662b2bed0a222ceb7560718450bcabd2879d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/bars/graphmodifier.cpp | 8 | ||||
| -rw-r--r-- | examples/qmlbars/qml/qmlbars/main.qml | 16 |
2 files changed, 9 insertions, 15 deletions
diff --git a/examples/bars/graphmodifier.cpp b/examples/bars/graphmodifier.cpp index 1b84ae7b..4a50c77d 100644 --- a/examples/bars/graphmodifier.cpp +++ b/examples/bars/graphmodifier.cpp @@ -56,6 +56,7 @@ GraphModifier::GraphModifier(Q3DBars *bargraph) m_graph->activeTheme()->setBackgroundEnabled(false); m_graph->activeTheme()->setFont(QFont("Times New Roman", m_fontSize)); m_graph->activeTheme()->setLabelBackgroundEnabled(true); + m_graph->setMultiSeriesUniform(true); //! [2] m_months << "January" << "February" << "March" << "April" << "May" << "June" << "July" << "August" << "September" << "October" << "November" << "December"; @@ -266,11 +267,4 @@ void GraphModifier::setSmoothBars(int smooth) void GraphModifier::setSeriesVisibility(int enabled) { m_secondarySeries->setVisible(bool(enabled)); - if (enabled) { - m_graph->setBarThickness(2.0f); - m_graph->setBarSpacing(QSizeF(1.0, 3.0)); - } else { - m_graph->setBarThickness(1.0f); - m_graph->setBarSpacing(QSizeF(1.0, 1.0)); - } } diff --git a/examples/qmlbars/qml/qmlbars/main.qml b/examples/qmlbars/qml/qmlbars/main.qml index d5f7fd34..faa10c5f 100644 --- a/examples/qmlbars/qml/qmlbars/main.qml +++ b/examples/qmlbars/qml/qmlbars/main.qml @@ -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] |