From 36bc54f5720bddb9899e64d665117ac1e1b5bc94 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Fri, 19 Sep 2014 13:32:31 +0300
Subject: Allow setting the floor level on bar graphs.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTRD-3313
Change-Id: Ie0f8e36af8698081a6937c360043773da895b6e6
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
---
 src/datavisualizationqml2/datavisualizationqml2_plugin.cpp |  1 +
 src/datavisualizationqml2/declarativebars.cpp              | 13 +++++++++++++
 src/datavisualizationqml2/declarativebars_p.h              |  5 +++++
 3 files changed, 19 insertions(+)

(limited to 'src/datavisualizationqml2')

diff --git a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
index ecdd7454..a22fc55c 100644
--- a/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
+++ b/src/datavisualizationqml2/datavisualizationqml2_plugin.cpp
@@ -116,6 +116,7 @@ void QtDataVisualizationQml2Plugin::registerTypes(const char *uri)
     qmlRegisterType<DeclarativeSurface, 1>(uri, 1, 2, "Surface3D");
     qmlRegisterType<Q3DCamera, 1>(uri, 1, 2, "Camera3D");
     qmlRegisterType<QCustom3DItem, 1>(uri, 1, 2, "Custom3DItem");
+    qmlRegisterType<DeclarativeBars, 1>(uri, 1, 2, "Bars3D");
 
     // New types
     qmlRegisterType<Q3DInputHandler>(uri, 1, 2, "InputHandler3D");
diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp
index 9670a7db..61e6aafb 100644
--- a/src/datavisualizationqml2/declarativebars.cpp
+++ b/src/datavisualizationqml2/declarativebars.cpp
@@ -129,6 +129,19 @@ QBar3DSeries *DeclarativeBars::selectedSeries() const
     return m_barsController->selectedSeries();
 }
 
+void DeclarativeBars::setFloorLevel(float level)
+{
+    if (level != floorLevel()) {
+        m_barsController->setFloorLevel(level);
+        emit floorLevelChanged(level);
+    }
+}
+
+float DeclarativeBars::floorLevel() const
+{
+    return m_barsController->floorLevel();
+}
+
 QQmlListProperty<QBar3DSeries> DeclarativeBars::seriesList()
 {
     return QQmlListProperty<QBar3DSeries>(this, this,
diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h
index 52690813..05d66cdc 100644
--- a/src/datavisualizationqml2/declarativebars_p.h
+++ b/src/datavisualizationqml2/declarativebars_p.h
@@ -48,6 +48,7 @@ class DeclarativeBars : public AbstractDeclarative
     Q_PROPERTY(QQmlListProperty<QBar3DSeries> seriesList READ seriesList)
     Q_PROPERTY(QBar3DSeries *selectedSeries READ selectedSeries NOTIFY selectedSeriesChanged)
     Q_PROPERTY(QBar3DSeries *primarySeries READ primarySeries WRITE setPrimarySeries NOTIFY primarySeriesChanged)
+    Q_PROPERTY(float floorLevel READ floorLevel WRITE setFloorLevel NOTIFY floorLevelChanged REVISION 1)
     Q_CLASSINFO("DefaultProperty", "seriesList")
 
 public:
@@ -85,6 +86,9 @@ public:
     QBar3DSeries *primarySeries() const;
     QBar3DSeries *selectedSeries() const;
 
+    void setFloorLevel(float level);
+    float floorLevel() const;
+
 public slots:
     void handleAxisXChanged(QAbstract3DAxis *axis);
     void handleAxisYChanged(QAbstract3DAxis *axis);
@@ -101,6 +105,7 @@ signals:
     void meshFileNameChanged(QString filename);
     void primarySeriesChanged(QBar3DSeries *series);
     void selectedSeriesChanged(QBar3DSeries *series);
+    Q_REVISION(1) void floorLevelChanged(float level);
 
 private:
     Bars3DController *m_barsController;
-- 
cgit v1.2.3