From 527113321ff103835b89543c5d6f670f55b5b0d5 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 28 Nov 2013 08:19:37 +0200 Subject: Move series specific visual elements to series, part 1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Meshes moved to series. Task-number: QTRD-2557 Change-Id: I80050e413faf3bc942eb5a5627a66747de5805d8 Reviewed-by: Tomi Korpipää --- tests/barstest/chart.cpp | 30 ++++++++++++------- tests/kinectsurface/surfacedata.cpp | 8 ++--- tests/kinectsurface/surfacedata.h | 2 +- tests/multigraphs/data.cpp | 4 +-- tests/scattertest/scatterchart.cpp | 58 +++++++++++++++++++++++-------------- tests/spectrum/spectrumapp/main.cpp | 4 +-- 6 files changed, 66 insertions(+), 40 deletions(-) (limited to 'tests') diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp index 546204ce..cd7098ff 100644 --- a/tests/barstest/chart.cpp +++ b/tests/barstest/chart.cpp @@ -466,34 +466,44 @@ void GraphModifier::changeStyle() static int model = 0; switch (model) { case 0: - m_graph->setBarType(QDataVis::MeshStyleCylinders, false); + m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshCylinder); + m_graph->seriesList().at(0)->setMeshSmooth(false); break; case 1: - m_graph->setBarType(QDataVis::MeshStyleCylinders, true); + m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshCylinder); + m_graph->seriesList().at(0)->setMeshSmooth(true); break; case 2: - m_graph->setBarType(QDataVis::MeshStyleCones, false); + m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshCone); + m_graph->seriesList().at(0)->setMeshSmooth(false); break; case 3: - m_graph->setBarType(QDataVis::MeshStyleCones, true); + m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshCone); + m_graph->seriesList().at(0)->setMeshSmooth(true); break; case 4: - m_graph->setBarType(QDataVis::MeshStyleBars, false); + m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshBar); + m_graph->seriesList().at(0)->setMeshSmooth(false); break; case 5: - m_graph->setBarType(QDataVis::MeshStyleBars, true); + m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshBar); + m_graph->seriesList().at(0)->setMeshSmooth(true); break; case 6: - m_graph->setBarType(QDataVis::MeshStylePyramids, false); + m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshPyramid); + m_graph->seriesList().at(0)->setMeshSmooth(false); break; case 7: - m_graph->setBarType(QDataVis::MeshStylePyramids, true); + m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshPyramid); + m_graph->seriesList().at(0)->setMeshSmooth(true); break; case 8: - m_graph->setBarType(QDataVis::MeshStyleBevelBars, false); + m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshBevelBar); + m_graph->seriesList().at(0)->setMeshSmooth(false); break; case 9: - m_graph->setBarType(QDataVis::MeshStyleBevelBars, true); + m_graph->seriesList().at(0)->setMesh(QAbstract3DSeries::MeshBevelBar); + m_graph->seriesList().at(0)->setMeshSmooth(true); break; } model++; diff --git a/tests/kinectsurface/surfacedata.cpp b/tests/kinectsurface/surfacedata.cpp index 79489fc8..e48a4b58 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::SelectionNone); m_scatter->setGridVisible(false); - m_scatter->setObjectType(QDataVis::MeshStyleDots, false); + m_scatter->setObjectType(QDataVis::MeshDots, 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::MeshStyleBars, true); + m_bars->setBarType(QDataVis::MeshBars, 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 == MeshStyleBars) { + } else if (m_mode == MeshBars) { 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 == MeshStyleBars) { + } else if (m_mode == MeshBars) { m_resize = true; m_resolution /= 4; m_barDataArray = new QBarDataArray; diff --git a/tests/kinectsurface/surfacedata.h b/tests/kinectsurface/surfacedata.h index 0bf753cd..fcae03b4 100644 --- a/tests/kinectsurface/surfacedata.h +++ b/tests/kinectsurface/surfacedata.h @@ -55,7 +55,7 @@ public: enum VisualizationMode { Surface = 0, Scatter, - MeshStyleBars + MeshBars }; public slots: diff --git a/tests/multigraphs/data.cpp b/tests/multigraphs/data.cpp index d2fe1051..53236e39 100644 --- a/tests/multigraphs/data.cpp +++ b/tests/multigraphs/data.cpp @@ -64,7 +64,7 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars, m_scatter->setTheme(new Q3DTheme(QDataVis::ThemeStoneMoss)); m_scatter->setSelectionMode(QDataVis::SelectionNone); m_scatter->theme()->setGridEnabled(false); - m_scatter->setObjectType(QDataVis::MeshStylePoints); + m_scatter->setObjectType(QDataVis::MeshPoint); m_scatter->setShadowQuality(QDataVis::ShadowQualitySoftLow); m_scatter->scene()->activeCamera()->setCameraPosition(0.0, 85.0, 150); m_scatter->addSeries(new QScatter3DSeries); @@ -73,7 +73,7 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars, m_bars->setTheme(new Q3DTheme(QDataVis::ThemeQt)); m_bars->setSelectionMode(QDataVis::SelectionItemAndRow | QDataVis::SelectionSlice); m_bars->theme()->setGridEnabled(false); - m_bars->setBarType(QDataVis::MeshStyleBars, false); + m_bars->setBarType(QDataVis::MeshBar, false); m_bars->setShadowQuality(QDataVis::ShadowQualityLow); m_bars->setBarSpacing(QSizeF(0.0, 0.0)); m_bars->scene()->activeCamera()->setCameraPosition(0.0, 75.0, 150); diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp index 5f43b486..f0cf362f 100644 --- a/tests/scattertest/scatterchart.cpp +++ b/tests/scattertest/scatterchart.cpp @@ -41,7 +41,6 @@ ScatterDataModifier::ScatterDataModifier(Q3DScatter *scatter) QFont font = m_chart->theme()->font(); font.setPointSize(m_fontSize); m_chart->theme()->setFont(font); - m_chart->setObjectType(QDataVis::MeshStyleSpheres, true); m_chart->setShadowQuality(QDataVis::ShadowQualityNone); m_chart->scene()->activeCamera()->setCameraPreset(QDataVis::CameraPresetFront); m_chart->setAxisX(new Q3DValueAxis); @@ -110,27 +109,42 @@ void ScatterDataModifier::addData() void ScatterDataModifier::changeStyle() { - static int model = 0; - switch (model) { - case 0: - m_chart->setObjectType(QDataVis::MeshStyleDots, false); - break; - case 1: - m_chart->setObjectType(QDataVis::MeshStyleDots, true); - break; - case 2: - m_chart->setObjectType(QDataVis::MeshStyleSpheres, false); - break; - case 3: - m_chart->setObjectType(QDataVis::MeshStyleSpheres, true); - break; - case 4: - m_chart->setObjectType(QDataVis::MeshStylePoints); - break; + if (!m_targetSeries) + createAndAddSeries(); + + if (m_targetSeries->isMeshSmooth()) { + m_targetSeries->setMeshSmooth(false); + switch (m_targetSeries->mesh()) { + case QAbstract3DSeries::MeshCube: + m_targetSeries->setMesh(QAbstract3DSeries::MeshPyramid); + break; + case QAbstract3DSeries::MeshPyramid: + m_targetSeries->setMesh(QAbstract3DSeries::MeshCone); + break; + case QAbstract3DSeries::MeshCone: + m_targetSeries->setMesh(QAbstract3DSeries::MeshCylinder); + break; + case QAbstract3DSeries::MeshCylinder: + m_targetSeries->setMesh(QAbstract3DSeries::MeshBevelCube); + break; + case QAbstract3DSeries::MeshBevelCube: + m_targetSeries->setMesh(QAbstract3DSeries::MeshSphere); + break; + case QAbstract3DSeries::MeshSphere: + m_targetSeries->setMesh(QAbstract3DSeries::MeshMinimal); + break; + case QAbstract3DSeries::MeshMinimal: + m_targetSeries->setMesh(QAbstract3DSeries::MeshPoint); + break; + default: + m_targetSeries->setMesh(QAbstract3DSeries::MeshCube); + break; + } + } else { + m_targetSeries->setMeshSmooth(true); } - model++; - if (model > 4) - model = 0; + + qDebug() << __FUNCTION__ << m_targetSeries->mesh() << m_targetSeries->isMeshSmooth(); } void ScatterDataModifier::changePresetCamera() @@ -478,6 +492,8 @@ QScatter3DSeries *ScatterDataModifier::createAndAddSeries() m_chart->addSeries(series); series->setItemLabelFormat(QString("%1: @xLabel - @yLabel - @zLabel").arg(counter++)); + series->setMesh(QAbstract3DSeries::MeshSphere); + series->setMeshSmooth(true); QObject::connect(series, &QScatter3DSeries::selectedItemChanged, this, &ScatterDataModifier::handleSelectionChange); diff --git a/tests/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp index 7277d752..8d954dc9 100644 --- a/tests/spectrum/spectrumapp/main.cpp +++ b/tests/spectrum/spectrumapp/main.cpp @@ -85,7 +85,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::MeshStyleCones, true); + m_chart->setBarType(QDataVis::MeshCones, 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.0f); @@ -94,7 +94,7 @@ MainApp::MainApp(Q3DBars *window) m_chart->setBarThickness(2.0f); m_chart->setBarSpacing(QSizeF(0.0, 0.0)); // Set bar type, flat bars - m_chart->setBarType(QDataVis::MeshStyleBars, false); + m_chart->setBarType(QDataVis::MeshBar, false); // Adjust camera position m_chart->scene()->activeCamera()->setCameraPosition(10.0f, 7.5f, 75.0f); #endif -- cgit v1.2.3