diff options
Diffstat (limited to 'src/datavis3d/engine/scatter3drenderer_p.h')
-rw-r--r-- | src/datavis3d/engine/scatter3drenderer_p.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/datavis3d/engine/scatter3drenderer_p.h b/src/datavis3d/engine/scatter3drenderer_p.h index a15c606f..2fb81855 100644 --- a/src/datavis3d/engine/scatter3drenderer_p.h +++ b/src/datavis3d/engine/scatter3drenderer_p.h @@ -29,22 +29,12 @@ #ifndef Q3DSCATTERRENDERER_P_H #define Q3DSCATTERRENDERER_P_H -#include <QtCore/QSize> -#include <QtCore/QObject> -#include <QtGui/QOpenGLFunctions> -#include <QtGui/QFont> -#include <QTime> -#include <QWindow> -#include <QMutex> - #include "datavis3dglobal_p.h" #include "scatter3dcontroller_p.h" #include "abstract3drenderer_p.h" #include "qscatterdataproxy.h" #include "scatterrenderitem_p.h" -//#define DISPLAY_RENDER_SPEED - class QPoint; class QSizeF; class QOpenGLShaderProgram; @@ -68,10 +58,6 @@ private: Scatter3DController *m_controller; - // Mutex for sharing resources between render and main threads. - // TODO: this mutex needs to go, too - QMutex m_mutex; - // Internal state ScatterRenderItem *m_selectedItem; // points to renderitem array ScatterRenderItem *m_previouslySelectedItem; // points to renderitem array @@ -102,20 +88,11 @@ private: QSizeF m_areaSize; GLfloat m_dotSizeScale; - QPoint m_selectionPointRequest; - bool m_isSelectionPointRequestActive; - bool m_hasHeightAdjustmentChanged; ScatterRenderItem m_dummyRenderItem; ScatterRenderItemArray m_renderItemArray; -#ifdef DISPLAY_RENDER_SPEED - bool m_isFirstFrame; - QTime m_lastFrameTime; - GLint m_numFrames; -#endif - public: explicit Scatter3DRenderer(Scatter3DController *controller); ~Scatter3DRenderer(); @@ -161,14 +138,6 @@ public slots: // Overloaded from abstract renderer virtual void updateAxisRange(QAbstractAxis::AxisOrientation orientation, qreal min, qreal max); - - // Requests that upon next render pass the column and row under the given point is inspected for selection. - // Only one request can be queued per render pass at this point. New request will override any pending requests. - // After inspection the selectionUpdated signal is emitted. - virtual void requestSelectionAtPoint(const QPoint &point); - -signals: - void selectionUpdated(QVector3D selection); }; |