diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-03 14:15:50 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-06-04 08:26:32 +0300 |
commit | b49bd4aea2265de243e41c19ffa44f04759bcf8d (patch) | |
tree | 1af3a1414782073a97d909c2fae73b92c7d1f51d /tests | |
parent | 779da0484f409ac93d32e3fdd5af7a30a52883a6 (diff) |
Misc fixes found during testing
- Memory leaks
- Y-axis placement issues in scatter and surface
Change-Id: I7ec6c9c3e53502445b52c049c973186a7c54c95f
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/scattertest/scatterchart.cpp | 16 | ||||
-rw-r--r-- | tests/scattertest/scatterchart.h | 1 |
2 files changed, 12 insertions, 5 deletions
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); diff --git a/tests/scattertest/scatterchart.h b/tests/scattertest/scatterchart.h index 420c68e3..983b605a 100644 --- a/tests/scattertest/scatterchart.h +++ b/tests/scattertest/scatterchart.h @@ -102,6 +102,7 @@ private: void populateFlatSeries(QScatter3DSeries *series, int rows, int columns, float value); void populateRisingSeries(QScatter3DSeries *series, int rows, int columns, float minValue, float maxValue); + void deleteAxis(QValue3DAxis *axis); Q3DScatter *m_chart; int m_fontSize; |