From 6821c16e36a7454627ac9a18cd1d8b0f0bd9246f Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 29 Sep 2014 15:14:25 +0300 Subject: Make background margin configurable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added margin as abstract graph property. If the margin is narrow, the positions of theedge labels of the axes are adjusted to avoid overlap with edge labels on other axes. Task-number: QTRD-3204 Change-Id: I7fa5a04c8f2091519d99689ef2f6cbcf799fb15e Reviewed-by: Mika Salmela Reviewed-by: Tomi Korpipää --- tests/surfacetest/main.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'tests/surfacetest/main.cpp') diff --git a/tests/surfacetest/main.cpp b/tests/surfacetest/main.cpp index 9e14c665..d1328e4e 100644 --- a/tests/surfacetest/main.cpp +++ b/tests/surfacetest/main.cpp @@ -425,6 +425,11 @@ int main(int argc, char *argv[]) cameraTargetSliderZ->setValue(0); cameraTargetSliderZ->setMaximum(100); + QSlider *marginSlider = new QSlider(Qt::Horizontal, widget); + marginSlider->setMinimum(-1); + marginSlider->setValue(-1); + marginSlider->setMaximum(100); + // Add controls to the layout #ifdef MULTI_SERIES vLayout->addWidget(series1CB); @@ -491,7 +496,9 @@ int main(int argc, char *argv[]) vLayout2->addWidget(new QLabel(QStringLiteral("Camera target"))); vLayout2->addWidget(cameraTargetSliderX); vLayout2->addWidget(cameraTargetSliderY); - vLayout2->addWidget(cameraTargetSliderZ, 1, Qt::AlignTop); + vLayout2->addWidget(cameraTargetSliderZ); + vLayout2->addWidget(new QLabel(QStringLiteral("Adjust margin")), 0, Qt::AlignTop); + vLayout2->addWidget(marginSlider, 1, Qt::AlignTop); vLayout3->addWidget(labelButton); vLayout3->addWidget(meshButton); @@ -707,6 +714,8 @@ int main(int argc, char *argv[]) &GraphModifier::setCameraTargetY); QObject::connect(cameraTargetSliderZ, &QSlider::valueChanged, modifier, &GraphModifier::setCameraTargetZ); + QObject::connect(marginSlider, &QSlider::valueChanged, modifier, + &GraphModifier::setGraphMargin); #ifdef MULTI_SERIES modifier->setSeries1CB(series1CB); -- cgit v1.2.3