diff options
Diffstat (limited to 'src/datavisualization/engine/selectionpointer.cpp')
-rw-r--r-- | src/datavisualization/engine/selectionpointer.cpp | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp index 25c59026..c37e9886 100644 --- a/src/datavisualization/engine/selectionpointer.cpp +++ b/src/datavisualization/engine/selectionpointer.cpp @@ -43,7 +43,6 @@ SelectionPointer::SelectionPointer(Drawer *drawer) m_labelObj(0), m_pointObj(0), m_textureHelper(0), - m_isInitialized(false), m_cachedTheme(drawer->theme()), m_labelBackground(false), m_drawer(drawer), @@ -60,27 +59,18 @@ SelectionPointer::~SelectionPointer() delete m_labelShader; delete m_pointShader; delete m_labelObj; - delete m_pointObj; delete m_textureHelper; } void SelectionPointer::initializeOpenGL() { - if (m_isInitialized) - return; - initializeOpenGLFunctions(); m_textureHelper = new TextureHelper(); m_drawer->initializeOpenGL(); initShaders(); - loadLabelMesh(); - loadPointMesh(); - - // Set initialized -flag - m_isInitialized = true; } void SelectionPointer::updateScene(Q3DScene *scene) @@ -213,13 +203,17 @@ void SelectionPointer::updateSliceData(bool sliceActivated, GLfloat autoScaleAdj m_autoScaleAdjustment = autoScaleAdjustment; } -void SelectionPointer::setLabel(QString label) +void SelectionPointer::setLabel(const QString &label) { m_label = label; - m_drawer->generateLabelItem(m_labelItem, m_label); } +void SelectionPointer::setPointerObject(ObjectHelper *object) +{ + m_pointObj = object; +} + void SelectionPointer::handleDrawerChange() { m_cachedTheme = m_drawer->theme(); @@ -262,12 +256,4 @@ void SelectionPointer::loadLabelMesh() m_labelObj->load(); } -void SelectionPointer::loadPointMesh() -{ - if (m_pointObj) - delete m_pointObj; - m_pointObj = new ObjectHelper(QStringLiteral(":/defaultMeshes/sphereSmooth")); - m_pointObj->load(); -} - QT_DATAVISUALIZATION_END_NAMESPACE |