diff options
author | Keränen Pasi <pasi.keranen@digia.com> | 2013-08-23 16:17:29 +0300 |
---|---|---|
committer | Pasi Keränen <pasi.keranen@digia.com> | 2013-09-10 09:46:55 +0300 |
commit | f3e38983d77c72f3121c33a149a58fdf9c64158c (patch) | |
tree | d7aebaed7e6e8b4570f8d96f195d1dca42c56f03 /src/datavis3d/engine/surface3dcontroller_p.h | |
parent | a88d9cacf7465ea0a1b5eb642f6c2f9cc7ad971d (diff) |
New 3D scene for lights and camera setup for input handlers.
Change-Id: Ib909bd818364c1646615df7c543d57b07b920a83
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavis3d/engine/surface3dcontroller_p.h')
-rw-r--r-- | src/datavis3d/engine/surface3dcontroller_p.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/datavis3d/engine/surface3dcontroller_p.h b/src/datavis3d/engine/surface3dcontroller_p.h index c626a00d..3086250c 100644 --- a/src/datavis3d/engine/surface3dcontroller_p.h +++ b/src/datavis3d/engine/surface3dcontroller_p.h @@ -54,11 +54,6 @@ private: GLfloat m_segmentStep; GLfloat m_segmentMinimum; - // Interaction - MouseState m_mouseState; - QPoint m_mousePos; - QDataVis::SelectionMode m_selectionMode; - public: explicit Surface3DController(QRect rect); ~Surface3DController(); @@ -66,10 +61,6 @@ public: void initializeOpenGL(); virtual void synchDataToRenderer(); - QPoint mousePosition(); - - QMatrix4x4 calculateViewMatrix(int zoom, int viewPortWidth, int viewPortHeight, bool showUnder = false); - // Enable or disable the smoothes of the surface void setSmoothSurface(bool enable); bool smoothSurface(); @@ -88,18 +79,10 @@ public: //TODO: Temp solution void setData(QList<qreal> series, int width, int depth); -#if defined(Q_OS_ANDROID) - void mouseDoubleClickEvent(QMouseEvent *event); - void touchEvent(QTouchEvent *event); -#endif - void mousePressEvent(QMouseEvent *event, const QPoint &mousePos); - void mouseReleaseEvent(QMouseEvent *event, const QPoint &mousePos); - void mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos); - void wheelEvent(QWheelEvent *event); - virtual void setActiveDataProxy(QAbstractDataProxy *proxy); virtual void handleAxisAutoAdjustRangeChangedInOrientation(Q3DAbstractAxis::AxisOrientation orientation, bool autoAdjust); + void handleSelectionAtPoint(const QPoint &point); public slots: void handleArrayReset(); |