Make background margin configurable

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 <mika.salmela@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 10 insertions, 1 deletions

diff --git a/tests/scattertest/main.cpp b/tests/scattertest/main.cpp
index 116a4dc2..811c7f3b 100644
--- a/tests/scattertest/main.cpp
+++ b/tests/scattertest/main.cpp
@@ -294,6 +294,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);
+
     vLayout->addWidget(themeButton, 0, Qt::AlignTop);
     vLayout->addWidget(labelButton, 0, Qt::AlignTop);
     vLayout->addWidget(styleButton, 0, Qt::AlignTop);
@@ -357,7 +362,9 @@ int main(int argc, char **argv)
     vLayout3->addWidget(new QLabel(QStringLiteral("Camera target")), 0, Qt::AlignTop);
     vLayout3->addWidget(cameraTargetSliderX, 0, Qt::AlignTop);
     vLayout3->addWidget(cameraTargetSliderY, 0, Qt::AlignTop);
-    vLayout3->addWidget(cameraTargetSliderZ, 1, Qt::AlignTop);
+    vLayout3->addWidget(cameraTargetSliderZ, 0, Qt::AlignTop);
+    vLayout3->addWidget(new QLabel(QStringLiteral("Adjust margin")), 0, Qt::AlignTop);
+    vLayout3->addWidget(marginSlider, 1, Qt::AlignTop);
 
     ScatterDataModifier *modifier = new ScatterDataModifier(chart);
 
@@ -469,6 +476,8 @@ int main(int argc, char **argv)
                      &ScatterDataModifier::setCameraTargetY);
     QObject::connect(cameraTargetSliderZ, &QSlider::valueChanged, modifier,
                      &ScatterDataModifier::setCameraTargetZ);
+    QObject::connect(marginSlider, &QSlider::valueChanged, modifier,
+                     &ScatterDataModifier::setGraphMargin);
 
     modifier->setFpsLabel(fpsLabel);