summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2/declarativescatter_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/datavisualizationqml2/declarativescatter_p.h')
-rw-r--r--src/datavisualizationqml2/declarativescatter_p.h37
1 files changed, 21 insertions, 16 deletions
diff --git a/src/datavisualizationqml2/declarativescatter_p.h b/src/datavisualizationqml2/declarativescatter_p.h
index b9f5a3b7..bca44085 100644
--- a/src/datavisualizationqml2/declarativescatter_p.h
+++ b/src/datavisualizationqml2/declarativescatter_p.h
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2013 Digia Plc
+** Copyright (C) 2014 Digia Plc
** All rights reserved.
** For any questions to Digia, please use contact form at http://qt.digia.com
**
@@ -33,7 +33,7 @@
#include "abstractdeclarative_p.h"
#include "scatter3dcontroller_p.h"
#include "declarativescatter_p.h"
-#include "q3dvalueaxis.h"
+#include "qvalue3daxis.h"
#include "qscatterdataproxy.h"
#include "qscatter3dseries.h"
@@ -41,14 +41,14 @@
#include <QQuickItem>
#include <QObject>
-QT_DATAVISUALIZATION_BEGIN_NAMESPACE
+QT_BEGIN_NAMESPACE_DATAVISUALIZATION
class DeclarativeScatter : public AbstractDeclarative
{
Q_OBJECT
- 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(QValue3DAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged)
+ Q_PROPERTY(QValue3DAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged)
+ Q_PROPERTY(QValue3DAxis *axisZ READ axisZ WRITE setAxisZ NOTIFY axisZChanged)
Q_PROPERTY(QQmlListProperty<QScatter3DSeries> seriesList READ seriesList)
Q_CLASSINFO("DefaultProperty", "seriesList")
@@ -56,12 +56,12 @@ public:
explicit DeclarativeScatter(QQuickItem *parent = 0);
~DeclarativeScatter();
- Q3DValueAxis *axisX() const;
- void setAxisX(Q3DValueAxis *axis);
- Q3DValueAxis *axisY() const;
- void setAxisY(Q3DValueAxis *axis);
- Q3DValueAxis *axisZ() const;
- void setAxisZ(Q3DValueAxis *axis);
+ QValue3DAxis *axisX() const;
+ void setAxisX(QValue3DAxis *axis);
+ QValue3DAxis *axisY() const;
+ void setAxisY(QValue3DAxis *axis);
+ QValue3DAxis *axisZ() const;
+ void setAxisZ(QValue3DAxis *axis);
QQmlListProperty<QScatter3DSeries> seriesList();
static void appendSeriesFunc(QQmlListProperty<QScatter3DSeries> *list, QScatter3DSeries *series);
@@ -71,15 +71,20 @@ public:
Q_INVOKABLE void addSeries(QScatter3DSeries *series);
Q_INVOKABLE void removeSeries(QScatter3DSeries *series);
+public slots:
+ void handleAxisXChanged(QAbstract3DAxis *axis);
+ void handleAxisYChanged(QAbstract3DAxis *axis);
+ void handleAxisZChanged(QAbstract3DAxis *axis);
+
signals:
- void axisXChanged(Q3DValueAxis *axis);
- void axisYChanged(Q3DValueAxis *axis);
- void axisZChanged(Q3DValueAxis *axis);
+ void axisXChanged(QValue3DAxis *axis);
+ void axisYChanged(QValue3DAxis *axis);
+ void axisZChanged(QValue3DAxis *axis);
protected:
Scatter3DController *m_scatterController;
};
-QT_DATAVISUALIZATION_END_NAMESPACE
+QT_END_NAMESPACE_DATAVISUALIZATION
#endif