Adjust background margins based on angular labels and title

Also separated the vertical and horizontal background margins.

Task-number: QTRD-3184
Change-Id: I988217d4df7749585dd85b5ea8f3f50254dca6ad
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h
index b5d188e1..645a2a8e 100644
--- a/src/datavisualization/engine/scatter3drenderer_p.h
+++ b/src/datavisualization/engine/scatter3drenderer_p.h
@@ -67,10 +67,11 @@ private:
     GLuint m_selectionDepthBuffer;
     GLfloat m_shadowQualityToShader;
     GLint m_shadowQualityMultiplier;
-    GLfloat m_heightNormalizer;
+    float m_heightNormalizer;
     float m_scaleX;
     float m_scaleZ;
     float m_scaleXWithBackground;
+    float m_scaleYWithBackground;
     float m_scaleZWithBackground;
     int m_selectedItemIndex;
     ScatterSeriesRenderCache *m_selectedSeriesCache;
@@ -78,7 +79,6 @@ private:
     GLfloat m_dotSizeScale;
     bool m_hasHeightAdjustmentChanged;
     ScatterRenderItem m_dummyRenderItem;
-    GLfloat m_backgroundMargin;
     GLfloat m_maxItemSize;
     int m_clickedIndex;
     bool m_havePointSeries;
@@ -95,6 +95,10 @@ public:
     SeriesRenderCache *createNewCache(QAbstract3DSeries *series);
     void updateItems(const QVector<Scatter3DController::ChangeItem> &items);
     void updateScene(Q3DScene *scene);
+    void updateAxisLabels(QAbstract3DAxis::AxisOrientation orientation,
+                          const QStringList &labels);
+    void updateAxisTitleVisibility(QAbstract3DAxis::AxisOrientation orientation,
+                                   bool visible);
 
     QVector3D convertPositionToTranslation(const QVector3D &position, bool isAbsolute);