From 9549c09d4cfee485c31f54360a32d100d06a2095 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Mon, 2 Dec 2013 12:59:46 +0200 Subject: Move series specific visual elements to series, part 2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Surface series grid visibility and smoothness Task-number: QTRD-2557 Change-Id: I0beecb7785bf2fb489d0faba797a145151513a79 Reviewed-by: Tomi Korpipää --- tests/multigraphs/data.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'tests/multigraphs') diff --git a/tests/multigraphs/data.cpp b/tests/multigraphs/data.cpp index 27f5f449..fac341d8 100644 --- a/tests/multigraphs/data.cpp +++ b/tests/multigraphs/data.cpp @@ -54,30 +54,33 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars, m_surface->setSelectionMode(QDataVis::SelectionNone); m_surface->theme()->setGridEnabled(false); m_surface->setGradient(gradient); - m_surface->setSurfaceGridEnabled(false); m_surface->theme()->setBackgroundEnabled(false); - m_surface->setSmoothSurfaceEnabled(false); m_surface->scene()->activeCamera()->setCameraPosition(0.0, 90.0, 150); - m_surface->addSeries(new QSurface3DSeries(new QHeightMapSurfaceDataProxy())); + QSurface3DSeries *series1 = new QSurface3DSeries(new QHeightMapSurfaceDataProxy()); + series1->setFlatShadingEnabled(true); + series1->setSurfaceGridEnabled(false); + m_surface->addSeries(series1); // Initialize scatter m_scatter->setTheme(new Q3DTheme(Q3DTheme::ThemeStoneMoss)); m_scatter->setSelectionMode(QDataVis::SelectionNone); m_scatter->theme()->setGridEnabled(false); - 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); + QScatter3DSeries *series2 = new QScatter3DSeries; + series2->setMesh(QAbstract3DSeries::MeshPoint); + m_scatter->addSeries(series2); // Initialize bars m_bars->setTheme(new Q3DTheme(Q3DTheme::ThemeQt)); m_bars->setSelectionMode(QDataVis::SelectionItemAndRow | QDataVis::SelectionSlice); m_bars->theme()->setGridEnabled(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); - m_bars->addSeries(new QBar3DSeries); + QBar3DSeries *series3 = new QBar3DSeries; + series3->setMesh(QAbstract3DSeries::MeshBar); + m_bars->addSeries(series3); // Hide scroll bar m_statusArea->verticalScrollBar()->setVisible(false); -- cgit v1.2.3