summaryrefslogtreecommitdiffstats
path: root/tests/barstest
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-09-19 13:32:31 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-09-22 09:35:46 +0300
commit36bc54f5720bddb9899e64d665117ac1e1b5bc94 (patch)
tree71d903cacc81c7a664ce0e05a167791234f7cf62 /tests/barstest
parent105e85170d35f7086dc96d1853298fcf8d680e06 (diff)
Allow setting the floor level on bar graphs.
Task-number: QTRD-3313 Change-Id: Ie0f8e36af8698081a6937c360043773da895b6e6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'tests/barstest')
-rw-r--r--tests/barstest/chart.cpp6
-rw-r--r--tests/barstest/chart.h1
-rw-r--r--tests/barstest/main.cpp11
3 files changed, 17 insertions, 1 deletions
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);