Notifys added to properties

Task-number: QTRD-2671

Change-Id: If95696b01eab836c2b4d5c6a3c19d7da9b255ab3
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

8 files changed, 52 insertions, 12 deletions

diff --git a/src/datavisualizationqml2/colorgradient.cpp b/src/datavisualizationqml2/colorgradient.cpp
index 43efbd1c..e4c16ebe 100644
--- a/src/datavisualizationqml2/colorgradient.cpp
+++ b/src/datavisualizationqml2/colorgradient.cpp
@@ -34,6 +34,7 @@ void ColorGradientStop::setPosition(qreal position)
 {
     m_position = position;
     updateGradient();
+    emit positionChanged(position);
 }
 
 QColor ColorGradientStop::color() const
@@ -45,6 +46,7 @@ void ColorGradientStop::setColor(const QColor &color)
 {
     m_color = color;
     updateGradient();
+    emit colorChanged(color);
 }
 
 void ColorGradientStop::updateGradient()
diff --git a/src/datavisualizationqml2/colorgradient_p.h b/src/datavisualizationqml2/colorgradient_p.h
index d1cc0543..21098142 100644
--- a/src/datavisualizationqml2/colorgradient_p.h
+++ b/src/datavisualizationqml2/colorgradient_p.h
@@ -39,8 +39,8 @@ class ColorGradientStop : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(qreal position READ position WRITE setPosition)
-    Q_PROPERTY(QColor color READ color WRITE setColor)
+    Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged)
+    Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
 
 public:
     ColorGradientStop(QObject *parent = 0);
@@ -51,6 +51,10 @@ public:
     QColor color() const;
     void setColor(const QColor &color);
 
+signals:
+    void positionChanged(qreal position);
+    void colorChanged(QColor color);
+
 private:
     void updateGradient();
 
diff --git a/src/datavisualizationqml2/declarativebars.cpp b/src/datavisualizationqml2/declarativebars.cpp
index 4c7bccd7..a72e0399 100644
--- a/src/datavisualizationqml2/declarativebars.cpp
+++ b/src/datavisualizationqml2/declarativebars.cpp
@@ -37,6 +37,14 @@ DeclarativeBars::DeclarativeBars(QQuickItem *parent)
     // Create the shared component on the main GUI thread.
     m_barsController = new Bars3DController(boundingRect().toRect());
     AbstractDeclarative::setSharedController(m_barsController);
+
+    // TODO: Uncomment when doing QTRD-2669
+//    connect(m_barsController, &Bars3DController::rowAxisChanged,
+//            this, &DeclarativeBars::rowAxisChanged);
+//    connect(m_barsController, &Bars3DController::valueAxisChanged,
+//            this, &DeclarativeBars::valueAxisChanged);
+//    connect(m_barsController, &Bars3DController::columnAxisChanged,
+//            this, &DeclarativeBars::columnAxisChanged);
 }
 
 DeclarativeBars::~DeclarativeBars()
diff --git a/src/datavisualizationqml2/declarativebars_p.h b/src/datavisualizationqml2/declarativebars_p.h
index 4bfe3755..6f93e2d1 100644
--- a/src/datavisualizationqml2/declarativebars_p.h
+++ b/src/datavisualizationqml2/declarativebars_p.h
@@ -48,9 +48,9 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 class DeclarativeBars : public AbstractDeclarative
 {
     Q_OBJECT
-    Q_PROPERTY(Q3DCategoryAxis *rowAxis READ rowAxis WRITE setRowAxis)
-    Q_PROPERTY(Q3DValueAxis *valueAxis READ valueAxis WRITE setValueAxis)
-    Q_PROPERTY(Q3DCategoryAxis *columnAxis READ columnAxis WRITE setColumnAxis)
+    Q_PROPERTY(Q3DCategoryAxis *rowAxis READ rowAxis WRITE setRowAxis NOTIFY rowAxisChanged)
+    Q_PROPERTY(Q3DValueAxis *valueAxis READ valueAxis WRITE setValueAxis NOTIFY valueAxisChanged)
+    Q_PROPERTY(Q3DCategoryAxis *columnAxis READ columnAxis WRITE setColumnAxis NOTIFY columnAxisChanged)
     Q_PROPERTY(float barThickness READ barThickness WRITE setBarThickness NOTIFY barThicknessChanged)
     Q_PROPERTY(QSizeF barSpacing READ barSpacing WRITE setBarSpacing NOTIFY barSpacingChanged)
     Q_PROPERTY(bool barSpacingRelative READ isBarSpacingRelative WRITE setBarSpacingRelative NOTIFY barSpacingRelativeChanged)
@@ -88,6 +88,9 @@ public:
     Q_INVOKABLE void removeSeries(QBar3DSeries *series);
 
 signals:
+    void rowAxisChanged(Q3DCategoryAxis *axis);
+    void valueAxisChanged(Q3DValueAxis *axis);
+    void columnAxisChanged(Q3DCategoryAxis *axis);
     void barThicknessChanged(float thicknessRatio);
     void barSpacingChanged(QSizeF spacing);
     void barSpacingRelativeChanged(bool relative);
diff --git a/src/datavisualizationqml2/declarativescatter.cpp b/src/datavisualizationqml2/declarativescatter.cpp
index 40ef2926..483bb467 100644
--- a/src/datavisualizationqml2/declarativescatter.cpp
+++ b/src/datavisualizationqml2/declarativescatter.cpp
@@ -36,6 +36,14 @@ DeclarativeScatter::DeclarativeScatter(QQuickItem *parent)
     // Create the shared component on the main GUI thread.
     m_scatterController = new Scatter3DController(boundingRect().toRect());
     setSharedController(m_scatterController);
+
+    // TODO: Uncomment when doing QTRD-2669
+//    connect(m_scatterController, &Scatter3DController::axisXChanged,
+//            this, &DeclarativeBars::axisXChanged);
+//    connect(m_scatterController, &Scatter3DController::axisYChanged,
+//            this, &DeclarativeBars::axisYChanged);
+//    connect(m_scatterController, &Scatter3DController::axisZChanged,
+//            this, &DeclarativeBars::axisZChanged);
 }
 
 DeclarativeScatter::~DeclarativeScatter()
diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h
index 8445b3d6..b9f5a3b7 100644
--- a/src/datavisualizationqml2/declarativescatter_p.h
+++ b/src/datavisualizationqml2/declarativescatter_p.h
@@ -46,9 +46,9 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 class DeclarativeScatter : public AbstractDeclarative
 {
     Q_OBJECT
-    Q_PROPERTY(Q3DValueAxis *axisX READ axisX WRITE setAxisX)
-    Q_PROPERTY(Q3DValueAxis *axisY READ axisY WRITE setAxisY)
-    Q_PROPERTY(Q3DValueAxis *axisZ READ axisZ WRITE setAxisZ)
+    Q_PROPERTY(Q3DValueAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
+    Q_PROPERTY(Q3DValueAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
+    Q_PROPERTY(Q3DValueAxis *axisZ READ axisZ WRITE setAxisZ NOTIFY axisZChanged)
     Q_PROPERTY(QQmlListProperty<QScatter3DSeries> seriesList READ seriesList)
     Q_CLASSINFO("DefaultProperty", "seriesList")
 
@@ -72,7 +72,9 @@ public:
     Q_INVOKABLE void removeSeries(QScatter3DSeries *series);
 
 signals:
-    void meshFileNameChanged(QString filename);
+    void axisXChanged(Q3DValueAxis *axis);
+    void axisYChanged(Q3DValueAxis *axis);
+    void axisZChanged(Q3DValueAxis *axis);
 
 protected:
     Scatter3DController *m_scatterController;
diff --git a/src/datavisualizationqml2/declarativesurface.cpp b/src/datavisualizationqml2/declarativesurface.cpp
index a450645f..b0adeb21 100644
--- a/src/datavisualizationqml2/declarativesurface.cpp
+++ b/src/datavisualizationqml2/declarativesurface.cpp
@@ -38,6 +38,14 @@ DeclarativeSurface::DeclarativeSurface(QQuickItem *parent)
     // Create the shared component on the main GUI thread.
     m_surfaceController = new Surface3DController(boundingRect().toRect());
     setSharedController(m_surfaceController);
+
+    // TODO: Uncomment when doing QTRD-2669
+//    connect(m_surfaceController, &Surface3DController::axisXChanged,
+//            this, &DeclarativeBars::axisXChanged);
+//    connect(m_surfaceController, &Surface3DController::axisYChanged,
+//            this, &DeclarativeBars::axisYChanged);
+//    connect(m_surfaceController, &Surface3DController::axisZChanged,
+//            this, &DeclarativeBars::axisZChanged);
 }
 
 DeclarativeSurface::~DeclarativeSurface()
diff --git a/src/datavisualizationqml2/declarativesurface_p.h b/src/datavisualizationqml2/declarativesurface_p.h
index 4c7377be..70963c4d 100644
--- a/src/datavisualizationqml2/declarativesurface_p.h
+++ b/src/datavisualizationqml2/declarativesurface_p.h
@@ -48,9 +48,9 @@ QT_DATAVISUALIZATION_BEGIN_NAMESPACE
 class DeclarativeSurface : public AbstractDeclarative
 {
     Q_OBJECT
-    Q_PROPERTY(Q3DValueAxis *axisX READ axisX WRITE setAxisX)
-    Q_PROPERTY(Q3DValueAxis *axisY READ axisY WRITE setAxisY)
-    Q_PROPERTY(Q3DValueAxis *axisZ READ axisZ WRITE setAxisZ)
+    Q_PROPERTY(Q3DValueAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
+    Q_PROPERTY(Q3DValueAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
+    Q_PROPERTY(Q3DValueAxis *axisZ READ axisZ WRITE setAxisZ NOTIFY axisZChanged)
     Q_PROPERTY(ColorGradient *gradient READ gradient WRITE setGradient)
     Q_PROPERTY(QQmlListProperty<QSurface3DSeries> seriesList READ seriesList)
     Q_CLASSINFO("DefaultProperty", "seriesList")
@@ -77,6 +77,11 @@ public:
     Q_INVOKABLE void addSeries(QSurface3DSeries *series);
     Q_INVOKABLE void removeSeries(QSurface3DSeries *series);
 
+signals:
+    void axisXChanged(Q3DValueAxis *axis);
+    void axisYChanged(Q3DValueAxis *axis);
+    void axisZChanged(Q3DValueAxis *axis);
+
 protected:
     void handleGradientUpdate();