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/scatter/scatterdatamodifier.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/scatter/scatterdatamodifier.cpp')
| -rw-r--r-- | examples/scatter/scatterdatamodifier.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/examples/scatter/scatterdatamodifier.cpp b/examples/scatter/scatterdatamodifier.cpp index fea50992..ee49402a 100644 --- a/examples/scatter/scatterdatamodifier.cpp +++ b/examples/scatter/scatterdatamodifier.cpp @@ -24,6 +24,8 @@ #include <QtDataVisualization/qscatter3dseries.h> #include <QtDataVisualization/q3dtheme.h> #include <qmath.h> +#include <QComboBox> + using namespace QtDataVisualization; //#define RANDOM_SCATTER // Uncomment this to switch to random scatter @@ -33,7 +35,7 @@ const int numberOfItems = 3600; ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) : m_graph(scatter), m_fontSize(40.0f), - m_style(QDataVis::MeshStyleSpheres), + m_style(QAbstract3DSeries::MeshSphere), m_smooth(true) { //! [0] @@ -41,7 +43,6 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) QFont font = m_graph->theme()->font(); font.setPointSize(m_fontSize); m_graph->theme()->setFont(font); - m_graph->setObjectType(QDataVis::MeshStyleSpheres, true); m_graph->setShadowQuality(QDataVis::ShadowQualitySoftLow); m_graph->scene()->activeCamera()->setCameraPreset(QDataVis::CameraPresetFront); //! [0] @@ -56,6 +57,7 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) QScatterDataProxy *proxy = new QScatterDataProxy; QScatter3DSeries *series = new QScatter3DSeries(proxy); series->setItemLabelFormat("@xTitle: @xLabel @yTitle: @yLabel @zTitle: @zLabel"); + series->setMesh(QAbstract3DSeries::MeshSphere); m_graph->addSeries(series); //! [2] @@ -117,14 +119,19 @@ void ScatterDataModifier::addData() //! [8] void ScatterDataModifier::changeStyle(int style) { - m_style = QDataVis::MeshStyle(style + 5); // skip unsupported mesh types - m_graph->setObjectType(m_style, m_smooth); + QComboBox *comboBox = qobject_cast<QComboBox *>(sender()); + if (comboBox) { + m_style = QAbstract3DSeries::Mesh(comboBox->itemData(style).toInt()); + if (m_graph->seriesList().size()) + m_graph->seriesList().at(0)->setMesh(m_style); + } } void ScatterDataModifier::setSmoothDots(int smooth) { m_smooth = bool(smooth); - m_graph->setObjectType(m_style, m_smooth); + QScatter3DSeries *series = m_graph->seriesList().at(0); + series->setMeshSmooth(m_smooth); } void ScatterDataModifier::changeTheme(int theme) |