diff options
Diffstat (limited to 'src/datavisualization/engine/q3dscatter.h')
-rw-r--r-- | src/datavisualization/engine/q3dscatter.h | 74 |
1 files changed, 25 insertions, 49 deletions
diff --git a/src/datavisualization/engine/q3dscatter.h b/src/datavisualization/engine/q3dscatter.h index e58146a1..55158537 100644 --- a/src/datavisualization/engine/q3dscatter.h +++ b/src/datavisualization/engine/q3dscatter.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 ** @@ -19,71 +19,47 @@ #ifndef Q3DSCATTER_H #define Q3DSCATTER_H -#include <QtDataVisualization/qdatavisualizationenums.h> -#include <QtDataVisualization/q3dwindow.h> +#include <QtDataVisualization/qabstract3dgraph.h> #include <QtDataVisualization/q3dscene.h> -#include <QtDataVisualization/q3dtheme.h> #include <QFont> #include <QLinearGradient> -QT_DATAVISUALIZATION_BEGIN_NAMESPACE +QT_BEGIN_NAMESPACE_DATAVISUALIZATION class Q3DScatterPrivate; -class LabelItem; -class Q3DValueAxis; -class Q3DCategoryAxis; +class QValue3DAxis; +class QCategory3DAxis; class QScatter3DSeries; -class Q3DTheme; -class QT_DATAVISUALIZATION_EXPORT Q3DScatter : public Q3DWindow +class QT_DATAVISUALIZATION_EXPORT Q3DScatter : public QAbstract3DGraph { Q_OBJECT - Q_PROPERTY(QtDataVisualization::QDataVis::SelectionFlags selectionMode READ selectionMode WRITE setSelectionMode NOTIFY selectionModeChanged) - Q_PROPERTY(QtDataVisualization::QDataVis::ShadowQuality shadowQuality READ shadowQuality WRITE setShadowQuality NOTIFY shadowQualityChanged) - Q_PROPERTY(Q3DTheme* theme READ theme WRITE setTheme NOTIFY themeChanged) - Q_PROPERTY(Q3DScene* scene READ scene) + 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) public: - explicit Q3DScatter(QWindow *parent = 0); + explicit Q3DScatter(const QSurfaceFormat *format = 0, QWindow *parent = 0); virtual ~Q3DScatter(); void addSeries(QScatter3DSeries *series); void removeSeries(QScatter3DSeries *series); - QList<QScatter3DSeries *> seriesList(); - - void setTheme(Q3DTheme *theme); - Q3DTheme *theme() const; - - void setSelectionMode(QDataVis::SelectionFlags mode); - QDataVis::SelectionFlags selectionMode() const; - - Q3DScene *scene() const; - - void setShadowQuality(QDataVis::ShadowQuality quality); - QDataVis::ShadowQuality shadowQuality() const; - - void setAxisX(Q3DValueAxis *axis); - Q3DValueAxis *axisX() const; - void setAxisY(Q3DValueAxis *axis); - Q3DValueAxis *axisY() const; - void setAxisZ(Q3DValueAxis *axis); - Q3DValueAxis *axisZ() const; - void addAxis(Q3DValueAxis *axis); - void releaseAxis(Q3DValueAxis *axis); - QList<Q3DValueAxis *> axes() const; + QList<QScatter3DSeries *> seriesList() const; + + void setAxisX(QValue3DAxis *axis); + QValue3DAxis *axisX() const; + void setAxisY(QValue3DAxis *axis); + QValue3DAxis *axisY() const; + void setAxisZ(QValue3DAxis *axis); + QValue3DAxis *axisZ() const; + void addAxis(QValue3DAxis *axis); + void releaseAxis(QValue3DAxis *axis); + QList<QValue3DAxis *> axes() const; signals: - void selectionModeChanged(QDataVis::SelectionFlags mode); - void shadowQualityChanged(QDataVis::ShadowQuality quality); - void themeChanged(Q3DTheme* theme); - -protected: - void mouseDoubleClickEvent(QMouseEvent *event); - void touchEvent(QTouchEvent *event); - void mousePressEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); - void mouseMoveEvent(QMouseEvent *event); - void wheelEvent(QWheelEvent *event); + void axisXChanged(QValue3DAxis *axis); + void axisYChanged(QValue3DAxis *axis); + void axisZChanged(QValue3DAxis *axis); private: Q3DScatterPrivate *dptr(); @@ -91,6 +67,6 @@ private: Q_DISABLE_COPY(Q3DScatter) }; -QT_DATAVISUALIZATION_END_NAMESPACE +QT_END_NAMESPACE_DATAVISUALIZATION #endif |