summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/data/customrenderitem.cpp
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-05-21 13:37:11 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-05-22 08:03:06 +0300
commitcb79f11be1c0c379a1eccea62606a58b73442f2f (patch)
tree0e8409d491897b4fc9d1929ea1e13e575c6b7198 /src/datavisualization/data/customrenderitem.cpp
parent37a82fbeb7aa59260fe5f31b62228914ee4a44a3 (diff)
Cache ObjectHelper instances
Task-number: QTRD-2792 Change-Id: I90d83bd9b73a0f337fd26f1b92000e72b3ec0607 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/data/customrenderitem.cpp')
-rw-r--r--src/datavisualization/data/customrenderitem.cpp18
1 files changed, 4 insertions, 14 deletions
diff --git a/src/datavisualization/data/customrenderitem.cpp b/src/datavisualization/data/customrenderitem.cpp
index 53db9bd1..a1c70057 100644
--- a/src/datavisualization/data/customrenderitem.cpp
+++ b/src/datavisualization/data/customrenderitem.cpp
@@ -24,29 +24,19 @@ CustomRenderItem::CustomRenderItem()
: AbstractRenderItem(),
m_texture(0),
m_object(0),
- m_visible(true)
+ m_visible(true),
+ m_renderer(0)
{
}
-CustomRenderItem::CustomRenderItem(const CustomRenderItem &other)
- : AbstractRenderItem(other)
-{
- m_texture = other.m_texture;
-}
-
CustomRenderItem::~CustomRenderItem()
{
- if (m_object)
- delete m_object;
+ ObjectHelper::releaseObjectHelper(m_renderer, m_object);
}
void CustomRenderItem::setMesh(const QString &meshFile)
{
- if (m_object)
- delete m_object;
- // Load mesh and make an object of it
- m_object = new ObjectHelper(meshFile);
- m_object->load();
+ ObjectHelper::resetObjectHelper(m_renderer, m_object, meshFile);
}
QT_END_NAMESPACE_DATAVISUALIZATION