diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-28 08:19:37 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-11-29 09:53:48 +0200 |
| commit | 527113321ff103835b89543c5d6f670f55b5b0d5 (patch) | |
| tree | 01b242ef7b1f30a414b718f99f155f19235951bd /examples/bars/graphmodifier.cpp | |
| parent | 85dda87df2d420dc53959e549d24c4b09ce93d57 (diff) | |
Move series specific visual elements to series, part 1
Meshes moved to series.
Task-number: QTRD-2557
Change-Id: I80050e413faf3bc942eb5a5627a66747de5805d8
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'examples/bars/graphmodifier.cpp')
| -rw-r--r-- | examples/bars/graphmodifier.cpp | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/examples/bars/graphmodifier.cpp b/examples/bars/graphmodifier.cpp index 6a35b1b1..23cefeb4 100644 --- a/examples/bars/graphmodifier.cpp +++ b/examples/bars/graphmodifier.cpp @@ -48,7 +48,8 @@ GraphModifier::GraphModifier(Q3DBars *bargraph) m_primaryData(new QBarDataProxy), m_secondaryData(new QBarDataProxy), //! [1] - m_style(QDataVis::MeshStyleBevelBars), + m_primaryStyle(QAbstract3DSeries::MeshBevelBar), + m_secondaryStyle(QAbstract3DSeries::MeshSphere), m_smooth(false) { //! [2] @@ -78,8 +79,13 @@ GraphModifier::GraphModifier(Q3DBars *bargraph) QBar3DSeries *series = new QBar3DSeries(m_primaryData); series->setItemLabelFormat(QStringLiteral("Oulu - @colLabel @rowLabel: @valueLabel")); + series->setMesh(m_primaryStyle); + series->setMeshSmooth(m_smooth); + QBar3DSeries *series2 = new QBar3DSeries(m_secondaryData); series2->setItemLabelFormat(QStringLiteral("Helsinki - @colLabel @rowLabel: @valueLabel")); + series2->setMesh(m_secondaryStyle); + series2->setMeshSmooth(m_smooth); series2->setVisible(false); //! [4] @@ -159,8 +165,12 @@ void GraphModifier::resetTemperatureData() void GraphModifier::changeStyle(int style) { - m_style = QDataVis::MeshStyle(style); - m_graph->setBarType(m_style, m_smooth); + QComboBox *comboBox = qobject_cast<QComboBox *>(sender()); + if (comboBox) { + m_primaryStyle = QAbstract3DSeries::Mesh(comboBox->itemData(style).toInt()); + if (m_graph->seriesList().size()) + m_graph->seriesList().at(0)->setMesh(m_primaryStyle); + } } void GraphModifier::changePresetCamera() @@ -251,7 +261,10 @@ void GraphModifier::setGridEnabled(int enabled) void GraphModifier::setSmoothBars(int smooth) { m_smooth = bool(smooth); - m_graph->setBarType(m_style, m_smooth); + if (m_graph->seriesList().size()) { + m_graph->seriesList().at(0)->setMeshSmooth(m_smooth); + m_graph->seriesList().at(1)->setMeshSmooth(m_smooth); + } } void GraphModifier::setSeriesVisibility(int enabled) |