diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-05-12 10:06:27 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-05-12 10:07:15 +0300 |
commit | 6880277f23b47117f7788f08f855ed99b5120f9f (patch) | |
tree | de8b9e64ffce03a3ce77c8ffac396f7174e91956 /examples/datavisualization/customitems/customitemgraph.cpp | |
parent | 590d11726e0708e9f8fad0ec386cc5859dbe5cc8 (diff) |
CustomDataItem made into a public class
Task-number: QTRD-3055
Change-Id: I1e449df7c1bcb48fc639dbae579e2e1499c9ef2b
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'examples/datavisualization/customitems/customitemgraph.cpp')
-rw-r--r-- | examples/datavisualization/customitems/customitemgraph.cpp | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/examples/datavisualization/customitems/customitemgraph.cpp b/examples/datavisualization/customitems/customitemgraph.cpp index 822ca24a..c2479a9a 100644 --- a/examples/datavisualization/customitems/customitemgraph.cpp +++ b/examples/datavisualization/customitems/customitemgraph.cpp @@ -19,6 +19,7 @@ #include "customitemgraph.h" #include <QtDataVisualization/Q3DTheme> +#include <QtDataVisualization/QCustom3DItem> #include <QtGui/QImage> using namespace QtDataVisualization; @@ -104,15 +105,18 @@ void CustomItemGraph::toggleItemOne(bool show) color.fill(Qt::red); //! [0] //! [2] - m_graph->addCustomItem(":/items/oilrig.obj", positionOne, - QVector3D(0.025f, 0.025f, 0.025f), - QQuaternion::fromAxisAndAngle(0.0f, 1.0f, 0.0f, 45.0f), - color); + QCustom3DItem *item = new QCustom3DItem(":/items/oilrig.obj", positionOne, + QVector3D(0.025f, 0.025f, 0.025f), + QQuaternion::fromAxisAndAngle(0.0f, 1.0f, 0.0f, 45.0f), + color); //! [2] - } else { //! [3] - m_graph->removeCustomItemAt(positionOne); + m_graph->addCustomItem(item); //! [3] + } else { + //! [4] + m_graph->removeCustomItemAt(positionOne); + //! [4] } } @@ -122,10 +126,13 @@ void CustomItemGraph::toggleItemTwo(bool show) if (show) { QImage color = QImage(2, 2, QImage::Format_ARGB32); color.fill(Qt::red); - m_graph->addCustomItem(":/items/oilrig.obj", positionTwo, - QVector3D(0.025f, 0.025f, 0.025f), - QQuaternion::fromAxisAndAngle(0.0f, 1.0f, 0.0f, 25.0f), - color); + QCustom3DItem *item = new QCustom3DItem(); + item->setMeshFile(":/items/oilrig.obj"); + item->setPosition(positionTwo); + item->setScaling(QVector3D(0.025f, 0.025f, 0.025f)); + item->setRotation(QQuaternion::fromAxisAndAngle(0.0f, 1.0f, 0.0f, 25.0f)); + item->setTextureImage(color); + m_graph->addCustomItem(item); } else { m_graph->removeCustomItemAt(positionTwo); } @@ -137,10 +144,13 @@ void CustomItemGraph::toggleItemThree(bool show) if (show) { QImage color = QImage(2, 2, QImage::Format_ARGB32); color.fill(Qt::darkMagenta); - m_graph->addCustomItem(":/items/refinery.obj", positionThree, - QVector3D(0.04f, 0.04f, 0.04f), - QQuaternion::fromAxisAndAngle(0.0f, 1.0f, 0.0f, 75.0f), - color); + QCustom3DItem *item = new QCustom3DItem(); + item->setMeshFile(":/items/refinery.obj"); + item->setPosition(positionThree); + item->setScaling(QVector3D(0.04f, 0.04f, 0.04f)); + item->setRotation(QQuaternion::fromAxisAndAngle(0.0f, 1.0f, 0.0f, 75.0f)); + item->setTextureImage(color); + m_graph->addCustomItem(item); } else { m_graph->removeCustomItemAt(positionThree); } |