Merge remote-tracking branch 'origin/develop'

Change-Id: I544af544ecd946cdcccfe9c17d03e47f8d0c1151

1 files changed, 64 insertions, 0 deletions

diff --git a/src/datavis3d/data/labelitem.cpp b/src/datavis3d/data/labelitem.cpp
new file mode 100644
index 00000000..1d1bf6f7
--- /dev/null
+++ b/src/datavis3d/data/labelitem.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtDataVis3D module.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+
+#include "labelitem_p.h"
+
+QT_DATAVIS3D_BEGIN_NAMESPACE
+
+LabelItem::LabelItem()
+    : m_size(QSize(0, 0)),
+      m_textureId(0)
+{
+}
+
+LabelItem::~LabelItem()
+{
+    glDeleteTextures(1, &m_textureId);
+}
+
+void LabelItem::setSize(const QSize &size)
+{
+    m_size = size;
+}
+
+QSize LabelItem::size() const
+{
+    return m_size;
+}
+
+void LabelItem::setTextureId(GLuint textureId)
+{
+    glDeleteTextures(1, &m_textureId);
+    m_textureId = textureId;
+}
+
+GLuint LabelItem::textureId() const
+{
+    return m_textureId;
+}
+
+void LabelItem::clear()
+{
+    if (m_textureId) {
+        glDeleteTextures(1, &m_textureId);
+        m_textureId = 0;
+    }
+    m_size = QSize(0, 0);
+}
+
+QT_DATAVIS3D_END_NAMESPACE