summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/selectionpointer_p.h
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-12-03 12:11:38 +0200
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2013-12-03 12:21:13 +0200
commitf44e0e8e858c8687e40eba679f865f142b73be01 (patch)
tree0735d194f0b9702c64a06d6369f9d2328d4fb4d3 /src/datavisualization/engine/selectionpointer_p.h
parentf61a34e357a3fdbc78c344ee6134fc87113fb33a (diff)
Move series specific visual elements to series, part 3
Surface pointer to use series mesh Task-number: QTRD-2557 Change-Id: Ibf6c1d91c8bce22b4f9c71b0fbf4d62ad8cc09da Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/selectionpointer_p.h')
-rw-r--r--src/datavisualization/engine/selectionpointer_p.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/datavisualization/engine/selectionpointer_p.h b/src/datavisualization/engine/selectionpointer_p.h
index d3d46e2c..46903fd2 100644
--- a/src/datavisualization/engine/selectionpointer_p.h
+++ b/src/datavisualization/engine/selectionpointer_p.h
@@ -59,27 +59,26 @@ public:
explicit SelectionPointer(Drawer *drawer);
~SelectionPointer();
- void initializeOpenGL();
void render(GLuint defaultFboHandle = 0);
void setPosition(QVector3D position);
- void setLabel(QString label);
+ void setLabel(const QString &label);
+ void setPointerObject(ObjectHelper *object);
void handleDrawerChange();
void updateBoundingRect(QRect rect);
void updateScene(Q3DScene *scene);
void updateSliceData(bool sliceActivated, GLfloat autoScaleAdjustment);
private:
+ void initializeOpenGL();
void initShaders();
void loadLabelMesh();
- void loadPointMesh();
private:
ShaderHelper *m_labelShader;
ShaderHelper *m_pointShader;
ObjectHelper *m_labelObj;
- ObjectHelper *m_pointObj;
+ ObjectHelper *m_pointObj; // Not owned
TextureHelper *m_textureHelper;
- bool m_isInitialized;
Q3DTheme *m_cachedTheme;
bool m_labelBackground;
LabelItem m_labelItem;