From 36bc54f5720bddb9899e64d665117ac1e1b5bc94 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 19 Sep 2014 13:32:31 +0300 Subject: Allow setting the floor level on bar graphs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTRD-3313 Change-Id: Ie0f8e36af8698081a6937c360043773da895b6e6 Reviewed-by: Tomi Korpipää --- tests/barstest/chart.cpp | 6 ++++++ tests/barstest/chart.h | 1 + tests/barstest/main.cpp | 11 ++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) (limited to 'tests/barstest') diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp index 137ce88e..9a81fc86 100644 --- a/tests/barstest/chart.cpp +++ b/tests/barstest/chart.cpp @@ -1519,6 +1519,12 @@ void GraphModifier::setCameraTargetZ(int value) qDebug() << "m_cameraTarget:" << m_cameraTarget; } +void GraphModifier::setFloorLevel(int value) +{ + m_graph->setFloorLevel(float(value)); + qDebug() << "Floor level:" << value; +} + void GraphModifier::populateFlatSeries(QBar3DSeries *series, int rows, int columns, float value) { QBarDataArray *dataArray = new QBarDataArray; diff --git a/tests/barstest/chart.h b/tests/barstest/chart.h index a5061df4..eac6d3f1 100644 --- a/tests/barstest/chart.h +++ b/tests/barstest/chart.h @@ -124,6 +124,7 @@ public slots: void setCameraTargetX(int value); void setCameraTargetY(int value); void setCameraTargetZ(int value); + void setFloorLevel(int value); signals: void shadowQualityChanged(int quality); diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp index 409ecbab..1cc47859 100644 --- a/tests/barstest/main.cpp +++ b/tests/barstest/main.cpp @@ -262,6 +262,11 @@ int main(int argc, char **argv) reflectivitySlider->setValue(50); reflectivitySlider->setMaximum(100); + QSlider *floorLevelSlider = new QSlider(Qt::Horizontal, widget); + floorLevelSlider->setMinimum(-50); + floorLevelSlider->setValue(0); + floorLevelSlider->setMaximum(50); + QPushButton *toggleCustomItemButton = new QPushButton(widget); toggleCustomItemButton->setText(QStringLiteral("Toggle Custom Item")); @@ -435,7 +440,9 @@ int main(int argc, char **argv) vLayout3->addWidget(cameraTargetSliderZ, 0, Qt::AlignTop); vLayout3->addWidget(reflectionCheckBox, 0, Qt::AlignTop); vLayout3->addWidget(reflectivitySlider, 0, Qt::AlignTop); - vLayout3->addWidget(toggleCustomItemButton, 1, Qt::AlignTop); + vLayout3->addWidget(toggleCustomItemButton, 0, Qt::AlignTop); + vLayout3->addWidget(new QLabel(QStringLiteral("Adjust floor level")), 0, Qt::AlignTop); + vLayout3->addWidget(floorLevelSlider, 1, Qt::AlignTop); widget->show(); @@ -568,6 +575,8 @@ int main(int argc, char **argv) &GraphModifier::setReflection); QObject::connect(reflectivitySlider, &QSlider::valueChanged, modifier, &GraphModifier::setReflectivity); + QObject::connect(floorLevelSlider, &QSlider::valueChanged, modifier, + &GraphModifier::setFloorLevel); QObject::connect(toggleCustomItemButton, &QPushButton::clicked, modifier, &GraphModifier::toggleCustomItem); -- cgit v1.2.3