##// END OF EJS Templates
Added zooming functions to ChartView...
Added zooming functions to ChartView Added all the zooming functions to ChartView that are available also for QChart. Change-Id: I5568c9fbf2077b0ab1de94742d41cd44ce56bc9b Task-number: QTRD-3471 Task-number: QTRD-3504 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

File last commit:

r2781:7c9f8e5a27d8
r2788:67af712ca4a0
Show More
tst_qlogvalueaxis.cpp
401 lines | 10.7 KiB | text/x-c | CppLexer
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351 /****************************************************************************
**
Titta Heikkala
Copyright header changes...
r2776 ** Copyright (C) 2015 The Qt Company Ltd
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351 ** All rights reserved.
Titta Heikkala
Copyright header changes...
r2776 ** For any questions to The Qt Company, please use contact form at http://qt.io
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351 **
Titta Heikkala
Updated license headers...
r2740 ** This file is part of the Qt Charts module.
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351 **
Titta Heikkala
Updated license headers...
r2740 ** Licensees holding valid commercial license for Qt may use this file in
** accordance with the Qt License Agreement provided with the Software
** or, alternatively, in accordance with the terms contained in a written
Titta Heikkala
Copyright header changes...
r2776 ** agreement between you and The Qt Company.
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351 **
** If you have questions regarding the use of this file, please use
Titta Heikkala
Updated license headers...
r2740 ** contact form at http://qt.io
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351 **
****************************************************************************/
#include "../qabstractaxis/tst_qabstractaxis.h"
Titta Heikkala
Fix include syntax...
r2714 #include <QtCharts/QLogValueAxis>
#include <QtCharts/QLineSeries>
#include <QtCore/QDebug>
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
class tst_QLogValueAxis: public tst_QAbstractAxis
{
Q_OBJECT
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 void qlogvalueaxis_data();
void qlogvalueaxis();
Marek Rosa
Enabled all tests on QLogValueAxis
r2386 void max_raw_data();
void max_raw();
void max_data();
void max();
void max_animation_data();
void max_animation();
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351 void min_raw_data();
void min_raw();
void min_data();
void min();
void min_animation_data();
void min_animation();
Marek Rosa
Enabled all tests on QLogValueAxis
r2386 void range_raw_data();
void range_raw();
void range_data();
void range();
void range_animation_data();
void range_animation();
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 void noautoscale_data();
void noautoscale();
void autoscale_data();
void autoscale();
void zoom();
Titta Heikkala
Add possibility to set reverse values to axes...
r2781 void reverse();
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
private:
QLogValueAxis* m_logvaluesaxis;
QLineSeries* m_series;
};
void tst_QLogValueAxis::initTestCase()
{
}
void tst_QLogValueAxis::cleanupTestCase()
{
Miikka Heikkinen
Plugged some memory leaks....
r2733 QTest::qWait(1); // Allow final deleteLaters to run
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351 }
void tst_QLogValueAxis::init()
{
m_logvaluesaxis = new QLogValueAxis();
m_series = new QLineSeries();
*m_series << QPointF(1, 1) << QPointF(100, 100);
tst_QAbstractAxis::init(m_logvaluesaxis,m_series);
m_chart->addSeries(m_series);
m_chart->createDefaultAxes();
}
void tst_QLogValueAxis::cleanup()
{
delete m_series;
delete m_logvaluesaxis;
m_series = 0;
m_logvaluesaxis = 0;
tst_QAbstractAxis::cleanup();
}
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 void tst_QLogValueAxis::qlogvalueaxis_data()
{
}
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 void tst_QLogValueAxis::qlogvalueaxis()
{
qabstractaxis();
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 QCOMPARE(m_logvaluesaxis->max(), (qreal)1);
QCOMPARE(m_logvaluesaxis->min(), (qreal)1);
QCOMPARE(m_logvaluesaxis->type(), QAbstractAxis::AxisTypeLogValue);
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 m_chart->setAxisX(m_logvaluesaxis, m_series);
m_view->show();
QTest::qWaitForWindowShown(m_view);
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 QCOMPARE(m_logvaluesaxis->max(), (qreal)100);
QCOMPARE(m_logvaluesaxis->min(), (qreal)1);
Titta Heikkala
Add possibility to set reverse values to axes...
r2781
QCOMPARE(m_logvaluesaxis->isReverse(), false);
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 }
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
Marek Rosa
Enabled all tests on QLogValueAxis
r2386 void tst_QLogValueAxis::max_raw_data()
{
QTest::addColumn<qreal>("max");
QTest::addColumn<qreal>("expected");
QTest::addColumn<bool>("minChanged");
QTest::addColumn<bool>("maxChanged");
QTest::newRow("-1.0") << (qreal)-1.0 << (qreal)1.0 << false << false;
QTest::newRow("0.0") << (qreal)0.0 << (qreal)1.0 << false << false;
QTest::newRow("0.5") << (qreal)0.5 << (qreal)0.5 << true << true;
QTest::newRow("101.0") << (qreal)101.0 << (qreal)101.0 << false << true;
}
void tst_QLogValueAxis::max_raw()
{
QFETCH(qreal, max);
QFETCH(qreal, expected);
QFETCH(bool, minChanged);
QFETCH(bool, maxChanged);
// setting the axis in max() changes the max to value other than 1
// set it back to 1
m_logvaluesaxis->setMax((qreal)1);
QSignalSpy spy0(m_logvaluesaxis, SIGNAL(maxChanged(qreal)));
QSignalSpy spy1(m_logvaluesaxis, SIGNAL(minChanged(qreal)));
QSignalSpy spy2(m_logvaluesaxis, SIGNAL(rangeChanged(qreal,qreal)));
m_logvaluesaxis->setMax(max);
QCOMPARE(m_logvaluesaxis->max(), expected);
QCOMPARE(spy0.count(), (int)maxChanged);
QCOMPARE(spy1.count(), (int)minChanged);
QCOMPARE(spy2.count(), (int)maxChanged);
}
void tst_QLogValueAxis::max_data()
{
max_raw_data();
}
void tst_QLogValueAxis::max()
{
m_chart->setAxisX(m_logvaluesaxis, m_series);
m_view->show();
QTest::qWaitForWindowShown(m_view);
max_raw();
}
void tst_QLogValueAxis::max_animation_data()
{
max_data();
}
void tst_QLogValueAxis::max_animation()
{
m_chart->setAnimationOptions(QChart::GridAxisAnimations);
max();
}
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
void tst_QLogValueAxis::min_raw_data()
{
QTest::addColumn<qreal>("min");
QTest::addColumn<qreal>("expected");
QTest::addColumn<bool>("minChanged");
QTest::addColumn<bool>("maxChanged");
QTest::newRow("-1.0") << (qreal)-1.0 << (qreal)1.0 << false << false;
QTest::newRow("0.0") << (qreal)0.0 << (qreal)1.0 << false << false;
QTest::newRow("0.5") << (qreal)0.5 << (qreal)0.5 << true << false;
QTest::newRow("101.0") << (qreal)101.0 << (qreal)101.0 << true << true;
}
void tst_QLogValueAxis::min_raw()
{
QFETCH(qreal, min);
QFETCH(qreal, expected);
QFETCH(bool, minChanged);
QFETCH(bool, maxChanged);
QSignalSpy spy0(m_logvaluesaxis, SIGNAL(maxChanged(qreal)));
QSignalSpy spy1(m_logvaluesaxis, SIGNAL(minChanged(qreal)));
QSignalSpy spy2(m_logvaluesaxis, SIGNAL(rangeChanged(qreal,qreal)));
m_logvaluesaxis->setMin(min);
QCOMPARE(m_logvaluesaxis->min(), expected);
QCOMPARE(spy0.count(), (int)maxChanged);
QCOMPARE(spy1.count(), (int)minChanged);
QCOMPARE(spy2.count(), (int)minChanged);
}
void tst_QLogValueAxis::min_data()
{
min_raw_data();
}
void tst_QLogValueAxis::min()
{
m_chart->setAxisX(m_logvaluesaxis, m_series);
m_view->show();
QTest::qWaitForWindowShown(m_view);
min_raw();
}
void tst_QLogValueAxis::min_animation_data()
{
min_data();
}
void tst_QLogValueAxis::min_animation()
{
m_chart->setAnimationOptions(QChart::GridAxisAnimations);
min();
}
Marek Rosa
Enabled all tests on QLogValueAxis
r2386 void tst_QLogValueAxis::range_raw_data()
{
QTest::addColumn<qreal>("min");
QTest::addColumn<qreal>("max");
QTest::addColumn<qreal>("expectedMin");
QTest::addColumn<qreal>("expectedMax");
QTest::addColumn<bool>("minChanged");
QTest::addColumn<bool>("maxChanged");
QTest::newRow("-1.0 - 101.0") << (qreal)-1.0 << (qreal)101.0 << (qreal)1.0 << (qreal)1.0 << false << false;
QTest::newRow("1.0 - 101.0") << (qreal)1.0 << (qreal)101.0 << (qreal)1.0 << (qreal)101.0 << false << true;
QTest::newRow("0.1 - 1.0") << (qreal)0.1 << (qreal)1.0 << (qreal)0.1 << (qreal)1.0 << true << false;
QTest::newRow("25.0 - 75.0") << (qreal)25.0 << (qreal)75.0 << (qreal)25.0 << (qreal)75.0 << true << true;
QTest::newRow("10.0 - 5.0") << (qreal)10.0 << (qreal)5.0 << (qreal)1.0 << (qreal)1.0 << false << false;
}
void tst_QLogValueAxis::range_raw()
{
QFETCH(qreal, min);
QFETCH(qreal, max);
QFETCH(qreal, expectedMin);
QFETCH(qreal, expectedMax);
QFETCH(bool, minChanged);
QFETCH(bool, maxChanged);
m_logvaluesaxis->setRange((qreal)1, (qreal)1);
QSignalSpy spy0(m_logvaluesaxis, SIGNAL(maxChanged(qreal)));
QSignalSpy spy1(m_logvaluesaxis, SIGNAL(minChanged(qreal)));
QSignalSpy spy2(m_logvaluesaxis, SIGNAL(rangeChanged(qreal,qreal)));
m_logvaluesaxis->setRange(min, max);
QCOMPARE(m_logvaluesaxis->min(), expectedMin);
QCOMPARE(m_logvaluesaxis->max(), expectedMax);
QCOMPARE(spy0.count(), (int)maxChanged);
QCOMPARE(spy1.count(), (int)minChanged);
QCOMPARE(spy2.count(), (int)(minChanged || maxChanged));
}
void tst_QLogValueAxis::range_data()
{
range_raw_data();
}
void tst_QLogValueAxis::range()
{
m_chart->setAxisX(m_logvaluesaxis, m_series);
m_view->show();
QTest::qWaitForWindowShown(m_view);
range_raw();
}
void tst_QLogValueAxis::range_animation_data()
{
range_data();
}
void tst_QLogValueAxis::range_animation()
{
m_chart->setAnimationOptions(QChart::GridAxisAnimations);
range();
}
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 void tst_QLogValueAxis::noautoscale_data()
{
QTest::addColumn<qreal>("min");
QTest::addColumn<qreal>("max");
QTest::newRow("0.1 - 101.0") << (qreal)0.1 << (qreal)101.0;
QTest::newRow("25.0 - 75.0") << (qreal)25.0 << (qreal)75.0;
}
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 void tst_QLogValueAxis::noautoscale()
{
QFETCH(qreal, min);
QFETCH(qreal, max);
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 QSignalSpy spy0(m_logvaluesaxis, SIGNAL(maxChanged(qreal)));
QSignalSpy spy1(m_logvaluesaxis, SIGNAL(minChanged(qreal)));
QSignalSpy spy2(m_logvaluesaxis, SIGNAL(rangeChanged(qreal,qreal)));
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 m_logvaluesaxis->setRange(min, max);
QCOMPARE(m_logvaluesaxis->min(), min);
QCOMPARE(m_logvaluesaxis->max(), max);
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 QCOMPARE(spy0.count(), 1);
QCOMPARE(spy1.count(), 1);
QCOMPARE(spy2.count(), 1);
m_view->show();
QTest::qWaitForWindowShown(m_view);
QCOMPARE(m_logvaluesaxis->min(), min);
QCOMPARE(m_logvaluesaxis->max(), max);
}
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 void tst_QLogValueAxis::autoscale_data()
{
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 }
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 void tst_QLogValueAxis::autoscale()
{
QSignalSpy spy0(m_logvaluesaxis, SIGNAL(maxChanged(qreal)));
QSignalSpy spy1(m_logvaluesaxis, SIGNAL(minChanged(qreal)));
QSignalSpy spy2(m_logvaluesaxis, SIGNAL(rangeChanged(qreal,qreal)));
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 QCOMPARE(m_logvaluesaxis->min(), (qreal)1);
QCOMPARE(m_logvaluesaxis->max(), (qreal)1);
m_chart->setAxisX(m_logvaluesaxis, m_series);
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 QCOMPARE(spy0.count(), 1);
QCOMPARE(spy1.count(), 0);
QCOMPARE(spy2.count(), 1);
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 m_view->show();
QTest::qWaitForWindowShown(m_view);
QCOMPARE(m_logvaluesaxis->min(), (qreal)1);
QCOMPARE(m_logvaluesaxis->max(), (qreal)100);
}
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351
Marek Rosa
Few more tests added to qlogvalueaxis
r2383 void tst_QLogValueAxis::zoom()
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351 {
m_chart->setAxisX(m_logvaluesaxis, m_series);
m_view->show();
QTest::qWaitForWindowShown(m_view);
m_logvaluesaxis->setBase(2);
m_logvaluesaxis->setRange(0.5, 2);
QCOMPARE(m_logvaluesaxis->min(), (qreal)0.5);
QCOMPARE(m_logvaluesaxis->max(), (qreal)2.0);
m_chart->zoomOut();
QCOMPARE(m_logvaluesaxis->min(), (qreal)0.25);
QCOMPARE(m_logvaluesaxis->max(), (qreal)4.0);
m_chart->zoomIn();
QCOMPARE(m_logvaluesaxis->min(), (qreal)0.5);
QCOMPARE(m_logvaluesaxis->max(), (qreal)2.0);
m_logvaluesaxis->setRange(0.5, 1024);
m_chart->zoom(11.0);
QCOMPARE(m_logvaluesaxis->min(), (qreal)16.0);
QCOMPARE(m_logvaluesaxis->max(), (qreal)32.0);
m_logvaluesaxis->setRange(16, 64);
m_chart->zoom(1/3.0);
QCOMPARE(m_logvaluesaxis->min(), (qreal)4);
QCOMPARE(m_logvaluesaxis->max(), (qreal)256.0);
}
Titta Heikkala
Add possibility to set reverse values to axes...
r2781 void tst_QLogValueAxis::reverse()
{
QSignalSpy spy(m_logvaluesaxis, SIGNAL(reverseChanged(bool)));
QCOMPARE(m_logvaluesaxis->isReverse(), false);
m_logvaluesaxis->setReverse();
QCOMPARE(m_logvaluesaxis->isReverse(), true);
QCOMPARE(spy.count(), 1);
m_view->show();
QTest::qWaitForWindowShown(m_view);
QCOMPARE(m_logvaluesaxis->isReverse(), true);
}
Marek Rosa
QChart mapping functions: return QPoint(0, 0) if series type is Pie...
r2351 QTEST_MAIN(tst_QLogValueAxis)
#include "tst_qlogvalueaxis.moc"