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>

3 files changed, 17 insertions, 1 deletions

diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp
index d7b23719..6be5e66d 100644
--- a/tests/barstest/chart.cpp
+++ b/tests/barstest/chart.cpp
@@ -1531,6 +1531,12 @@ void GraphModifier::setFloorLevel(int value)
     qDebug() << "Floor level:" << value;
 }
 
+void GraphModifier::setGraphMargin(int value)
+{
+    m_graph->setMargin(qreal(value) / 100.0);
+    qDebug() << "Setting margin:" << m_graph->margin() << 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 93abbfa4..9713d06c 100644
--- a/tests/barstest/chart.h
+++ b/tests/barstest/chart.h
@@ -126,6 +126,7 @@ public slots:
     void setCameraTargetY(int value);
     void setCameraTargetZ(int value);
     void setFloorLevel(int value);
+    void setGraphMargin(int value);
 
 signals:
     void shadowQualityChanged(int quality);
diff --git a/tests/barstest/main.cpp b/tests/barstest/main.cpp
index cffbf4b4..a468cb57 100644
--- a/tests/barstest/main.cpp
+++ b/tests/barstest/main.cpp
@@ -368,6 +368,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(addSeriesButton, 0, Qt::AlignTop);
     vLayout->addWidget(addDataButton, 0, Qt::AlignTop);
     vLayout->addWidget(addMultiDataButton, 0, Qt::AlignTop);
@@ -447,7 +452,9 @@ int main(int argc, char **argv)
     vLayout3->addWidget(reflectivitySlider, 0, 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);
+    vLayout3->addWidget(floorLevelSlider, 0, Qt::AlignTop);
+    vLayout3->addWidget(new QLabel(QStringLiteral("Adjust margin")), 0, Qt::AlignTop);
+    vLayout3->addWidget(marginSlider, 1, Qt::AlignTop);
 
     widget->show();
 
@@ -584,6 +591,8 @@ int main(int argc, char **argv)
                      &GraphModifier::setReflectivity);
     QObject::connect(floorLevelSlider, &QSlider::valueChanged, modifier,
                      &GraphModifier::setFloorLevel);
+    QObject::connect(marginSlider, &QSlider::valueChanged, modifier,
+                     &GraphModifier::setGraphMargin);
     QObject::connect(toggleCustomItemButton, &QPushButton::clicked, modifier,
                      &GraphModifier::toggleCustomItem);