diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-07 11:09:34 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-01-07 13:26:02 +0200 |
commit | f8f57fe64c29408a8d3c41c536639e08f84747e4 (patch) | |
tree | 0d977c948945aef29e2724412dea638c512a7cb6 /src/datavisualization/engine/q3dsurface.h | |
parent | 8566d712a87d9e3a78be15b6bd3498c2cf8afe57 (diff) |
Abstract base class for graphs
Rename the Q3DWindow -> QAbstract3DGraph
Moved common properties and functionality from subclasses to
QAbstract3DGraph
Task-number: QTRD-2213
Change-Id: Icc1733f7efb1b06bdda024f1cf42b8bc24d96885
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/engine/q3dsurface.h')
-rw-r--r-- | src/datavisualization/engine/q3dsurface.h | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/src/datavisualization/engine/q3dsurface.h b/src/datavisualization/engine/q3dsurface.h index b91854d5..822e9d7c 100644 --- a/src/datavisualization/engine/q3dsurface.h +++ b/src/datavisualization/engine/q3dsurface.h @@ -20,7 +20,7 @@ #define Q3DSURFACE_H #include <QtDataVisualization/qdatavisualizationenums.h> -#include <QtDataVisualization/q3dwindow.h> +#include <QtDataVisualization/qabstract3dgraph.h> #include <QtDataVisualization/q3dscene.h> #include <QFont> @@ -30,13 +30,9 @@ class Q3DSurfacePrivate; class Q3DValueAxis; class QSurface3DSeries; -class QT_DATAVISUALIZATION_EXPORT Q3DSurface : public Q3DWindow +class QT_DATAVISUALIZATION_EXPORT Q3DSurface : 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(Q3DScene* scene READ scene) - public: explicit Q3DSurface(QWindow *parent = 0); virtual ~Q3DSurface(); @@ -45,12 +41,6 @@ public: void removeSeries(QSurface3DSeries *series); QList<QSurface3DSeries *> seriesList(); - void setShadowQuality(QDataVis::ShadowQuality quality); - QDataVis::ShadowQuality shadowQuality() const; - - void setSelectionMode(QDataVis::SelectionFlags mode); - QDataVis::SelectionFlags selectionMode() const; - // Axes void setAxisX(Q3DValueAxis *axis); Q3DValueAxis *axisX() const; @@ -62,20 +52,6 @@ public: void releaseAxis(Q3DValueAxis *axis); QList<Q3DValueAxis *> axes() const; - Q3DScene *scene() const; - -signals: - void selectionModeChanged(QDataVis::SelectionFlags mode); - void shadowQualityChanged(QDataVis::ShadowQuality quality); - -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); - private: Q3DSurfacePrivate *dptr(); const Q3DSurfacePrivate *dptrc() const; |