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, 8 insertions, 1 deletions

diff --git a/src/datavisualization/engine/abstract3dcontroller_p.h b/src/datavisualization/engine/abstract3dcontroller_p.h
index 6db774bd..4d7b36a3 100644
--- a/src/datavisualization/engine/abstract3dcontroller_p.h
+++ b/src/datavisualization/engine/abstract3dcontroller_p.h
@@ -96,6 +96,7 @@ struct Abstract3DChangeBitField {
     bool radialLabelOffsetChanged      : 1;
     bool reflectionChanged             : 1;
     bool reflectivityChanged           : 1;
+    bool marginChanged                 : 1;
 
     Abstract3DChangeBitField() :
         themeChanged(true),
@@ -144,7 +145,8 @@ struct Abstract3DChangeBitField {
         polarChanged(true),
         radialLabelOffsetChanged(true),
         reflectionChanged(true),
-        reflectivityChanged(true)
+        reflectivityChanged(true),
+        marginChanged(true)
     {
     }
 };
@@ -208,6 +210,7 @@ protected:
     QAbstract3DGraph::ElementType m_clickedType;
     int m_selectedLabelIndex;
     int m_selectedCustomItemIndex;
+    qreal m_margin;
 
     explicit Abstract3DController(QRect initialViewport, Q3DScene *scene, QObject *parent = 0);
 
@@ -310,6 +313,9 @@ public:
 
     QVector3D queriedGraphPosition() const;
 
+    void setMargin(qreal margin);
+    qreal margin() const;
+
     void emitNeedRender();
 
     virtual void clearSelection() = 0;
@@ -394,6 +400,7 @@ signals:
     void reflectivityChanged(qreal reflectivity);
     void localeChanged(const QLocale &locale);
     void queriedGraphPositionChanged(const QVector3D &data);
+    void marginChanged(qreal margin);
 
 protected:
     virtual QAbstract3DAxis *createDefaultAxis(QAbstract3DAxis::AxisOrientation orientation);