diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-13 13:35:42 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-13 14:35:32 +0200 |
| commit | 642e3fb0d91cca401ebba0221f46bc32fccc1e74 (patch) | |
| tree | 7f684b0941c8593b84bf9687ad8093f1b12ccc66 /tests | |
| parent | 8f358742159ebf151ff8187f1a6d8a05ac5c0207 (diff) | |
Fix more valgrind issues
+ some misc fixes
Change-Id: I728da6779bea026d0554d8aae5c00254c3c27694
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/multigraphs/data.cpp | 3 | ||||
| -rw-r--r-- | tests/spectrum/spectrumapp/main.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/multigraphs/data.cpp b/tests/multigraphs/data.cpp index 00747695..99354caf 100644 --- a/tests/multigraphs/data.cpp +++ b/tests/multigraphs/data.cpp @@ -57,7 +57,7 @@ Data::Data(Q3DSurface *surface, Q3DScatter *scatter, Q3DBars *bars, m_surface->scene()->activeCamera()->setCameraPosition(0.0, 90.0, 150); QSurface3DSeries *series1 = new QSurface3DSeries(new QHeightMapSurfaceDataProxy()); series1->setFlatShadingEnabled(true); - series1->setSurfaceGridEnabled(false); + series1->setDrawMode(QSurface3DSeries::DrawSurface); series1->setColorStyle(Q3DTheme::ColorStyleRangeGradient); series1->setBaseGradient(gradient); m_surface->addSeries(series1); @@ -104,6 +104,7 @@ Data::~Data() delete m_scatter; } delete m_widget; + delete m_scatterDataArray; // only portion of this array is set to graph } void Data::updateData() diff --git a/tests/spectrum/spectrumapp/main.cpp b/tests/spectrum/spectrumapp/main.cpp index 65c658d8..de209cc7 100644 --- a/tests/spectrum/spectrumapp/main.cpp +++ b/tests/spectrum/spectrumapp/main.cpp @@ -97,8 +97,6 @@ MainApp::MainApp(Q3DBars *window) // Adjust camera position m_chart->scene()->activeCamera()->setCameraPosition(10.0f, 7.5f, 75.0f); #endif - // Set color scheme - m_chart->setBarColor(QColor(Qt::red)); // Disable selection m_chart->setSelectionMode(QDataVis::SelectionNone); QObject::connect(m_engine, &Engine::changedSpectrum, this, &MainApp::spectrumChanged); @@ -107,6 +105,7 @@ MainApp::MainApp(Q3DBars *window) QObject::connect(m_restartTimer, &QTimer::timeout, this, &MainApp::restart); QBar3DSeries *series = new QBar3DSeries(); + series->setBaseColor(QColor(Qt::red)); series->setMesh(QAbstract3DSeries::MeshBar); m_chart->addSeries(series); } |