##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Added possibility to set labels position for QCategoryAxis...
Added possibility to set labels position for QCategoryAxis The position of the labels in QCategyAxis can now be set to center of the category or to the high end of the category. The first and the last labels may overlap with other axes labels when positioned on value. Change-Id: Ide0f12b723ffabf6682001e03ea5080f9642da22 Task-number: QTRD-1715 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Titta Heikkala - - Load All Authors

File last commit:

r2780:740f4f94adf8
r2780:740f4f94adf8
Show More
tst_qcategoryaxis.cpp
318 lines | 8.5 KiB | text/x-c | CppLexer
/ tests / auto / qcategoryaxis / tst_qcategoryaxis.cpp
History | Source | Raw |Copy content |Copy permalink
Marek Rosa
Fixes and tests to Interval axis
 r1708 /****************************************************************************
**
Titta Heikkala
Copyright header changes...
 r2776 ** Copyright (C) 2015 The Qt Company Ltd
Marek Rosa
Fixes and tests to Interval axis
 r1708 ** 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
Fixes and tests to Interval axis
 r1708 **
Titta Heikkala
Updated license headers...
 r2740 ** This file is part of the Qt Charts module.
Marek Rosa
Fixes and tests to Interval axis
 r1708 **
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
Fixes and tests to Interval axis
 r1708 **
** 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
Fixes and tests to Interval axis
 r1708 **
****************************************************************************/
#include "../qabstractaxis/tst_qabstractaxis.h"
Titta Heikkala
Fix include syntax...
 r2714 #include <QtCharts/QCategoryAxis>
#include <QtCharts/QLineSeries>
Marek Rosa
Fixes and tests to Interval axis
 r1708
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 class tst_QCategoryAxis: public tst_QAbstractAxis
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
Q_OBJECT
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
Marek Rosa
Renamed QCategoryAxis related files
 r1817 void qcategoryaxis_data();
void qcategoryaxis();
Marek Rosa
Fixes and tests to Interval axis
 r1708
void max_raw_data();
void max_raw();
void max_data();
void max();
void max_animation_data();
void max_animation();
void min_raw_data();
void min_raw();
void min_data();
void min();
void min_animation_data();
void min_animation();
void range_raw_data();
void range_raw();
void range_data();
void range();
void range_animation_data();
void range_animation();
Titta Heikkala
Added possibility to set labels position for QCategoryAxis...
 r2780 void labels_position();
Marek Rosa
Fixes and tests to Interval axis
 r1708
void interval_data();
void interval();
private:
Marek Rosa
Fixed range handling in categoryAxis
 r1846 QCategoryAxis* m_categoryaxis;
Marek Rosa
Fixes and tests to Interval axis
 r1708 QLineSeries* m_series;
};
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::initTestCase()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
Titta Heikkala
Added possibility to set labels position for QCategoryAxis...
 r2780 qRegisterMetaType<QCategoryAxis::AxisLabelsPosition>("QCategoryAxis::AxisLabelsPosition");
Marek Rosa
Fixes and tests to Interval axis
 r1708 }
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::cleanupTestCase()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
Miikka Heikkinen
Plugged some memory leaks....
 r2733 QTest::qWait(1); // Allow final deleteLaters to run
Marek Rosa
Fixes and tests to Interval axis
 r1708 }
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::init()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
Marek Rosa
Fixed range handling in categoryAxis
 r1846 m_categoryaxis = new QCategoryAxis();
Marek Rosa
Fixes and tests to Interval axis
 r1708 m_series = new QLineSeries();
*m_series << QPointF(-100, -100) << QPointF(0, 0) << QPointF(100, 100);
Marek Rosa
Fixed range handling in categoryAxis
 r1846 tst_QAbstractAxis::init(m_categoryaxis, m_series);
Marek Rosa
Fixes and tests to Interval axis
 r1708 m_chart->addSeries(m_series);
m_chart->createDefaultAxes();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::cleanup()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
delete m_series;
Marek Rosa
Fixed range handling in categoryAxis
 r1846 delete m_categoryaxis;
Marek Rosa
Fixes and tests to Interval axis
 r1708 m_series = 0;
Marek Rosa
Fixed range handling in categoryAxis
 r1846 m_categoryaxis = 0;
Marek Rosa
Fixes and tests to Interval axis
 r1708 tst_QAbstractAxis::cleanup();
}
Marek Rosa
Renamed QCategoryAxis related files
 r1817 void tst_QCategoryAxis::qcategoryaxis_data()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
}
Marek Rosa
Renamed QCategoryAxis related files
 r1817 void tst_QCategoryAxis::qcategoryaxis()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
qabstractaxis();
Marek Rosa
Replaced qFuzzyIsNull with qFuzzyCompare. Once qchart test case still uses qFuzzyIsNull becasue it started failing when qFuzzyCompare was used
 r2242 QVERIFY(qFuzzyCompare(m_categoryaxis->max(), 0));
QVERIFY(qFuzzyCompare(m_categoryaxis->min(), 0));
Marek Rosa
Fixed range handling in categoryAxis
 r1846 QCOMPARE(m_categoryaxis->type(), QAbstractAxis::AxisTypeCategory);
Titta Heikkala
Added possibility to set labels position for QCategoryAxis...
 r2780 QCOMPARE(m_categoryaxis->labelsPosition(), QCategoryAxis::AxisLabelsPositionCenter);
Marek Rosa
Fixes and tests to Interval axis
 r1708
Marek Rosa
Fixed range handling in categoryAxis
 r1846 m_chart->setAxisX(m_categoryaxis, m_series);
Marek Rosa
Fixes and tests to Interval axis
 r1708 m_view->show();
QTest::qWaitForWindowShown(m_view);
Marek Rosa
Replaced qFuzzyIsNull with qFuzzyCompare. Once qchart test case still uses qFuzzyIsNull becasue it started failing when qFuzzyCompare was used
 r2242 QVERIFY(!qFuzzyCompare(m_categoryaxis->max(), 0));
QVERIFY(!qFuzzyCompare(m_categoryaxis->min(), 0));
Marek Rosa
Fixes and tests to Interval axis
 r1708 }
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::max_raw_data()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
QTest::addColumn<qreal>("max");
Marek Rosa
Updated documentation and tests on arm
 r1822 QTest::newRow("1.0") << (qreal)1.0;
QTest::newRow("50.0") << (qreal)50.0;
QTest::newRow("101.0") << (qreal)101.0;
Marek Rosa
Fixes and tests to Interval axis
 r1708 }
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::max_raw()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
QFETCH(qreal, max);
Marek Rosa
Fixed range handling in categoryAxis
 r1846 QSignalSpy spy0(m_categoryaxis, SIGNAL(maxChanged(qreal)));
QSignalSpy spy1(m_categoryaxis, SIGNAL(minChanged(qreal)));
Jani Honkonen
normalize signal/slot signatures
 r2110 QSignalSpy spy2(m_categoryaxis, SIGNAL(rangeChanged(qreal,qreal)));
Marek Rosa
Fixes and tests to Interval axis
 r1708
Marek Rosa
Fixed range handling in categoryAxis
 r1846 m_categoryaxis->setMax(max);
Marek Rosa
Replaced qFuzzyIsNull with qFuzzyCompare. Once qchart test case still uses qFuzzyIsNull becasue it started failing when qFuzzyCompare was used
 r2242 QVERIFY2(qFuzzyCompare(m_categoryaxis->max(), max), "Not equal");
Marek Rosa
Fixes and tests to Interval axis
 r1708
QCOMPARE(spy0.count(), 1);
QCOMPARE(spy1.count(), 0);
QCOMPARE(spy2.count(), 1);
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::max_data()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
max_raw_data();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::max()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
Marek Rosa
Fixed range handling in categoryAxis
 r1846 m_chart->setAxisX(m_categoryaxis, m_series);
Marek Rosa
Fixes and tests to Interval axis
 r1708 m_view->show();
QTest::qWaitForWindowShown(m_view);
max_raw();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::max_animation_data()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
max_data();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::max_animation()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
m_chart->setAnimationOptions(QChart::GridAxisAnimations);
max();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::min_raw_data()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
QTest::addColumn<qreal>("min");
Marek Rosa
Fix to QCategoryAxis tests
 r1957 QTest::newRow("-1.0") << (qreal)-1.0;
QTest::newRow("-50.0") << (qreal)-50.0;
QTest::newRow("-101.0") << (qreal)-101.0;
Marek Rosa
Fixes and tests to Interval axis
 r1708 }
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::min_raw()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
QFETCH(qreal, min);
Marek Rosa
Fixed range handling in categoryAxis
 r1846 QSignalSpy spy0(m_categoryaxis, SIGNAL(maxChanged(qreal)));
QSignalSpy spy1(m_categoryaxis, SIGNAL(minChanged(qreal)));
Jani Honkonen
normalize signal/slot signatures
 r2110 QSignalSpy spy2(m_categoryaxis, SIGNAL(rangeChanged(qreal,qreal)));
Marek Rosa
Fixes and tests to Interval axis
 r1708
Marek Rosa
Fixed range handling in categoryAxis
 r1846 m_categoryaxis->setMin(min);
Marek Rosa
Replaced qFuzzyIsNull with qFuzzyCompare. Once qchart test case still uses qFuzzyIsNull becasue it started failing when qFuzzyCompare was used
 r2242 QVERIFY2(qFuzzyCompare(m_categoryaxis->min(), min), "Not equal");
Marek Rosa
Fixes and tests to Interval axis
 r1708
QCOMPARE(spy0.count(), 0);
QCOMPARE(spy1.count(), 1);
QCOMPARE(spy2.count(), 1);
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::min_data()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
min_raw_data();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::min()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
Marek Rosa
Fixed range handling in categoryAxis
 r1846 m_chart->setAxisX(m_categoryaxis, m_series);
Marek Rosa
Fixes and tests to Interval axis
 r1708 m_view->show();
QTest::qWaitForWindowShown(m_view);
min_raw();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::min_animation_data()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
min_data();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::min_animation()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
m_chart->setAnimationOptions(QChart::GridAxisAnimations);
min();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::range_raw_data()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
QTest::addColumn<qreal>("min");
QTest::addColumn<qreal>("max");
Marek Rosa
Fix to QCategoryAxis tests
 r1957 QTest::newRow("1.0 - 101.0") << (qreal)-1.0 << (qreal)101.0;
QTest::newRow("25.0 - 75.0") << (qreal)25.0 << (qreal)75.0;
QTest::newRow("101.0") << (qreal)40.0 << (qreal)60.0;
QTest::newRow("-35.0 - 0.0") << (qreal)-35.0 << (qreal)10.0;
QTest::newRow("-35.0 - 0.0") << (qreal)-35.0 << (qreal)-15.0;
QTest::newRow("0.0 - 0.0") << (qreal)-0.1 << (qreal)0.1;
Marek Rosa
Fixes and tests to Interval axis
 r1708 }
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::range_raw()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
QFETCH(qreal, min);
QFETCH(qreal, max);
Marek Rosa
Fixed range handling in categoryAxis
 r1846 QSignalSpy spy0(m_categoryaxis, SIGNAL(maxChanged(qreal)));
QSignalSpy spy1(m_categoryaxis, SIGNAL(minChanged(qreal)));
Jani Honkonen
normalize signal/slot signatures
 r2110 QSignalSpy spy2(m_categoryaxis, SIGNAL(rangeChanged(qreal,qreal)));
Marek Rosa
Fixes and tests to Interval axis
 r1708
Marek Rosa
Fixed range handling in categoryAxis
 r1846 m_categoryaxis->setRange(min, max);
Marek Rosa
Replaced qFuzzyIsNull with qFuzzyCompare. Once qchart test case still uses qFuzzyIsNull becasue it started failing when qFuzzyCompare was used
 r2242 QVERIFY2(qFuzzyCompare(m_categoryaxis->min(), min), "Min not equal");
QVERIFY2(qFuzzyCompare(m_categoryaxis->max(), max), "Max not equal");
Marek Rosa
Fixes and tests to Interval axis
 r1708
QCOMPARE(spy0.count(), 1);
QCOMPARE(spy1.count(), 1);
QCOMPARE(spy2.count(), 1);
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::range_data()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
range_raw_data();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::range()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
Marek Rosa
Fixed range handling in categoryAxis
 r1846 m_chart->setAxisX(m_categoryaxis, m_series);
Marek Rosa
Fixes and tests to Interval axis
 r1708 m_view->show();
QTest::qWaitForWindowShown(m_view);
range_raw();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::range_animation_data()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
range_data();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::range_animation()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
m_chart->setAnimationOptions(QChart::GridAxisAnimations);
range();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::interval_data()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
//
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 void tst_QCategoryAxis::interval()
Marek Rosa
Fixes and tests to Interval axis
 r1708 {
// append one correct interval
Marek Rosa
Fixed range handling in categoryAxis
 r1846 m_categoryaxis->append("first", (qreal)45);
Marek Rosa
QCategoryAxis: renamed some functions according to review
 r1847 QCOMPARE(m_categoryaxis->startValue("first"), (qreal)0);
QCOMPARE(m_categoryaxis->endValue("first"), (qreal)45);
Marek Rosa
Fixes and tests to Interval axis
 r1708
// append one more correct interval
Marek Rosa
Fixed range handling in categoryAxis
 r1846 m_categoryaxis->append("second", (qreal)75);
Marek Rosa
QCategoryAxis: renamed some functions according to review
 r1847 QCOMPARE(m_categoryaxis->startValue("second"), (qreal)45);
QCOMPARE(m_categoryaxis->endValue("second"), (qreal)75);
Marek Rosa
Fixes and tests to Interval axis
 r1708
// append one incorrect interval
Marek Rosa
Fixed range handling in categoryAxis
 r1846 m_categoryaxis->append("third", (qreal)15);
QCOMPARE(m_categoryaxis->count(), 2);
Marek Rosa
QCategoryAxis: renamed some functions according to review
 r1847 QCOMPARE(m_categoryaxis->endValue(m_categoryaxis->categoriesLabels().last()), (qreal)75);
Marek Rosa
Fixes and tests to Interval axis
 r1708 // QCOMPARE(intervalMax("first"), (qreal)75);
// append one more correct interval
Marek Rosa
Fixed range handling in categoryAxis
 r1846 m_categoryaxis->append("third", (qreal)100);
QCOMPARE(m_categoryaxis->count(), 3);
Marek Rosa
QCategoryAxis: renamed some functions according to review
 r1847 QCOMPARE(m_categoryaxis->startValue("third"), (qreal)75);
QCOMPARE(m_categoryaxis->endValue("third"), (qreal)100);
Marek Rosa
Fixes and tests to Interval axis
 r1708
// remove one interval
Marek Rosa
Fixed range handling in categoryAxis
 r1846 m_categoryaxis->remove("first");
QCOMPARE(m_categoryaxis->count(), 2);
Marek Rosa
QCategoryAxis: renamed some functions according to review
 r1847 QCOMPARE(m_categoryaxis->startValue("second"), (qreal)0); // second interval should extend to firstInterval minimum
QCOMPARE(m_categoryaxis->endValue("second"), (qreal)75);
Marek Rosa
Fixes and tests to Interval axis
 r1708
Marek Rosa
Embedded compile fix
 r1779 // remove one interval
Marek Rosa
Fixed range handling in categoryAxis
 r1846 m_categoryaxis->replaceLabel("second", "replaced");
QCOMPARE(m_categoryaxis->count(), 2);
Marek Rosa
QCategoryAxis: renamed some functions according to review
 r1847 QCOMPARE(m_categoryaxis->startValue("replaced"), (qreal)0); // second interval should extend to firstInterval minimum
QCOMPARE(m_categoryaxis->endValue("replaced"), (qreal)75);
Marek Rosa
Fixes and tests to Interval axis
 r1708 }
Titta Heikkala
Added possibility to set labels position for QCategoryAxis...
 r2780 void tst_QCategoryAxis::labels_position()
{
QSignalSpy spy(m_categoryaxis,
SIGNAL(labelsPositionChanged(QCategoryAxis::AxisLabelsPosition)));
m_categoryaxis->setLabelsPosition(QCategoryAxis::AxisLabelsPositionOnValue);
QCOMPARE(m_categoryaxis->labelsPosition(), QCategoryAxis::AxisLabelsPositionOnValue);
QCOMPARE(spy.count(), 1);
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
 r1816 QTEST_MAIN(tst_QCategoryAxis)
Marek Rosa
Renamed QCategoryAxis related files
 r1817 #include "tst_qcategoryaxis.moc"
Marek Rosa
Fixes and tests to Interval axis
 r1708