diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-08-14 13:50:52 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-08-14 13:52:21 +0300 |
commit | 3b7fb533df9212df76c7c90a067ae3a3219b003a (patch) | |
tree | eef561dcf6cdf9319a74e78d615bb210620383f3 /examples | |
parent | 31714127f9ad60bd3f0fc4ea29531f759503241d (diff) |
Enums moved to a class to be usable from QML and C++
Task-number: QTRD-2126
Change-Id: I280047cc7101292d17111babb7735c03436a40f4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/barchart/main.cpp | 34 | ||||
-rw-r--r-- | examples/mapdata/mapdata.cpp | 64 | ||||
-rw-r--r-- | examples/rainfall/rainfallchart.cpp | 10 | ||||
-rw-r--r-- | examples/rainfall/variantbardatamapping.h | 2 | ||||
-rw-r--r-- | examples/rainfall/variantdataset.h | 2 | ||||
-rw-r--r-- | examples/scatterchart/scatterchart.cpp | 54 | ||||
-rw-r--r-- | examples/scatterchart/scatterchart.h | 2 | ||||
-rw-r--r-- | examples/spectrum/spectrumapp/main.cpp | 8 | ||||
-rw-r--r-- | examples/widget/chart.cpp | 72 | ||||
-rw-r--r-- | examples/widget/chart.h | 2 |
10 files changed, 125 insertions, 125 deletions
diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp index 9cad6c2f..77230b5d 100644 --- a/examples/barchart/main.cpp +++ b/examples/barchart/main.cpp @@ -82,15 +82,15 @@ ChartDataGenerator::ChartDataGenerator(Q3DBars *barchart, QTableWidget *tableWid // Set bar type to smooth bar #ifndef CYCLE_THROUGH_STYLES - m_chart->setBarType(Pyramids, false); + m_chart->setBarType(QDataVis::Pyramids, false); #endif #ifndef USE_STATIC_DATA // Set selection mode to full - m_chart->setSelectionMode(ModeItemRowAndColumn); + m_chart->setSelectionMode(QDataVis::ModeItemRowAndColumn); #else // Set selection mode to zoom row - m_chart->setSelectionMode(ModeZoomRow); + m_chart->setSelectionMode(QDataVis::ModeZoomRow); m_chart->setFont(QFont("Courier", 25)); #endif @@ -98,11 +98,11 @@ ChartDataGenerator::ChartDataGenerator(Q3DBars *barchart, QTableWidget *tableWid // Set bar colors m_chart->setBarColor(QColor(Qt::gray), QColor(Qt::red), QColor(Qt::darkBlue)); #else - m_chart->setLabelTransparency(TransparencyNone); + m_chart->setLabelTransparency(QDataVis::TransparencyNone); #endif // Set preset camera position - m_chart->setCameraPreset(PresetFront); + m_chart->setCameraPreset(QDataVis::PresetFront); } ChartDataGenerator::~ChartDataGenerator() @@ -221,28 +221,28 @@ void ChartDataGenerator::changeStyle() static int model = 0; switch (model) { case 0: - m_chart->setBarType(Cylinders, false); + m_chart->setBarType(QDataVis::Cylinders, false); break; case 1: - m_chart->setBarType(Cylinders, true); + m_chart->setBarType(QDataVis::Cylinders, true); break; case 2: - m_chart->setBarType(Cones, false); + m_chart->setBarType(QDataVis::Cones, false); break; case 3: - m_chart->setBarType(Cones, true); + m_chart->setBarType(QDataVis::Cones, true); break; case 4: - m_chart->setBarType(Bars, false); + m_chart->setBarType(QDataVis::Bars, false); break; case 5: - m_chart->setBarType(Bars, true); + m_chart->setBarType(QDataVis::Bars, true); break; case 6: - m_chart->setBarType(Pyramids, false); + m_chart->setBarType(QDataVis::Pyramids, false); break; case 7: - m_chart->setBarType(Pyramids, true); + m_chart->setBarType(QDataVis::Pyramids, true); break; } model++; @@ -254,9 +254,9 @@ void ChartDataGenerator::changePresetCamera() { static int preset = 0; - m_chart->setCameraPreset((CameraPreset)preset); + m_chart->setCameraPreset((QDataVis::CameraPreset)preset); - if (++preset > (int)PresetDirectlyAboveCCW45) + if (++preset > (int)QDataVis::PresetDirectlyAboveCCW45) preset = 0; } @@ -264,9 +264,9 @@ void ChartDataGenerator::changeTheme() { static int theme = 0; - m_chart->setTheme((ColorTheme)theme); + m_chart->setTheme((QDataVis::ColorTheme)theme); - if (++theme > (int)ThemeLight) + if (++theme > (int)QDataVis::ThemeLight) theme = 0; } diff --git a/examples/mapdata/mapdata.cpp b/examples/mapdata/mapdata.cpp index 18843a5a..6f0157da 100644 --- a/examples/mapdata/mapdata.cpp +++ b/examples/mapdata/mapdata.cpp @@ -216,40 +216,40 @@ void MapsModifier::changeStyle() static int model = 0; switch (model) { case 0: - m_chart->setBarType(Cylinders, false); + m_chart->setBarType(QDataVis::Cylinders, false); break; case 1: - m_chart->setBarType(Cylinders, true); + m_chart->setBarType(QDataVis::Cylinders, true); break; case 2: - m_chart->setBarType(Cones, false); + m_chart->setBarType(QDataVis::Cones, false); break; case 3: - m_chart->setBarType(Cones, true); + m_chart->setBarType(QDataVis::Cones, true); break; case 4: - m_chart->setBarType(Bars, false); + m_chart->setBarType(QDataVis::Bars, false); break; case 5: - m_chart->setBarType(Bars, true); + m_chart->setBarType(QDataVis::Bars, true); break; case 6: - m_chart->setBarType(Pyramids, false); + m_chart->setBarType(QDataVis::Pyramids, false); break; case 7: - m_chart->setBarType(Pyramids, true); + m_chart->setBarType(QDataVis::Pyramids, true); break; case 8: - m_chart->setBarType(BevelBars, false); + m_chart->setBarType(QDataVis::BevelBars, false); break; case 9: - m_chart->setBarType(BevelBars, true); + m_chart->setBarType(QDataVis::BevelBars, true); break; case 10: - m_chart->setBarType(Spheres, false); + m_chart->setBarType(QDataVis::Spheres, false); break; case 11: - m_chart->setBarType(Spheres, true); + m_chart->setBarType(QDataVis::Spheres, true); break; } model++; @@ -259,32 +259,32 @@ void MapsModifier::changeStyle() void MapsModifier::changePresetCamera() { - static int preset = PresetFrontLow; + static int preset = QDataVis::PresetFrontLow; - m_chart->setCameraPreset((CameraPreset)preset); + m_chart->setCameraPreset((QDataVis::CameraPreset)preset); - if (++preset > PresetDirectlyAboveCCW45) - preset = PresetFrontLow; + if (++preset > QDataVis::PresetDirectlyAboveCCW45) + preset = QDataVis::PresetFrontLow; } void MapsModifier::changeTheme() { - static int theme = ThemeSystem; + static int theme = QDataVis::ThemeSystem; - m_chart->setTheme((ColorTheme)theme); + m_chart->setTheme((QDataVis::ColorTheme)theme); - if (++theme > ThemeLight) - theme = ThemeSystem; + if (++theme > QDataVis::ThemeLight) + theme = QDataVis::ThemeSystem; } void MapsModifier::changeTransparency() { - static int transparency = TransparencyNone; + static int transparency = QDataVis::TransparencyNone; - m_chart->setLabelTransparency((LabelTransparency)transparency); + m_chart->setLabelTransparency((QDataVis::LabelTransparency)transparency); - if (++transparency > TransparencyNoBackground) - transparency = TransparencyFromTheme; + if (++transparency > QDataVis::TransparencyNoBackground) + transparency = QDataVis::TransparencyFromTheme; } void MapsModifier::changeValueDimension(int dimension) @@ -308,29 +308,29 @@ void MapsModifier::changeFontSize(int fontsize) void MapsModifier::changeShadowQuality(int quality) { - ShadowQuality sq = ShadowNone; + QDataVis::ShadowQuality sq = QDataVis::ShadowNone; switch (quality) { case 1: - sq = ShadowLow; + sq = QDataVis::ShadowLow; break; case 2: - sq = ShadowMedium; + sq = QDataVis::ShadowMedium; break; case 3: - sq = ShadowHigh; + sq = QDataVis::ShadowHigh; break; } - ShadowQuality realquality = m_chart->setShadowQuality(sq); + QDataVis::ShadowQuality realquality = m_chart->setShadowQuality(sq); // Check if it setting quality was successful if (realquality != sq) { switch (realquality) { - case ShadowLow: + case QDataVis::ShadowLow: quality = 1; break; - case ShadowMedium: + case QDataVis::ShadowMedium: quality = 2; break; - case ShadowHigh: + case QDataVis::ShadowHigh: quality = 3; break; } diff --git a/examples/rainfall/rainfallchart.cpp b/examples/rainfall/rainfallchart.cpp index a7d3a46b..f7bcd82b 100644 --- a/examples/rainfall/rainfallchart.cpp +++ b/examples/rainfall/rainfallchart.cpp @@ -59,23 +59,23 @@ RainfallChart::RainfallChart(Q3DBars *rainfall) m_chart->columnAxis()->setCategoryLabels(months); // Set bar type to cylinder - m_chart->setBarType(Cylinders, false); + m_chart->setBarType(QDataVis::Cylinders, false); // Set shadows to medium - m_chart->setShadowQuality(ShadowMedium); + m_chart->setShadowQuality(QDataVis::ShadowMedium); // Set font m_chart->setFont(QFont("Century Gothic", 40)); // Set selection mode to bar and column //m_chart->setSelectionMode(ModeItemAndColumn); - m_chart->setSelectionMode(ModeZoomColumn); + m_chart->setSelectionMode(QDataVis::ModeZoomColumn); // Set theme - m_chart->setTheme(ThemeBlueNcs); + m_chart->setTheme(QDataVis::ThemeBlueNcs); // Set preset camera position - m_chart->setCameraPreset(PresetIsometricRightHigh); + m_chart->setCameraPreset(QDataVis::PresetIsometricRightHigh); // Disable grid m_chart->setGridVisible(false); diff --git a/examples/rainfall/variantbardatamapping.h b/examples/rainfall/variantbardatamapping.h index db1dd828..616ee563 100644 --- a/examples/rainfall/variantbardatamapping.h +++ b/examples/rainfall/variantbardatamapping.h @@ -19,7 +19,7 @@ #ifndef VARIANTBARDATAMAPPING_H #define VARIANTBARDATAMAPPING_H -#include "qdatavis3dnamespace.h" +#include "qdatavis3denums.h" #include <QStringList> using namespace QtDataVis3D; diff --git a/examples/rainfall/variantdataset.h b/examples/rainfall/variantdataset.h index dcb4219f..f3965978 100644 --- a/examples/rainfall/variantdataset.h +++ b/examples/rainfall/variantdataset.h @@ -19,7 +19,7 @@ #ifndef VARIANTDATASET_H #define VARIANTDATASET_H -#include "qdatavis3dnamespace.h" +#include "qdatavis3denums.h" #include <QScopedPointer> #include <QVariantList> diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp index 67efdb93..ac8676b5 100644 --- a/examples/scatterchart/scatterchart.cpp +++ b/examples/scatterchart/scatterchart.cpp @@ -31,9 +31,9 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) m_fontSize(30.0f) { m_chart->setFontSize(m_fontSize); - m_chart->setObjectType(Spheres, true); - m_chart->setTheme(ThemeBrownSand); - m_chart->setShadowQuality(ShadowHigh); + m_chart->setObjectType(QDataVis::Spheres, true); + m_chart->setTheme(QDataVis::ThemeBrownSand); + m_chart->setShadowQuality(QDataVis::ShadowHigh); QScatterDataProxy *proxy = new QScatterDataProxy; m_chart->setDataProxy(proxy); @@ -88,16 +88,16 @@ void ScatterDataModifier::changeStyle() static int model = 0; switch (model) { case 0: - m_chart->setObjectType(Dots, false); + m_chart->setObjectType(QDataVis::Dots, false); break; case 1: - m_chart->setObjectType(Dots, true); + m_chart->setObjectType(QDataVis::Dots, true); break; case 2: - m_chart->setObjectType(Spheres, false); + m_chart->setObjectType(QDataVis::Spheres, false); break; case 3: - m_chart->setObjectType(Spheres, true); + m_chart->setObjectType(QDataVis::Spheres, true); break; } model++; @@ -107,32 +107,32 @@ void ScatterDataModifier::changeStyle() void ScatterDataModifier::changePresetCamera() { - static int preset = PresetFrontLow; + static int preset = QDataVis::PresetFrontLow; - m_chart->setCameraPreset((CameraPreset)preset); + m_chart->setCameraPreset((QDataVis::CameraPreset)preset); - if (++preset > PresetDirectlyAboveCCW45) - preset = PresetFrontLow; + if (++preset > QDataVis::PresetDirectlyAboveCCW45) + preset = QDataVis::PresetFrontLow; } void ScatterDataModifier::changeTheme() { - static int theme = ThemeSystem; + static int theme = QDataVis::ThemeSystem; - m_chart->setTheme((ColorTheme)theme); + m_chart->setTheme((QDataVis::ColorTheme)theme); - if (++theme > ThemeLight) - theme = ThemeSystem; + if (++theme > QDataVis::ThemeLight) + theme = QDataVis::ThemeSystem; } void ScatterDataModifier::changeTransparency() { - static int transparency = TransparencyNone; + static int transparency = QDataVis::TransparencyNone; - m_chart->setLabelTransparency((LabelTransparency)transparency); + m_chart->setLabelTransparency((QDataVis::LabelTransparency)transparency); - if (++transparency > TransparencyNoBackground) - transparency = TransparencyNone; + if (++transparency > QDataVis::TransparencyNoBackground) + transparency = QDataVis::TransparencyNone; } void ScatterDataModifier::changeFont(const QFont &font) @@ -148,17 +148,17 @@ void ScatterDataModifier::changeFontSize(int fontsize) m_chart->setFontSize((GLfloat)m_fontSize); } -void ScatterDataModifier::shadowQualityUpdatedByVisual(ShadowQuality sq) +void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq) { int quality = 0; switch (sq) { - case ShadowLow: + case QDataVis::ShadowLow: quality = 1; break; - case ShadowMedium: + case QDataVis::ShadowMedium: quality = 2; break; - case ShadowHigh: + case QDataVis::ShadowHigh: quality = 3; break; } @@ -290,16 +290,16 @@ void ScatterDataModifier::startStopTimer() void ScatterDataModifier::changeShadowQuality(int quality) { - ShadowQuality sq = ShadowNone; + QDataVis::ShadowQuality sq = QDataVis::ShadowNone; switch (quality) { case 1: - sq = ShadowLow; + sq = QDataVis::ShadowLow; break; case 2: - sq = ShadowMedium; + sq = QDataVis::ShadowMedium; break; case 3: - sq = ShadowHigh; + sq = QDataVis::ShadowHigh; break; } m_chart->setShadowQuality(sq); diff --git a/examples/scatterchart/scatterchart.h b/examples/scatterchart/scatterchart.h index ee9f7760..8500ef29 100644 --- a/examples/scatterchart/scatterchart.h +++ b/examples/scatterchart/scatterchart.h @@ -47,7 +47,7 @@ public: public slots: void changeShadowQuality(int quality); - void shadowQualityUpdatedByVisual(ShadowQuality shadowQuality); + void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality); void clear(); void addOne(); void addBunch(); diff --git a/examples/spectrum/spectrumapp/main.cpp b/examples/spectrum/spectrumapp/main.cpp index c6502edb..d0333e75 100644 --- a/examples/spectrum/spectrumapp/main.cpp +++ b/examples/spectrum/spectrumapp/main.cpp @@ -74,13 +74,13 @@ MainApp::MainApp(Q3DBars *window) m_chart->valueAxis()->setSegmentCount(0); m_chart->valueAxis()->setRange(0.0, 1.0); // Disable shadows - m_chart->setShadowQuality(ShadowNone); + m_chart->setShadowQuality(QDataVis::ShadowNone); #if USE_CONES // Set bar specifications; make them a bit wider than deep and make them be drawn 75% // inside each other m_chart->setBarSpecs(QSizeF(1.0f, 0.75f), QSizeF(0.2f, -0.75f)); // Set bar type, smooth cones - m_chart->setBarType(Cones, true); + m_chart->setBarType(QDataVis::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); @@ -88,14 +88,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(Bars, false); + m_chart->setBarType(QDataVis::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(ModeNone); + m_chart->setSelectionMode(QDataVis::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/widget/chart.cpp b/examples/widget/chart.cpp index d48e309b..a8c6c14a 100644 --- a/examples/widget/chart.cpp +++ b/examples/widget/chart.cpp @@ -77,14 +77,14 @@ void ChartModifier::restart(bool dynamicData) if (m_static) { start(); // Set selection mode to zoom row - m_chart->setSelectionMode(ModeZoomRow); + m_chart->setSelectionMode(QDataVis::ModeZoomRow); m_chart->setFont(QFont("Times Roman", 20)); } else { m_chart->dataProxy()->resetArray(0); // Set up sample space m_chart->setupSampleSpace(m_rowCount, m_columnCount); // Set selection mode to full - m_chart->setSelectionMode(ModeItemRowAndColumn); + m_chart->setSelectionMode(QDataVis::ModeItemRowAndColumn); m_chart->valueAxis()->setSegmentCount(m_segments * 2); m_chart->valueAxis()->setSubSegmentCount(0); m_chart->valueAxis()->setAutoAdjustRange(true); @@ -251,34 +251,34 @@ void ChartModifier::changeStyle() static int model = 0; switch (model) { case 0: - m_chart->setBarType(Cylinders, false); + m_chart->setBarType(QDataVis::Cylinders, false); break; case 1: - m_chart->setBarType(Cylinders, true); + m_chart->setBarType(QDataVis::Cylinders, true); break; case 2: - m_chart->setBarType(Cones, false); + m_chart->setBarType(QDataVis::Cones, false); break; case 3: - m_chart->setBarType(Cones, true); + m_chart->setBarType(QDataVis::Cones, true); break; case 4: - m_chart->setBarType(Bars, false); + m_chart->setBarType(QDataVis::Bars, false); break; case 5: - m_chart->setBarType(Bars, true); + m_chart->setBarType(QDataVis::Bars, true); break; case 6: - m_chart->setBarType(Pyramids, false); + m_chart->setBarType(QDataVis::Pyramids, false); break; case 7: - m_chart->setBarType(Pyramids, true); + m_chart->setBarType(QDataVis::Pyramids, true); break; case 8: - m_chart->setBarType(BevelBars, false); + m_chart->setBarType(QDataVis::BevelBars, false); break; case 9: - m_chart->setBarType(BevelBars, true); + m_chart->setBarType(QDataVis::BevelBars, true); break; } model++; @@ -288,42 +288,42 @@ void ChartModifier::changeStyle() void ChartModifier::changePresetCamera() { - static int preset = PresetFrontLow; + static int preset = QDataVis::PresetFrontLow; - m_chart->setCameraPreset((CameraPreset)preset); + m_chart->setCameraPreset((QDataVis::CameraPreset)preset); - if (++preset > PresetDirectlyBelow) - preset = PresetFrontLow; + if (++preset > QDataVis::PresetDirectlyBelow) + preset = QDataVis::PresetFrontLow; } void ChartModifier::changeTheme() { - static int theme = ThemeSystem; + static int theme = QDataVis::ThemeSystem; - m_chart->setTheme((ColorTheme)theme); + m_chart->setTheme((QDataVis::ColorTheme)theme); - if (++theme > ThemeLight) - theme = ThemeSystem; + if (++theme > QDataVis::ThemeLight) + theme = QDataVis::ThemeSystem; } void ChartModifier::changeTransparency() { - static int transparency = TransparencyNone; + static int transparency = QDataVis::TransparencyNone; - m_chart->setLabelTransparency((LabelTransparency)transparency); + m_chart->setLabelTransparency((QDataVis::LabelTransparency)transparency); - if (++transparency > TransparencyNoBackground) - transparency = TransparencyFromTheme; + if (++transparency > QDataVis::TransparencyNoBackground) + transparency = QDataVis::TransparencyFromTheme; } void ChartModifier::changeSelectionMode() { - static int selectionMode = ModeNone; + static int selectionMode = QDataVis::ModeNone; - m_chart->setSelectionMode((SelectionMode)selectionMode); + m_chart->setSelectionMode((QDataVis::SelectionMode)selectionMode); - if (++selectionMode > ModeZoomColumn) - selectionMode = ModeNone; + if (++selectionMode > QDataVis::ModeZoomColumn) + selectionMode = QDataVis::ModeNone; } void ChartModifier::changeFont(const QFont &font) @@ -340,17 +340,17 @@ void ChartModifier::changeFontSize(int fontsize) m_chart->setFontSize((GLfloat)m_fontSize); } -void ChartModifier::shadowQualityUpdatedByVisual(ShadowQuality sq) +void ChartModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq) { int quality = 0; switch (sq) { - case ShadowLow: + case QDataVis::ShadowLow: quality = 1; break; - case ShadowMedium: + case QDataVis::ShadowMedium: quality = 2; break; - case ShadowHigh: + case QDataVis::ShadowHigh: quality = 3; break; } @@ -361,16 +361,16 @@ void ChartModifier::shadowQualityUpdatedByVisual(ShadowQuality sq) void ChartModifier::changeShadowQuality(int quality) { - ShadowQuality sq = ShadowNone; + QDataVis::ShadowQuality sq = QDataVis::ShadowNone; switch (quality) { case 1: - sq = ShadowLow; + sq = QDataVis::ShadowLow; break; case 2: - sq = ShadowMedium; + sq = QDataVis::ShadowMedium; break; case 3: - sq = ShadowHigh; + sq = QDataVis::ShadowHigh; break; } m_chart->setShadowQuality(sq); diff --git a/examples/widget/chart.h b/examples/widget/chart.h index c27cb39b..67280e13 100644 --- a/examples/widget/chart.h +++ b/examples/widget/chart.h @@ -64,7 +64,7 @@ public: public slots: void changeShadowQuality(int quality); - void shadowQualityUpdatedByVisual(ShadowQuality shadowQuality); + void shadowQualityUpdatedByVisual(QDataVis::ShadowQuality shadowQuality); signals: void shadowQualityChanged(int quality); |