diff options
author | Keränen Pasi <pasi.keranen@digia.com> | 2013-06-20 11:19:27 +0300 |
---|---|---|
committer | Pasi Keränen <pasi.keranen@digia.com> | 2013-06-20 12:22:51 +0300 |
commit | e404fa6a329858520f19b4aa14be9bac2917b5fb (patch) | |
tree | d6e6d62bef35d5b7d15992554a99a7ea83a7feaa /src/datavis3d/engine/bars3dcontroller_p.h | |
parent | 12e154b1fd67c02f20ea86552a4540c99eb9c616 (diff) |
Cleanup after initial split.
Change-Id: I267a659f5a76257226193272239b752cc9688f0d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavis3d/engine/bars3dcontroller_p.h')
-rw-r--r-- | src/datavis3d/engine/bars3dcontroller_p.h | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/src/datavis3d/engine/bars3dcontroller_p.h b/src/datavis3d/engine/bars3dcontroller_p.h index 0f8d46e4..55ef1289 100644 --- a/src/datavis3d/engine/bars3dcontroller_p.h +++ b/src/datavis3d/engine/bars3dcontroller_p.h @@ -54,9 +54,6 @@ #include <QtCore/QSize> #include <QtCore/QObject> -#include <QtGui/QFont> -#include <QTime> -#include <QWindow> #include "qdatavis3dglobal.h" #include "qdatavis3namespace.h" @@ -64,21 +61,16 @@ //#define DISPLAY_RENDER_SPEED -class QOpenGLPaintDevice; +class QFont; class QPoint; class QSizeF; -class QOpenGLShaderProgram; QT_DATAVIS3D_BEGIN_NAMESPACE class QDataItem; class QDataRow; class QDataSet; -class ShaderHelper; -class ObjectHelper; -class TextureHelper; class Theme; -class Drawer; class LabelItem; class CameraHelper; @@ -214,25 +206,8 @@ public: void wheelEvent(QWheelEvent *event); void resizeNotify(); - void loadBarMesh(); - void loadBackgroundMesh(); - void loadGridLineMesh(); - void loadLabelMesh(); - void initShaders(const QString &vertexShader, const QString &fragmentShader); - void initSelectionShader(); - void initBackgroundShaders(const QString &vertexShader, const QString &fragmentShader); - void initLabelShaders(const QString &vertexShader, const QString &fragmentShader); - void initSelectionBuffer(); -#if !defined(QT_OPENGL_ES_2) - void initDepthShader(); - void updateDepthBuffer(); -#endif void updateTextures(); - void calculateSceneScalingFactors(); - void calculateHeightAdjustment(const QPair<GLfloat, GLfloat> &limits); Bars3dRenderer::SelectionType isSelected(GLint row, GLint bar, const QVector3D &selection); - void handleLimitChange(); - void closeZoomMode(); private: |