diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-06-03 06:56:24 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-06-03 08:28:02 +0300 |
commit | c80c034c712d607f9c9b748cecda02e2af67820a (patch) | |
tree | 24fa887e465367f4b4b121e77da86902579ac07a /src/datavisualization/engine/scatter3drenderer_p.h | |
parent | c1717ad4f2ffc1bc8141c96005b7dadfd74d583d (diff) |
Clean up renderers
Task-number: QTRD-3149
Change-Id: I71b9b7533ad3730d0d203c3d07e66d824b690fbb
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/scatter3drenderer_p.h')
-rw-r--r-- | src/datavisualization/engine/scatter3drenderer_p.h | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h index 373e0f38..b6bafb3b 100644 --- a/src/datavisualization/engine/scatter3drenderer_p.h +++ b/src/datavisualization/engine/scatter3drenderer_p.h @@ -32,21 +32,16 @@ #include "datavisualizationglobal_p.h" #include "scatter3dcontroller_p.h" #include "abstract3drenderer_p.h" -#include "qscatterdataproxy.h" #include "scatterrenderitem_p.h" -class QPoint; class QSizeF; -class QOpenGLShaderProgram; QT_BEGIN_NAMESPACE_DATAVISUALIZATION class ShaderHelper; -class ObjectHelper; -class LabelItem; class Q3DScene; -class QAbstractAxisPrivate; class ScatterSeriesRenderCache; +class QScatterDataItem; class QT_DATAVISUALIZATION_EXPORT Scatter3DRenderer : public Abstract3DRenderer { @@ -79,7 +74,6 @@ private: ScatterSeriesRenderCache *m_selectedSeriesCache; QSizeF m_areaSize; GLfloat m_dotSizeScale; - QVector3D m_translationOffset; bool m_hasHeightAdjustmentChanged; ScatterRenderItem m_dummyRenderItem; GLfloat m_backgroundMargin; @@ -107,6 +101,9 @@ public: void render(GLuint defaultFboHandle); +public slots: + void updateSelectedItem(int index, QScatter3DSeries *series); + protected: virtual void initializeOpenGL(); @@ -135,17 +132,11 @@ private: void calculateTranslation(ScatterRenderItem &item); void calculateSceneScalingFactors(); - Q_DISABLE_COPY(Scatter3DRenderer) - - friend class ScatterRenderItem; - -public slots: - void updateSelectedItem(int index, QScatter3DSeries *series); - -private: void selectionColorToSeriesAndIndex(const QVector4D &color, int &index, QAbstract3DSeries *&series); inline void updateRenderItem(const QScatterDataItem &dataItem, ScatterRenderItem &renderItem); + + Q_DISABLE_COPY(Scatter3DRenderer) }; QT_END_NAMESPACE_DATAVISUALIZATION |