From 8802cf50ef296ce8cc56a2ba97fa237237f62d15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Fri, 24 Jan 2014 08:26:09 +0200 Subject: Multiseries bars uniform scaling support added Task-number: QTRD-2805 Change-Id: I7172662b2bed0a222ceb7560718450bcabd2879d Reviewed-by: Miikka Heikkinen --- src/datavisualizationqml2/declarativebars.cpp | 13 +++++++++++++ src/datavisualizationqml2/declarativebars_p.h | 5 +++++ 2 files changed, 18 insertions(+) (limited to 'src/datavisualizationqml2') diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp index 74d60138..b690a6b7 100644 --- a/src/datavisualizationqml2/declarativebars.cpp +++ b/src/datavisualizationqml2/declarativebars.cpp @@ -72,6 +72,19 @@ void DeclarativeBars::setColumnAxis(QCategory3DAxis *axis) m_barsController->setAxisX(axis); } +void DeclarativeBars::setMultiSeriesUniform(bool uniform) +{ + if (uniform != isMultiSeriesUniform()) { + m_barsController->setMultiSeriesScaling(uniform); + emit multiSeriesUniformChanged(uniform); + } +} + +bool DeclarativeBars::isMultiSeriesUniform() const +{ + return m_barsController->multiSeriesScaling(); +} + void DeclarativeBars::setBarThickness(float thicknessRatio) { if (thicknessRatio != barThickness()) { diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h index 43b619f1..d4616eb3 100644 --- a/src/datavisualizationqml2/declarativebars_p.h +++ b/src/datavisualizationqml2/declarativebars_p.h @@ -51,6 +51,7 @@ class DeclarativeBars : public AbstractDeclarative Q_PROPERTY(QCategory3DAxis *rowAxis READ rowAxis WRITE setRowAxis NOTIFY rowAxisChanged) Q_PROPERTY(QValue3DAxis *valueAxis READ valueAxis WRITE setValueAxis NOTIFY valueAxisChanged) Q_PROPERTY(QCategory3DAxis *columnAxis READ columnAxis WRITE setColumnAxis NOTIFY columnAxisChanged) + Q_PROPERTY(bool multiSeriesUniform READ isMultiSeriesUniform WRITE setMultiSeriesUniform NOTIFY multiSeriesUniformChanged) Q_PROPERTY(float barThickness READ barThickness WRITE setBarThickness NOTIFY barThicknessChanged) Q_PROPERTY(QSizeF barSpacing READ barSpacing WRITE setBarSpacing NOTIFY barSpacingChanged) Q_PROPERTY(bool barSpacingRelative READ isBarSpacingRelative WRITE setBarSpacingRelative NOTIFY barSpacingRelativeChanged) @@ -69,6 +70,9 @@ public: QCategory3DAxis *columnAxis() const; void setColumnAxis(QCategory3DAxis *axis); + void setMultiSeriesUniform(bool uniform); + bool isMultiSeriesUniform() const; + void setBarThickness(float thicknessRatio); float barThickness() const; @@ -98,6 +102,7 @@ signals: void rowAxisChanged(QCategory3DAxis *axis); void valueAxisChanged(QValue3DAxis *axis); void columnAxisChanged(QCategory3DAxis *axis); + void multiSeriesUniformChanged(bool uniform); void barThicknessChanged(float thicknessRatio); void barSpacingChanged(QSizeF spacing); void barSpacingRelativeChanged(bool relative); -- cgit v1.2.3