Refactoring to get ready for a second vis type

Moved enums to global header.
Moved drawLabel to Drawer.

Change-Id: Ifb103467254b4288dee1ef6f7bb0c2aa23868dab
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

4 files changed, 54 insertions, 54 deletions

diff --git a/examples/datavis3d/barchart/main.cpp b/examples/datavis3d/barchart/main.cpp
index d4c13061..0f04d8d4 100644
--- a/examples/datavis3d/barchart/main.cpp
+++ b/examples/datavis3d/barchart/main.cpp
@@ -97,29 +97,29 @@ ChartDataGenerator::ChartDataGenerator(Q3DBars *barchart)
 
     // Set bar type to smooth bar
 #ifndef CYCLE_THROUGH_STYLES
-    m_chart->setBarType(Q3DBars::Pyramids, false);
+    m_chart->setBarType(Pyramids, false);
 #endif
 
 #ifndef USE_STATIC_DATA
     // Set selection mode to full
-    m_chart->setSelectionMode(Q3DBars::BarRowAndColumn);
+    m_chart->setSelectionMode(ModeBarRowAndColumn);
 #else
     // Set selection mode to zoom row
-    m_chart->setSelectionMode(Q3DBars::ZoomRow);
+    m_chart->setSelectionMode(ModeZoomRow);
     m_chart->setFont(QFont("Courier", 25));
 #endif
 
 #ifndef CYCLE_THROUGH_THEMES
     // Set bar colors
     m_chart->setBarColor(QColor(Qt::gray), QColor(Qt::red), QColor(Qt::darkBlue));
-    //m_chart->setTheme(Q3DBars::ThemeSystem);
-    m_chart->setLabelTransparency(Q3DBars::TransparencyFromTheme);
+    //m_chart->setTheme(ThemeSystem);
+    m_chart->setLabelTransparency(TransparencyFromTheme);
 #else
-    m_chart->setLabelTransparency(Q3DBars::TransparencyNone);
+    m_chart->setLabelTransparency(TransparencyNone);
 #endif
 
     // Set preset camera position
-    m_chart->setCameraPreset(Q3DBars::PresetFront);
+    m_chart->setCameraPreset(PresetFront);
 }
 
 ChartDataGenerator::~ChartDataGenerator()
@@ -194,8 +194,8 @@ void ChartDataGenerator::addDataSet()
     // TODO: Keep here for testing
     for (int j = 0; j < m_rowCount; j++) {
         for (int i = 0; i < m_columnCount; i++) {
-            //row.prepend(((float)i / (float)m_columnCount) * 100 + (float)(rand() % 30));
-            row.append(1.0f);
+            row.prepend(((float)i / (float)m_columnCount) * 100 + (float)(rand() % 30));
+            //row.append(1.0f);
         }
         data.append(row);
         row.clear();
@@ -218,11 +218,11 @@ void ChartDataGenerator::addDataSet()
     weeks << "week 1" << "week 2" << "week 3" << "week 4" << "week 5";
 
     // Set up data         Mon  Tue  Wed  Thu  Fri  Sat  Sun
-    float hours[5][7] = {{2.0, 1.0, 3.0, 0.2, 1.0, 5.0, 7.0},      // week 1
-                         {0.5, 1.0, 3.0, 1.0, 2.0, 2.0, 3.0},      // week 2
-                         {1.0, 1.0, 2.0, 1.0, 4.0, 4.0, 4.0},      // week 3
-                         {0.0, 0.0, 0.0, 0.0, 2.0, 2.0, 0.3},      // week 4
-                         {3.0, 3.0, 6.0, 2.0, 2.0, 1.0, 1.0}};     // week 5
+    float hours[5][7] = {{2.0f, 1.0f, 3.0f, 0.2f, 1.0f, 5.0f, 7.0f},      // week 1
+                         {0.5f, 1.0f, 3.0f, 1.0f, 2.0f, 2.0f, 3.0f},      // week 2
+                         {1.0f, 1.0f, 2.0f, 1.0f, 4.0f, 4.0f, 4.0f},      // week 3
+                         {0.0f, 0.0f, 0.0f, 0.0f, 2.0f, 2.0f, 0.3f},      // week 4
+                         {3.0f, 3.0f, 6.0f, 2.0f, 2.0f, 1.0f, 1.0f}};     // week 5
 
     // Create data set
     QDataSet *dataSet = new QDataSet();
@@ -266,28 +266,28 @@ void ChartDataGenerator::changeStyle()
     static int model = 0;
     switch (model) {
     case 0:
-        m_chart->setBarType(Q3DBars::Cylinders, false);
+        m_chart->setBarType(Cylinders, false);
         break;
     case 1:
-        m_chart->setBarType(Q3DBars::Cylinders, true);
+        m_chart->setBarType(Cylinders, true);
         break;
     case 2:
-        m_chart->setBarType(Q3DBars::Cones, false);
+        m_chart->setBarType(Cones, false);
         break;
     case 3:
-        m_chart->setBarType(Q3DBars::Cones, true);
+        m_chart->setBarType(Cones, true);
         break;
     case 4:
-        m_chart->setBarType(Q3DBars::Bars, false);
+        m_chart->setBarType(Bars, false);
         break;
     case 5:
-        m_chart->setBarType(Q3DBars::Bars, true);
+        m_chart->setBarType(Bars, true);
         break;
     case 6:
-        m_chart->setBarType(Q3DBars::Pyramids, false);
+        m_chart->setBarType(Pyramids, false);
         break;
     case 7:
-        m_chart->setBarType(Q3DBars::Pyramids, true);
+        m_chart->setBarType(Pyramids, true);
         break;
     }
     model++;
@@ -299,9 +299,9 @@ void ChartDataGenerator::changePresetCamera()
 {
     static int preset = 0;
 
-    m_chart->setCameraPreset((Q3DBars::CameraPreset)preset);
+    m_chart->setCameraPreset((CameraPreset)preset);
 
-    if (++preset > (int)Q3DBars::PresetDirectlyAboveCCW45)
+    if (++preset > (int)PresetDirectlyAboveCCW45)
         preset = 0;
 }
 
@@ -309,9 +309,9 @@ void ChartDataGenerator::changeTheme()
 {
     static int theme = 0;
 
-    m_chart->setTheme((Q3DBars::ColorTheme)theme);
+    m_chart->setTheme((ColorTheme)theme);
 
-    if (++theme > (int)Q3DBars::ThemeLight)
+    if (++theme > (int)ThemeLight)
         theme = 0;
 }
 
diff --git a/examples/datavis3d/rainfall/main.cpp b/examples/datavis3d/rainfall/main.cpp
index 004f8eac..44d9d172 100644
--- a/examples/datavis3d/rainfall/main.cpp
+++ b/examples/datavis3d/rainfall/main.cpp
@@ -77,17 +77,17 @@ RainfallChart::RainfallChart(Q3DBars *rainfall)
                               QStringLiteral("rainfall (in mm)"));
 
     // Set bar type to cylinder
-    m_chart->setBarType(Q3DBars::Cylinders, false);
+    m_chart->setBarType(Cylinders, false);
 
     // Set selection mode to bar and column
-    //m_chart->setSelectionMode(Q3DBars::BarAndColumn);
-    m_chart->setSelectionMode(Q3DBars::ZoomColumn);
+    //m_chart->setSelectionMode(ModeBarAndColumn);
+    m_chart->setSelectionMode(ModeZoomColumn);
 
     // Set theme
-    m_chart->setTheme(Q3DBars::ThemeBlueNcs);
+    m_chart->setTheme(ThemeBlueNcs);
 
     // Set preset camera position
-    m_chart->setCameraPreset(Q3DBars::PresetFront);
+    m_chart->setCameraPreset(PresetFront);
 
     // Disable grid
     m_chart->setGridEnabled(false);
@@ -111,6 +111,7 @@ void RainfallChart::addDataSet()
     // Fill in rainfall per month from 2000 to 2012 in Northern Finland (Sodankylä, Utsjoki, Kuusamo)
     QVector< QVector<QDataItem*> > data;
     QVector<QDataItem*> row;
+    // TODO: Change this example to load data from file
     // 2000
     row.append(new QDataItem(72, "mm")); //January 2000
     row.append(new QDataItem(47, "mm")); //February 2000
diff --git a/examples/datavis3d/spectrum/spectrumapp/main.cpp b/examples/datavis3d/spectrum/spectrumapp/main.cpp
index 1dc5007c..75d4997d 100644
--- a/examples/datavis3d/spectrum/spectrumapp/main.cpp
+++ b/examples/datavis3d/spectrum/spectrumapp/main.cpp
@@ -59,8 +59,7 @@ public:
     void start(QString fileName);
 
 public slots:
-    void spectrumChanged(qint64 position, qint64 length,
-                         const FrequencySpectrum &spectrum);
+    void spectrumChanged(qint64 position, qint64 length, const FrequencySpectrum &spectrum);
     void stateChanged(QAudio::Mode mode, QAudio::State state);
 
 private slots:
@@ -94,7 +93,7 @@ MainApp::MainApp(Q3DBars *window)
     // inside each other
     m_chart->setBarSpecs(QSizeF(1.0f, 0.75f), QSizeF(0.2f, -0.75f));
     // Set bar type, smooth cones
-    m_chart->setBarType(Q3DBars::Cones, true);
+    m_chart->setBarType(Cones, true);
     // Adjust zoom manually; automatic zoom level calculation does not work well with negative
     // spacings (in setBarSpecs)
     m_chart->setCameraPosition(10.0f, 5.0f, 70);
@@ -102,14 +101,14 @@ MainApp::MainApp(Q3DBars *window)
     // Set bar specifications; make them twice as wide as they're deep
     m_chart->setBarSpecs(QSizeF(1.0f, 0.5f), QSizeF(0.0f, 0.0f));
     // Set bar type, flat bars
-    m_chart->setBarType(Q3DBars::Bars, false);
+    m_chart->setBarType(Bars, false);
     // Adjust camera position
     m_chart->setCameraPosition(10.0f, 7.5f, 75);
 #endif
     // Set color scheme
     m_chart->setBarColor(QColor(Qt::black), QColor(Qt::red), QColor(Qt::darkYellow));
     // Disable selection
-    m_chart->setSelectionMode(Q3DBars::None);
+    m_chart->setSelectionMode(ModeNone);
     QObject::connect(m_engine, &Engine::changedSpectrum, this, &MainApp::spectrumChanged);
     QObject::connect(m_engine, &Engine::stateChanged, this, &MainApp::stateChanged);
     m_restartTimer->setSingleShot(true);
diff --git a/examples/datavis3d/widget/chart.cpp b/examples/datavis3d/widget/chart.cpp
index e4eb47d2..7c24ab9c 100644
--- a/examples/datavis3d/widget/chart.cpp
+++ b/examples/datavis3d/widget/chart.cpp
@@ -78,13 +78,13 @@ void ChartModifier::restart(bool dynamicData)
     if (m_static) {
         start();
         // Set selection mode to zoom row
-        m_chart->setSelectionMode(Q3DBars::ZoomRow);
+        m_chart->setSelectionMode(ModeZoomRow);
         m_chart->setFont(QFont("Times Roman", 20));
     } else {
         // Set up sample space; make it as deep as it's wide
         m_chart->setupSampleSpace(m_columnCount, m_rowCount);
         // Set selection mode to full
-        m_chart->setSelectionMode(Q3DBars::BarRowAndColumn);
+        m_chart->setSelectionMode(ModeBarRowAndColumn);
     }
 }
 
@@ -153,28 +153,28 @@ void ChartModifier::changeStyle()
     static int model = 0;
     switch (model) {
     case 0:
-        m_chart->setBarType(Q3DBars::Cylinders, false);
+        m_chart->setBarType(Cylinders, false);
         break;
     case 1:
-        m_chart->setBarType(Q3DBars::Cylinders, true);
+        m_chart->setBarType(Cylinders, true);
         break;
     case 2:
-        m_chart->setBarType(Q3DBars::Cones, false);
+        m_chart->setBarType(Cones, false);
         break;
     case 3:
-        m_chart->setBarType(Q3DBars::Cones, true);
+        m_chart->setBarType(Cones, true);
         break;
     case 4:
-        m_chart->setBarType(Q3DBars::Bars, false);
+        m_chart->setBarType(Bars, false);
         break;
     case 5:
-        m_chart->setBarType(Q3DBars::Bars, true);
+        m_chart->setBarType(Bars, true);
         break;
     case 6:
-        m_chart->setBarType(Q3DBars::Pyramids, false);
+        m_chart->setBarType(Pyramids, false);
         break;
     case 7:
-        m_chart->setBarType(Q3DBars::Pyramids, true);
+        m_chart->setBarType(Pyramids, true);
         break;
     }
     model++;
@@ -186,9 +186,9 @@ void ChartModifier::changePresetCamera()
 {
     static int preset = 0;
 
-    m_chart->setCameraPreset((Q3DBars::CameraPreset)preset);
+    m_chart->setCameraPreset((CameraPreset)preset);
 
-    if (++preset > (int)Q3DBars::PresetDirectlyAboveCCW45)
+    if (++preset > (int)PresetDirectlyAboveCCW45)
         preset = 0;
 }
 
@@ -196,18 +196,18 @@ void ChartModifier::changeTheme()
 {
     static int theme = 0;
 
-    m_chart->setTheme((Q3DBars::ColorTheme)theme);
+    m_chart->setTheme((ColorTheme)theme);
 
-    if (++theme > (int)Q3DBars::ThemeLight)
+    if (++theme > (int)ThemeLight)
         theme = 0;
 }
 void ChartModifier::changeTransparency()
 {
     static int transparency = 0;
 
-    m_chart->setLabelTransparency((Q3DBars::LabelTransparency)transparency);
+    m_chart->setLabelTransparency((LabelTransparency)transparency);
 
-    if (++transparency > (int)Q3DBars::TransparencyNoBackground)
+    if (++transparency > (int)TransparencyNoBackground)
         transparency = 0;
 }
 
@@ -215,9 +215,9 @@ void ChartModifier::changeSelectionMode()
 {
     static int selectionMode = 0;
 
-    m_chart->setSelectionMode((Q3DBars::SelectionMode)selectionMode);
+    m_chart->setSelectionMode((SelectionMode)selectionMode);
 
-    if (++selectionMode > (int)Q3DBars::ZoomColumn)
+    if (++selectionMode > (int)ModeZoomColumn)
         selectionMode = 0;
 }