summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-10-02 13:14:16 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-10-02 13:14:35 +0300
commit50da1dc9f6cc6a276c603508868dd7f9d4c7913d (patch)
treeba5b78cc2187709f33ccc6da9d7581c7f63729f6 /examples
parent0b1c5c06a188a9dc22820e289b3ef9d6589a0df9 (diff)
Refactored MeshStyle and InputState
Task-number: QTRD-2362 Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9 Change-Id: I52ad876b9658a4a9f9a79a6358e68323075bd6c9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/barchart/main.cpp2
-rw-r--r--examples/rainfall/rainfallchart.cpp2
-rw-r--r--examples/scatterchart/scatterchart.cpp4
-rw-r--r--examples/widget/chart.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp
index 2039968c..5a69a5fb 100644
--- a/examples/barchart/main.cpp
+++ b/examples/barchart/main.cpp
@@ -77,7 +77,7 @@ ChartDataGenerator::ChartDataGenerator(Q3DBars *barchart, QTableWidget *tableWid
m_chart->setBarSpacing(QSizeF(0.2, 0.2));
// Set bar type to flat pyramids
- m_chart->setBarType(QDataVis::Pyramids, false);
+ m_chart->setBarType(QDataVis::MeshStylePyramids, false);
#ifndef USE_STATIC_DATA
// Set up sample space; make it as deep as it's wide
diff --git a/examples/rainfall/rainfallchart.cpp b/examples/rainfall/rainfallchart.cpp
index 3ec400b1..45e252bc 100644
--- a/examples/rainfall/rainfallchart.cpp
+++ b/examples/rainfall/rainfallchart.cpp
@@ -57,7 +57,7 @@ RainfallChart::RainfallChart(Q3DBars *rainfall)
m_chart->columnAxis()->setCategoryLabels(months);
// Set bar type to cylinder
- m_chart->setBarType(QDataVis::Cylinders, false);
+ m_chart->setBarType(QDataVis::MeshStyleCylinders, false);
// Set shadows to medium
m_chart->setShadowQuality(QDataVis::ShadowQualityMedium);
diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp
index be5db0d3..879d8471 100644
--- a/examples/scatterchart/scatterchart.cpp
+++ b/examples/scatterchart/scatterchart.cpp
@@ -29,13 +29,13 @@ const int numberOfItems = 10000;
ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter)
: m_chart(scatter),
m_fontSize(40.0f),
- m_style(QDataVis::Spheres),
+ m_style(QDataVis::MeshStyleSpheres),
m_smooth(true)
{
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::ThemeEbony);
m_chart->setShadowQuality(QDataVis::ShadowQualityHigh);
m_chart->setCameraPreset(QDataVis::CameraPresetFront);
diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp
index 5f7cd96a..50f2535a 100644
--- a/examples/widget/chart.cpp
+++ b/examples/widget/chart.cpp
@@ -39,7 +39,7 @@ ChartModifier::ChartModifier(Q3DBars *barchart)
m_yearAxis(new Q3DCategoryAxis),
m_monthAxis(new Q3DCategoryAxis),
m_temperatureData(new QBarDataProxy),
- m_style(QDataVis::BevelBars),
+ m_style(QDataVis::MeshStyleBevelBars),
m_smooth(false)
{
m_months << "January" << "February" << "March" << "April" << "May" << "June" << "July" << "August" << "September" << "October" << "November" << "December";