summaryrefslogtreecommitdiffstats
path: root/tests/barstest
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2014-05-30 14:37:43 +0300
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2014-06-02 08:11:46 +0300
commit5170c3fb57210a89978501108e07c598fb083fbc (patch)
treeaec503e77412c25789cde8e187eb0c415d9ef1e2 /tests/barstest
parentaac8c10200d1cc9354c0f5190adb858021f77e6b (diff)
Fix various issues
Change-Id: I4a6d4775f3ca578370a9ce23491bddcb0f5486ec Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'tests/barstest')
-rw-r--r--tests/barstest/chart.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/tests/barstest/chart.cpp b/tests/barstest/chart.cpp
index 4e5c8976..d3c38d85 100644
--- a/tests/barstest/chart.cpp
+++ b/tests/barstest/chart.cpp
@@ -313,11 +313,16 @@ void GraphModifier::swapAxis()
void GraphModifier::releaseAxes()
{
- // Releases all axes - results in default axes for all dimensions.
+ // Releases all axes we have created - results in default axes for all dimensions.
// Axes reset when the graph is switched as set*Axis calls are made, which
// implicitly add axes.
- foreach (QAbstract3DAxis *axis, m_graph->axes())
- m_graph->releaseAxis(axis);
+ m_graph->releaseAxis(m_autoAdjustingAxis);
+ m_graph->releaseAxis(m_fixedRangeAxis);
+ m_graph->releaseAxis(m_temperatureAxis);
+ m_graph->releaseAxis(m_yearAxis);
+ m_graph->releaseAxis(m_monthAxis);
+ m_graph->releaseAxis(m_genericRowAxis);
+ m_graph->releaseAxis(m_genericColumnAxis);
}
void GraphModifier::releaseSeries()
@@ -999,8 +1004,6 @@ void GraphModifier::primarySeriesTest()
nextStep = 0;
break;
}
-
-
}
void GraphModifier::insertRemoveTestToggle()
@@ -1038,7 +1041,7 @@ void GraphModifier::toggleRotation()
void GraphModifier::useLogAxis()
{
static int counter = -1;
- static QLogValue3DAxisFormatter *logFormatter = new QLogValue3DAxisFormatter;
+ static QLogValue3DAxisFormatter *logFormatter = 0;
static float minRange = 1.0f;
counter++;
@@ -1115,8 +1118,6 @@ void GraphModifier::useLogAxis()
counter = -1;
break;
}
-
-
}
void GraphModifier::changeValueAxisFormat(const QString & text)