summaryrefslogtreecommitdiffstats
path: root/tests/surfacetest
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2014-05-26 09:57:25 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2014-05-26 10:00:29 +0300
commit5611563234ac7edd47ad9df3a8bf0a293718d8f8 (patch)
treecf86ae40fdc51e9df7197fc5756438b1023858c6 /tests/surfacetest
parent039a4b04c5207e869fed958baefcd74fe9423426 (diff)
Added API for changing data aspect ratio
Task-number: QTRD-3144 Change-Id: I9acd1be13083d7fbbed840882260a60f46c5f698 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'tests/surfacetest')
-rw-r--r--tests/surfacetest/graphmodifier.cpp6
-rw-r--r--tests/surfacetest/graphmodifier.h2
-rw-r--r--tests/surfacetest/main.cpp10
3 files changed, 18 insertions, 0 deletions
diff --git a/tests/surfacetest/graphmodifier.cpp b/tests/surfacetest/graphmodifier.cpp
index 33cfb8a1..442e7742 100644
--- a/tests/surfacetest/graphmodifier.cpp
+++ b/tests/surfacetest/graphmodifier.cpp
@@ -1489,3 +1489,9 @@ void GraphModifier::updateSamples()
break;
}
}
+
+void GraphModifier::setAspectRatio(int ratio)
+{
+ float aspectRatio = float(ratio) / 10.0f;
+ m_graph->setAspectRatio(aspectRatio);
+}
diff --git a/tests/surfacetest/graphmodifier.h b/tests/surfacetest/graphmodifier.h
index b02e1c31..ff0b325e 100644
--- a/tests/surfacetest/graphmodifier.h
+++ b/tests/surfacetest/graphmodifier.h
@@ -113,6 +113,8 @@ public:
void testAxisReverse();
void testDataOrdering();
+ void setAspectRatio(int ratio);
+
public slots:
void changeShadowQuality(int quality);
void changeTheme(int theme);
diff --git a/tests/surfacetest/main.cpp b/tests/surfacetest/main.cpp
index 9d6165e6..7444a66a 100644
--- a/tests/surfacetest/main.cpp
+++ b/tests/surfacetest/main.cpp
@@ -218,6 +218,11 @@ int main(int argc, char *argv[])
axisMinSliderZ->setMaximum(100);
axisMinSliderZ->setEnabled(true);
+ QSlider *aspectRatioSlider = new QSlider(Qt::Horizontal, widget);
+ aspectRatioSlider->setMinimum(1);
+ aspectRatioSlider->setValue(20);
+ aspectRatioSlider->setMaximum(100);
+
QLinearGradient gr(0, 0, 100, 1);
gr.setColorAt(0.0, Qt::black);
gr.setColorAt(0.33, Qt::blue);
@@ -403,6 +408,8 @@ int main(int argc, char *argv[])
vLayout->addWidget(gridSliderX);
vLayout->addWidget(gridSliderZ);
#endif
+ vLayout->addWidget(new QLabel(QStringLiteral("Adjust aspect ratio")));
+ vLayout->addWidget(aspectRatioSlider);
vLayout->addWidget(new QLabel(QStringLiteral("Adjust axis range")));
vLayout->addWidget(axisRangeSliderX);
vLayout->addWidget(axisRangeSliderY);
@@ -605,6 +612,9 @@ int main(int argc, char *argv[])
QObject::connect(testDataOrderingButton, &QPushButton::clicked,
modifier, &GraphModifier::testDataOrdering);
+ QObject::connect(aspectRatioSlider, &QSlider::valueChanged,
+ modifier, &GraphModifier::setAspectRatio);
+
#ifdef MULTI_SERIES
modifier->setSeries1CB(series1CB);
modifier->setSeries2CB(series2CB);