Added API for changing data aspect ratio

Task-number: QTRD-3144
Change-Id: I9acd1be13083d7fbbed840882260a60f46c5f698
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

2 files changed, 18 insertions, 0 deletions

diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index c09204da..9805cfb4 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -325,6 +325,9 @@ void AbstractDeclarative::setSharedController(Abstract3DController *controller)
 
     QObject::connect(m_controller.data(), &Abstract3DController::orthoProjectionChanged, this,
                      &AbstractDeclarative::orthoProjectionChanged);
+
+    QObject::connect(m_controller.data(), &Abstract3DController::aspectRatioChanged, this,
+                     &AbstractDeclarative::aspectRatioChanged);
 }
 
 void AbstractDeclarative::activateOpenGLContext(QQuickWindow *window)
@@ -687,6 +690,16 @@ AbstractDeclarative::ElementType AbstractDeclarative::selectedElement() const
     return ElementType(m_controller->selectedElement());
 }
 
+void AbstractDeclarative::setAspectRatio(qreal ratio)
+{
+    m_controller->setAspectRatio(float(ratio));
+}
+
+qreal AbstractDeclarative::aspectRatio() const
+{
+    return m_controller->aspectRatio();
+}
+
 void AbstractDeclarative::windowDestroyed(QObject *obj)
 {
     // Remove destroyed window from window lists
diff --git a/src/datavisualizationqml2/abstractdeclarative_p.h b/src/datavisualizationqml2/abstractdeclarative_p.h
index 374e6fb3..c2f9ee08 100644
--- a/src/datavisualizationqml2/abstractdeclarative_p.h
+++ b/src/datavisualizationqml2/abstractdeclarative_p.h
@@ -72,6 +72,7 @@ class AbstractDeclarative : public QQuickItem
     Q_PROPERTY(QQmlListProperty<QCustom3DItem> customItemList READ customItemList REVISION 1)
     Q_PROPERTY(bool orthoProjection READ isOrthoProjection WRITE setOrthoProjection NOTIFY orthoProjectionChanged REVISION 1)
     Q_PROPERTY(ElementType selectedElement READ selectedElement NOTIFY selectedElementChanged REVISION 1)
+    Q_PROPERTY(qreal aspectRatio READ aspectRatio WRITE setAspectRatio NOTIFY aspectRatioChanged REVISION 1)
 
 public:
     enum SelectionFlag {
@@ -181,6 +182,9 @@ public:
 
     AbstractDeclarative::ElementType selectedElement() const;
 
+    void setAspectRatio(qreal ratio);
+    qreal aspectRatio() const;
+
 public slots:
     virtual void handleAxisXChanged(QAbstract3DAxis *axis) = 0;
     virtual void handleAxisYChanged(QAbstract3DAxis *axis) = 0;
@@ -214,6 +218,7 @@ signals:
     Q_REVISION(1) void currentFpsChanged(qreal fps);
     Q_REVISION(1) void selectedElementChanged(QAbstract3DGraph::ElementType type);
     Q_REVISION(1) void orthoProjectionChanged(bool enabled);
+    Q_REVISION(1) void aspectRatioChanged(qreal ratio);
 
 private:
     QPointer<Abstract3DController> m_controller;