Refactored MeshStyle and InputState

Task-number: QTRD-2362

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

5 files changed, 22 insertions, 22 deletions

diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp
index b58980a2..cd41a6be 100644
--- a/tests/barstest/chart.cpp
+++ b/tests/barstest/chart.cpp
@@ -406,34 +406,34 @@ void ChartModifier::changeStyle()
     static int model = 0;
     switch (model) {
     case 0:
-        m_chart->setBarType(QDataVis::Cylinders, false);
+        m_chart->setBarType(QDataVis::MeshStyleCylinders, false);
         break;
     case 1:
-        m_chart->setBarType(QDataVis::Cylinders, true);
+        m_chart->setBarType(QDataVis::MeshStyleCylinders, true);
         break;
     case 2:
-        m_chart->setBarType(QDataVis::Cones, false);
+        m_chart->setBarType(QDataVis::MeshStyleCones, false);
         break;
     case 3:
-        m_chart->setBarType(QDataVis::Cones, true);
+        m_chart->setBarType(QDataVis::MeshStyleCones, true);
         break;
     case 4:
-        m_chart->setBarType(QDataVis::Bars, false);
+        m_chart->setBarType(QDataVis::MeshStyleBars, false);
         break;
     case 5:
-        m_chart->setBarType(QDataVis::Bars, true);
+        m_chart->setBarType(QDataVis::MeshStyleBars, true);
         break;
     case 6:
-        m_chart->setBarType(QDataVis::Pyramids, false);
+        m_chart->setBarType(QDataVis::MeshStylePyramids, false);
         break;
     case 7:
-        m_chart->setBarType(QDataVis::Pyramids, true);
+        m_chart->setBarType(QDataVis::MeshStylePyramids, true);
         break;
     case 8:
-        m_chart->setBarType(QDataVis::BevelBars, false);
+        m_chart->setBarType(QDataVis::MeshStyleBevelBars, false);
         break;
     case 9:
-        m_chart->setBarType(QDataVis::BevelBars, true);
+        m_chart->setBarType(QDataVis::MeshStyleBevelBars, true);
         break;
     }
     model++;
diff --git a/tests/kinectsurface/surfacedata.cpp b/tests/kinectsurface/surfacedata.cpp
index d69c35ce..b11be8d5 100644
--- a/tests/kinectsurface/surfacedata.cpp
+++ b/tests/kinectsurface/surfacedata.cpp
@@ -59,7 +59,7 @@ SurfaceData::SurfaceData(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars
     m_scatter->setTheme(QDataVis::ThemeStoneMoss);
     m_scatter->setSelectionMode(QDataVis::SelectionModeNone);
     m_scatter->setGridVisible(false);
-    m_scatter->setObjectType(QDataVis::Dots, false);
+    m_scatter->setObjectType(QDataVis::MeshStyleDots, false);
     m_scatter->setShadowQuality(QDataVis::ShadowQualitySoftLow);
     m_scatter->setCameraPosition(0.0, 85.0, 110);
     m_scatter->axisY()->setMin(-128);
@@ -73,7 +73,7 @@ SurfaceData::SurfaceData(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars
     m_bars->setTheme(QDataVis::ThemeQt);
     m_bars->setSelectionMode(QDataVis::SelectionModeNone);
     m_bars->setGridVisible(false);
-    m_bars->setBarType(QDataVis::Bars, true);
+    m_bars->setBarType(QDataVis::MeshStyleBars, true);
 #if 1
     m_bars->setShadowQuality(QDataVis::ShadowQualityLow);
 #else
@@ -98,7 +98,7 @@ SurfaceData::~SurfaceData()
         delete m_scatter;
         delete m_bars;
         delete m_surface;
-    } else if (m_mode == Bars) {
+    } else if (m_mode == MeshStyleBars) {
         delete m_scatter;
         delete m_surface;
         delete m_bars;
@@ -201,7 +201,7 @@ void SurfaceData::setResolution(int selection)
         m_scatter->axisZ()->setMax(m_resolution.height() / 2);
         m_scatterDataArray = new QScatterDataArray;
         m_scatterDataArray->resize(m_resolution.width() * m_resolution.height());
-    } else if (m_mode == Bars) {
+    } else if (m_mode == MeshStyleBars) {
         m_resize = true;
         m_resolution /= 4;
         m_barDataArray = new QBarDataArray;
diff --git a/tests/kinectsurface/surfacedata.h b/tests/kinectsurface/surfacedata.h
index 586fcfb6..0bf753cd 100644
--- a/tests/kinectsurface/surfacedata.h
+++ b/tests/kinectsurface/surfacedata.h
@@ -55,7 +55,7 @@ public:
     enum VisualizationMode {
         Surface = 0,
         Scatter,
-        Bars
+        MeshStyleBars
     };
 
 public slots:
diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp
index 04e8db67..a10f0065 100644
--- a/tests/scattertest/scatterchart.cpp
+++ b/tests/scattertest/scatterchart.cpp
@@ -34,7 +34,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
     QFont font = m_chart->font();
     font.setPointSize(m_fontSize);
     m_chart->setFont(font);
-    m_chart->setObjectType(QDataVis::Spheres, true);
+    m_chart->setObjectType(QDataVis::MeshStyleSpheres, true);
     m_chart->setTheme(QDataVis::ThemeStoneMoss);
     m_chart->setShadowQuality(QDataVis::ShadowQualityHigh);
     m_chart->setCameraPreset(QDataVis::CameraPresetFront);
@@ -96,16 +96,16 @@ void ScatterDataModifier::changeStyle()
     static int model = 0;
     switch (model) {
     case 0:
-        m_chart->setObjectType(QDataVis::Dots, false);
+        m_chart->setObjectType(QDataVis::MeshStyleDots, false);
         break;
     case 1:
-        m_chart->setObjectType(QDataVis::Dots, true);
+        m_chart->setObjectType(QDataVis::MeshStyleDots, true);
         break;
     case 2:
-        m_chart->setObjectType(QDataVis::Spheres, false);
+        m_chart->setObjectType(QDataVis::MeshStyleSpheres, false);
         break;
     case 3:
-        m_chart->setObjectType(QDataVis::Spheres, true);
+        m_chart->setObjectType(QDataVis::MeshStyleSpheres, true);
         break;
     }
     model++;
diff --git a/tests/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp
index 560c3a83..d0282ca0 100644
--- a/tests/spectrum/spectrumapp/main.cpp
+++ b/tests/spectrum/spectrumapp/main.cpp
@@ -81,7 +81,7 @@ MainApp::MainApp(Q3DBars *window)
     m_chart->setBarThickness(1.25);
     m_chart->setBarSpacing(QSizeF(0.2, -0.75));
     // Set bar type, smooth cones
-    m_chart->setBarType(QDataVis::Cones, true);
+    m_chart->setBarType(QDataVis::MeshStyleCones, true);
     // Adjust zoom manually; automatic zoom level calculation does not work well with negative
     // spacings (in setBarSpacing)
     m_chart->setCameraPosition(10.0f, 5.0f, 70);
@@ -90,7 +90,7 @@ MainApp::MainApp(Q3DBars *window)
     m_chart->setBarThickness(2.0);
     m_chart->setBarSpacing(QSizeF(0.0, 0.0));
     // Set bar type, flat bars
-    m_chart->setBarType(QDataVis::Bars, false);
+    m_chart->setBarType(QDataVis::MeshStyleBars, false);
     // Adjust camera position
     m_chart->setCameraPosition(10.0f, 7.5f, 75);
 #endif