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 --- tests/barstest/chart.cpp | 5 +++++ tests/barstest/chart.h | 1 + tests/barstest/main.cpp | 6 ++++++ 3 files changed, 12 insertions(+) (limited to 'tests') diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp index abbf2a59..6b0345ad 100644 --- a/tests/barstest/chart.cpp +++ b/tests/barstest/chart.cpp @@ -1223,3 +1223,8 @@ void GraphModifier::setGradient() m_graph->activeTheme()->setColorStyle(Q3DTheme::ColorStyleObjectGradient); } + +void GraphModifier::toggleMultiseriesScaling() +{ + m_graph->setMultiSeriesUniform(!m_graph->isMultiSeriesUniform()); +} diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h index 425af521..8e3271cc 100644 --- a/tests/barstest/chart.h +++ b/tests/barstest/chart.h @@ -88,6 +88,7 @@ public: public slots: void flipViews(); void setGradient(); + void toggleMultiseriesScaling(); void changeShadowQuality(int quality); void shadowQualityUpdatedByVisual(QAbstract3DGraph::ShadowQuality shadowQuality); void handleSelectionChange(const QPoint &position); diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp index a0e1bfc3..52d79468 100644 --- a/tests/barstest/main.cpp +++ b/tests/barstest/main.cpp @@ -110,6 +110,9 @@ int main(int argc, char **argv) QPushButton *labelButton = new QPushButton(widget); labelButton->setText(QStringLiteral("Change label style")); + QPushButton *multiScaleButton = new QPushButton(widget); + multiScaleButton->setText(QStringLiteral("Change multiseries scaling")); + QPushButton *styleButton = new QPushButton(widget); styleButton->setText(QStringLiteral("Change bar style")); @@ -292,6 +295,7 @@ int main(int argc, char **argv) vLayout->addWidget(showFiveSeriesButton, 0, Qt::AlignTop); vLayout->addWidget(themeButton, 0, Qt::AlignTop); vLayout->addWidget(labelButton, 0, Qt::AlignTop); + vLayout->addWidget(multiScaleButton, 0, Qt::AlignTop); vLayout->addWidget(styleButton, 0, Qt::AlignTop); vLayout->addWidget(cameraButton, 0, Qt::AlignTop); vLayout->addWidget(selectionButton, 0, Qt::AlignTop); @@ -367,6 +371,8 @@ int main(int argc, char **argv) QObject::connect(fontSizeSlider, &QSlider::valueChanged, modifier, &GraphModifier::changeFontSize); + QObject::connect(multiScaleButton, &QPushButton::clicked, modifier, + &GraphModifier::toggleMultiseriesScaling); QObject::connect(styleButton, &QPushButton::clicked, modifier, &GraphModifier::changeStyle); QObject::connect(cameraButton, &QPushButton::clicked, modifier, &GraphModifier::changePresetCamera); -- cgit v1.2.3