From b49bd4aea2265de243e41c19ffa44f04759bcf8d Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 3 Jun 2014 14:15:50 +0300 Subject: Misc fixes found during testing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Memory leaks - Y-axis placement issues in scatter and surface Change-Id: I7ec6c9c3e53502445b52c049c973186a7c54c95f Reviewed-by: Titta Heikkala Reviewed-by: Tomi Korpipää --- tests/scattertest/scatterchart.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'tests/scattertest/scatterchart.cpp') diff --git a/tests/scattertest/scatterchart.cpp b/tests/scattertest/scatterchart.cpp index dce73e61..e498b2da 100644 --- a/tests/scattertest/scatterchart.cpp +++ b/tests/scattertest/scatterchart.cpp @@ -250,7 +250,7 @@ void ScatterDataModifier::testItemChanges() foreach (QScatter3DSeries *series, m_chart->seriesList()) m_chart->removeSeries(series); foreach (QValue3DAxis *axis, m_chart->axes()) - m_chart->releaseAxis(axis); + deleteAxis(axis); delete series0; delete series1; delete series2; @@ -425,7 +425,7 @@ void ScatterDataModifier::testAxisReverse() foreach (QScatter3DSeries *series, m_chart->seriesList()) m_chart->removeSeries(series); foreach (QValue3DAxis *axis, m_chart->axes()) - m_chart->releaseAxis(axis); + deleteAxis(axis); delete series0; delete series1; series0 = new QScatter3DSeries; @@ -627,11 +627,17 @@ void ScatterDataModifier::clear() qDebug() << m_loopCounter << "Cleared array"; } +void ScatterDataModifier::deleteAxis(QValue3DAxis *axis) +{ + m_chart->releaseAxis(axis); + delete axis; +} + void ScatterDataModifier::resetAxes() { - m_chart->releaseAxis(m_chart->axisX()); - m_chart->releaseAxis(m_chart->axisY()); - m_chart->releaseAxis(m_chart->axisZ()); + deleteAxis(m_chart->axisX()); + deleteAxis(m_chart->axisY()); + deleteAxis(m_chart->axisZ()); m_chart->setAxisX(new QValue3DAxis); m_chart->setAxisY(new QValue3DAxis); -- cgit v1.2.3