Q3DMaps: Added support for visualizing value in selected dimension

Value can now be visualized in height, width, depth, radius (=width+depth) or all
Added some real data to example. More will be added.

Change-Id: Ib0effe13ff295f3dc82ba82220b195b6aebf0ed4
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

6 files changed, 48 insertions, 26 deletions

diff --git a/examples/datavis3d/mapdata/mapdata.cpp b/examples/datavis3d/mapdata/mapdata.cpp
index 0e025f14..6492ab2a 100644
--- a/examples/datavis3d/mapdata/mapdata.cpp
+++ b/examples/datavis3d/mapdata/mapdata.cpp
@@ -46,21 +46,15 @@ using namespace QtDataVis3D;
 const QString celsiusString = QString(QChar(0xB0)) + "C";
 
 MapsModifier::MapsModifier(Q3DMaps *maps)
-    : m_chart(maps)/*,
-      m_columnCount(21),
-      m_rowCount(21),
-      m_xRotation(0.0f),
-      m_yRotation(0.0f),
-      m_static(true),
-      m_barWidth(1.0f),
-      m_barDepth(1.0f),
-      m_barSpacingX(0.1f),
-      m_barSpacingZ(0.1f),
-      m_fontSize(20)*/
+    : m_chart(maps),
+      m_imageRect(QRect())
 {
-    // Don't set any styles or specifications, start from defaults
-    QImage image = QImage(QStringLiteral(":/textures/defaultImage"));
-    m_chart->setAreaSpecs(image.rect(), image);
+    m_chart->setTheme(ThemeSystem);
+    m_chart->setBarSpecs(QVector3D(30.0f, 10.0f, 30.0f), Q3DMaps::AdjustHeight);
+    QImage image = QImage(QStringLiteral(":/images/suomi"));
+    m_imageRect = image.rect();
+    m_chart->setAreaSpecs(m_imageRect, image);
+    m_chart->setBarType(Cones, false);
 }
 
 MapsModifier::~MapsModifier()
@@ -75,10 +69,47 @@ void MapsModifier::start()
 
 void MapsModifier::addData()
 {
+#if 0
     QDataItem *item = new QDataItem();
     item->setValue(10.0f);
     item->setPosition(QPointF(0.0f, 0.0f));
     m_chart->addDataItem(item);
+
+    QDataItem *item2 = new QDataItem();
+    item2->setValue(5.0f);
+    item2->setPosition(QPointF(m_imageRect.width(), m_imageRect.height()));
+    m_chart->addDataItem(item2);
+
+    QDataItem *item3 = new QDataItem();
+    item3->setValue(7.0f);
+    item3->setPosition(QPointF(m_imageRect.width() / 2.0f, m_imageRect.height() / 2.0f));
+    m_chart->addDataItem(item3);
+#else
+    QDataItem *item;
+    item = new QDataItem();
+    item->setValue(191050.0f);
+    item->setLabel("Oulu ", true);
+    item->setPosition(QPointF(438.0f, 510.0f));
+    m_chart->addDataItem(item);
+
+    item = new QDataItem();
+    item->setValue(22274.0f);
+    item->setLabel("Kemi ", true);
+    item->setPosition(QPointF(412.0f, 445.0f));
+    m_chart->addDataItem(item);
+
+    item = new QDataItem();
+    item->setValue(60887.0f);
+    item->setLabel("Rovaniemi ", true);
+    item->setPosition(QPointF(451.0f, 363.0f));
+    m_chart->addDataItem(item);
+
+    item = new QDataItem();
+    item->setValue(16176.0f);
+    item->setLabel("Kuusamo ", true);
+    item->setPosition(QPointF(587.0f, 419.0f));
+    m_chart->addDataItem(item);
+#endif
 }
 
 //void MapsModifier::restart(bool dynamicData)
diff --git a/examples/datavis3d/mapdata/mapdata.h b/examples/datavis3d/mapdata/mapdata.h
index 81c92af9..6a321376 100644
--- a/examples/datavis3d/mapdata/mapdata.h
+++ b/examples/datavis3d/mapdata/mapdata.h
@@ -44,7 +44,6 @@
 #include "q3dmaps.h"
 #include "qdataset.h"
 
-#include <QFont>
 #include <QDebug>
 
 using namespace QtDataVis3D;
@@ -79,16 +78,7 @@ public:
 
 private:
     Q3DMaps *m_chart;
-//    int m_columnCount;
-//    int m_rowCount;
-//    float m_xRotation;
-//    float m_yRotation;
-//    bool m_static;
-//    float m_barWidth;
-//    float m_barDepth;
-//    float m_barSpacingX;
-//    float m_barSpacingZ;
-//    int m_fontSize;
+    QRect m_imageRect;
 };
 
 #endif
diff --git a/examples/datavis3d/mapdata/mapdata.qrc b/examples/datavis3d/mapdata/mapdata.qrc
index c27c8b94..ac7f29f8 100644
--- a/examples/datavis3d/mapdata/mapdata.qrc
+++ b/examples/datavis3d/mapdata/mapdata.qrc
@@ -1,5 +1,6 @@
 <RCC>
     <qresource prefix="/images">
-        <file alias="finland">suomi.png</file>
+        <file alias="suomi">suomi2.jpg</file>
+        <file alias="finland">suomi.jpg</file>
     </qresource>
 </RCC>
diff --git a/examples/datavis3d/mapdata/suomi.jpg b/examples/datavis3d/mapdata/suomi.jpg
new file mode 100644
index 00000000..8d63914f
--- /dev/null
+++ b/examples/datavis3d/mapdata/suomi.jpg
diff --git a/examples/datavis3d/mapdata/suomi.png b/examples/datavis3d/mapdata/suomi.png
deleted file mode 100644
index 9687536f..00000000
--- a/examples/datavis3d/mapdata/suomi.png
+++ /dev/null
diff --git a/examples/datavis3d/mapdata/suomi2.jpg b/examples/datavis3d/mapdata/suomi2.jpg
new file mode 100644
index 00000000..b6c48e76
--- /dev/null
+++ b/examples/datavis3d/mapdata/suomi2.jpg