summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--demos/piechartcustomization/brushtool.cpp30
-rw-r--r--examples/barmodelmapper/tablewidget.cpp5
-rw-r--r--examples/modeldata/tablewidget.cpp5
-rw-r--r--src/animations/abstractbaranimation.cpp2
-rw-r--r--src/animations/axisanimation.cpp6
-rw-r--r--src/animations/baranimation.cpp4
-rw-r--r--src/animations/horizontalbaranimation.cpp4
-rw-r--r--src/animations/horizontalpercentbaranimation.cpp4
-rw-r--r--src/animations/horizontalstackedbaranimation.cpp4
-rw-r--r--src/animations/percentbaranimation.cpp4
-rw-r--r--src/animations/piesliceanimation.cpp6
-rw-r--r--src/animations/splineanimation.cpp6
-rw-r--r--src/animations/stackedbaranimation.cpp4
-rw-r--r--src/animations/xyanimation.cpp6
-rw-r--r--src/axis/chartaxis.cpp6
-rw-r--r--src/legend/legendmarkeritem.cpp2
-rw-r--r--tests/auto/inc/tst_definitions.h11
-rw-r--r--tests/auto/qbarset/tst_qbarset.cpp1
-rw-r--r--tests/auto/qchart/tst_qchart.cpp207
19 files changed, 170 insertions, 147 deletions
diff --git a/demos/piechartcustomization/brushtool.cpp b/demos/piechartcustomization/brushtool.cpp
index 5f83ef2f..f3d4d236 100644
--- a/demos/piechartcustomization/brushtool.cpp
+++ b/demos/piechartcustomization/brushtool.cpp
@@ -31,21 +31,21 @@ BrushTool::BrushTool(QString title, QWidget *parent)
m_colorButton = new QPushButton();
m_styleCombo = new QComboBox();
- m_styleCombo->addItem("Nobrush", Qt::NoBrush);
- m_styleCombo->addItem("Solidpattern", Qt::SolidPattern);
- m_styleCombo->addItem("Dense1pattern", Qt::Dense1Pattern);
- m_styleCombo->addItem("Dense2attern", Qt::Dense2Pattern);
- m_styleCombo->addItem("Dense3Pattern", Qt::Dense3Pattern);
- m_styleCombo->addItem("Dense4Pattern", Qt::Dense4Pattern);
- m_styleCombo->addItem("Dense5Pattern", Qt::Dense5Pattern);
- m_styleCombo->addItem("Dense6Pattern", Qt::Dense6Pattern);
- m_styleCombo->addItem("Dense7Pattern", Qt::Dense7Pattern);
- m_styleCombo->addItem("HorPattern", Qt::HorPattern);
- m_styleCombo->addItem("VerPattern", Qt::VerPattern);
- m_styleCombo->addItem("CrossPattern", Qt::CrossPattern);
- m_styleCombo->addItem("BDiagPattern", Qt::BDiagPattern);
- m_styleCombo->addItem("FDiagPattern", Qt::FDiagPattern);
- m_styleCombo->addItem("DiagCrossPattern", Qt::DiagCrossPattern);
+ m_styleCombo->addItem("Nobrush", (int) Qt::NoBrush);
+ m_styleCombo->addItem("Solidpattern", (int) Qt::SolidPattern);
+ m_styleCombo->addItem("Dense1pattern", (int) Qt::Dense1Pattern);
+ m_styleCombo->addItem("Dense2attern", (int) Qt::Dense2Pattern);
+ m_styleCombo->addItem("Dense3Pattern", (int) Qt::Dense3Pattern);
+ m_styleCombo->addItem("Dense4Pattern", (int) Qt::Dense4Pattern);
+ m_styleCombo->addItem("Dense5Pattern", (int) Qt::Dense5Pattern);
+ m_styleCombo->addItem("Dense6Pattern", (int) Qt::Dense6Pattern);
+ m_styleCombo->addItem("Dense7Pattern", (int) Qt::Dense7Pattern);
+ m_styleCombo->addItem("HorPattern", (int) Qt::HorPattern);
+ m_styleCombo->addItem("VerPattern", (int) Qt::VerPattern);
+ m_styleCombo->addItem("CrossPattern", (int) Qt::CrossPattern);
+ m_styleCombo->addItem("BDiagPattern", (int) Qt::BDiagPattern);
+ m_styleCombo->addItem("FDiagPattern", (int) Qt::FDiagPattern);
+ m_styleCombo->addItem("DiagCrossPattern", (int) Qt::DiagCrossPattern);
QFormLayout *layout = new QFormLayout();
layout->addRow("Color", m_colorButton);
diff --git a/examples/barmodelmapper/tablewidget.cpp b/examples/barmodelmapper/tablewidget.cpp
index 3bedf711..58868b18 100644
--- a/examples/barmodelmapper/tablewidget.cpp
+++ b/examples/barmodelmapper/tablewidget.cpp
@@ -48,8 +48,13 @@ TableWidget::TableWidget(QWidget *parent)
QTableView *tableView = new QTableView;
tableView->setModel(model);
tableView->setMinimumWidth(300);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+ tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+ tableView->verticalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+#else
tableView->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
tableView->verticalHeader()->setResizeMode(QHeaderView::Stretch);
+#endif
//! [2]
//! [3]
diff --git a/examples/modeldata/tablewidget.cpp b/examples/modeldata/tablewidget.cpp
index d7857bc0..6a1b2ff9 100644
--- a/examples/modeldata/tablewidget.cpp
+++ b/examples/modeldata/tablewidget.cpp
@@ -43,8 +43,13 @@ TableWidget::TableWidget(QWidget *parent)
// create table view and add model to it
QTableView *tableView = new QTableView;
tableView->setModel(model);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+ tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+ tableView->verticalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+#else
tableView->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
tableView->verticalHeader()->setResizeMode(QHeaderView::Stretch);
+#endif
//! [2]
//! [3]
diff --git a/src/animations/abstractbaranimation.cpp b/src/animations/abstractbaranimation.cpp
index 2058941e..6635e3d9 100644
--- a/src/animations/abstractbaranimation.cpp
+++ b/src/animations/abstractbaranimation.cpp
@@ -50,7 +50,7 @@ QVariant AbstractBarAnimation::interpolated(const QVariant &from, const QVariant
void AbstractBarAnimation::updateCurrentValue(const QVariant &value)
{
- QVector<QRectF> layout = qVariantValue<QVector<QRectF> >(value);
+ QVector<QRectF> layout = qvariant_cast<QVector<QRectF> >(value);
m_item->setLayout(layout);
}
diff --git a/src/animations/axisanimation.cpp b/src/animations/axisanimation.cpp
index b36a4f6e..9ac5fc21 100644
--- a/src/animations/axisanimation.cpp
+++ b/src/animations/axisanimation.cpp
@@ -113,8 +113,8 @@ void AxisAnimation::setValues(QVector<qreal> &oldLayout, QVector<qreal> &newLayo
QVariant AxisAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
{
- QVector<qreal> startVector = qVariantValue<QVector<qreal> >(start);
- QVector<qreal> endVecotr = qVariantValue<QVector<qreal> >(end);
+ QVector<qreal> startVector = qvariant_cast<QVector<qreal> >(start);
+ QVector<qreal> endVecotr = qvariant_cast<QVector<qreal> >(end);
QVector<qreal> result;
Q_ASSERT(startVector.count() == endVecotr.count()) ;
@@ -130,7 +130,7 @@ QVariant AxisAnimation::interpolated(const QVariant &start, const QVariant &end,
void AxisAnimation::updateCurrentValue(const QVariant &value)
{
if (state() != QAbstractAnimation::Stopped) { //workaround
- QVector<qreal> vector = qVariantValue<QVector<qreal> >(value);
+ QVector<qreal> vector = qvariant_cast<QVector<qreal> >(value);
Q_ASSERT(vector.count() != 0);
m_axis->setLayout(vector);
m_axis->updateGeometry();
diff --git a/src/animations/baranimation.cpp b/src/animations/baranimation.cpp
index 0e334dae..48b3b064 100644
--- a/src/animations/baranimation.cpp
+++ b/src/animations/baranimation.cpp
@@ -38,8 +38,8 @@ BarAnimation::~BarAnimation()
QVariant BarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
{
- QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
- QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
+ QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
+ QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
QVector<QRectF> result;
Q_ASSERT(startVector.count() == endVector.count());
diff --git a/src/animations/horizontalbaranimation.cpp b/src/animations/horizontalbaranimation.cpp
index 375dc2c1..39dd9c38 100644
--- a/src/animations/horizontalbaranimation.cpp
+++ b/src/animations/horizontalbaranimation.cpp
@@ -39,8 +39,8 @@ HorizontalBarAnimation::~HorizontalBarAnimation()
QVariant HorizontalBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
{
- QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
- QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
+ QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
+ QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
QVector<QRectF> result;
Q_ASSERT(startVector.count() == endVector.count());
diff --git a/src/animations/horizontalpercentbaranimation.cpp b/src/animations/horizontalpercentbaranimation.cpp
index 34e39423..13dfa097 100644
--- a/src/animations/horizontalpercentbaranimation.cpp
+++ b/src/animations/horizontalpercentbaranimation.cpp
@@ -39,8 +39,8 @@ HorizontalPercentBarAnimation::~HorizontalPercentBarAnimation()
QVariant HorizontalPercentBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
{
- QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
- QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
+ QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
+ QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
QVector<QRectF> result;
Q_ASSERT(startVector.count() == endVector.count());
diff --git a/src/animations/horizontalstackedbaranimation.cpp b/src/animations/horizontalstackedbaranimation.cpp
index 83593939..5279c0fe 100644
--- a/src/animations/horizontalstackedbaranimation.cpp
+++ b/src/animations/horizontalstackedbaranimation.cpp
@@ -39,8 +39,8 @@ HorizontalStackedBarAnimation::~HorizontalStackedBarAnimation()
QVariant HorizontalStackedBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
{
- QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
- QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
+ QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
+ QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
QVector<QRectF> result;
Q_ASSERT(startVector.count() == endVector.count());
diff --git a/src/animations/percentbaranimation.cpp b/src/animations/percentbaranimation.cpp
index e0ef87c6..ea09d907 100644
--- a/src/animations/percentbaranimation.cpp
+++ b/src/animations/percentbaranimation.cpp
@@ -39,8 +39,8 @@ PercentBarAnimation::~PercentBarAnimation()
QVariant PercentBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
{
- QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
- QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
+ QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
+ QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
QVector<QRectF> result;
Q_ASSERT(startVector.count() == endVector.count());
diff --git a/src/animations/piesliceanimation.cpp b/src/animations/piesliceanimation.cpp
index 03ef6dc9..62713227 100644
--- a/src/animations/piesliceanimation.cpp
+++ b/src/animations/piesliceanimation.cpp
@@ -99,8 +99,8 @@ PieSliceData PieSliceAnimation::currentSliceValue()
QVariant PieSliceAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
{
- PieSliceData startValue = qVariantValue<PieSliceData>(start);
- PieSliceData endValue = qVariantValue<PieSliceData>(end);
+ PieSliceData startValue = qvariant_cast<PieSliceData>(start);
+ PieSliceData endValue = qvariant_cast<PieSliceData>(end);
PieSliceData result;
result = endValue;
@@ -118,7 +118,7 @@ QVariant PieSliceAnimation::interpolated(const QVariant &start, const QVariant &
void PieSliceAnimation::updateCurrentValue(const QVariant &value)
{
if (state() != QAbstractAnimation::Stopped) { //workaround
- m_currentValue = qVariantValue<PieSliceData>(value);
+ m_currentValue = qvariant_cast<PieSliceData>(value);
m_sliceItem->setLayout(m_currentValue);
}
}
diff --git a/src/animations/splineanimation.cpp b/src/animations/splineanimation.cpp
index 9ef0d988..1a6936c6 100644
--- a/src/animations/splineanimation.cpp
+++ b/src/animations/splineanimation.cpp
@@ -120,8 +120,8 @@ void SplineAnimation::setup(QVector<QPointF> &oldPoints, QVector<QPointF> &newPo
QVariant SplineAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
{
- SplineVector startPair = qVariantValue< SplineVector >(start);
- SplineVector endPair = qVariantValue< SplineVector >(end);
+ SplineVector startPair = qvariant_cast< SplineVector >(start);
+ SplineVector endPair = qvariant_cast< SplineVector >(end);
SplineVector result;
switch (animationType()) {
@@ -170,7 +170,7 @@ QVariant SplineAnimation::interpolated(const QVariant &start, const QVariant &en
void SplineAnimation::updateCurrentValue(const QVariant &value)
{
if (state() != QAbstractAnimation::Stopped && m_valid) { //workaround
- QPair<QVector<QPointF >, QVector<QPointF > > pair = qVariantValue< QPair< QVector<QPointF>, QVector<QPointF> > >(value);
+ QPair<QVector<QPointF >, QVector<QPointF > > pair = qvariant_cast< QPair< QVector<QPointF>, QVector<QPointF> > >(value);
m_item->setGeometryPoints(pair.first);
m_item->setControlGeometryPoints(pair.second);
m_item->updateGeometry();
diff --git a/src/animations/stackedbaranimation.cpp b/src/animations/stackedbaranimation.cpp
index 45603328..1d9b9e65 100644
--- a/src/animations/stackedbaranimation.cpp
+++ b/src/animations/stackedbaranimation.cpp
@@ -38,8 +38,8 @@ StackedBarAnimation::~StackedBarAnimation()
QVariant StackedBarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
{
- QVector<QRectF> startVector = qVariantValue<QVector<QRectF> >(from);
- QVector<QRectF> endVector = qVariantValue<QVector<QRectF> >(to);
+ QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
+ QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
QVector<QRectF> result;
Q_ASSERT(startVector.count() == endVector.count());
diff --git a/src/animations/xyanimation.cpp b/src/animations/xyanimation.cpp
index 8541cfff..43307479 100644
--- a/src/animations/xyanimation.cpp
+++ b/src/animations/xyanimation.cpp
@@ -88,8 +88,8 @@ void XYAnimation::setup(const QVector<QPointF> &oldPoints, const QVector<QPointF
QVariant XYAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
{
- QVector<QPointF> startVector = qVariantValue<QVector<QPointF> >(start);
- QVector<QPointF> endVector = qVariantValue<QVector<QPointF> >(end);
+ QVector<QPointF> startVector = qvariant_cast<QVector<QPointF> >(start);
+ QVector<QPointF> endVector = qvariant_cast<QVector<QPointF> >(end);
QVector<QPointF> result;
switch (m_type) {
@@ -125,7 +125,7 @@ void XYAnimation::updateCurrentValue(const QVariant &value)
{
if (state() != QAbstractAnimation::Stopped) { //workaround
- QVector<QPointF> vector = qVariantValue<QVector<QPointF> >(value);
+ QVector<QPointF> vector = qvariant_cast<QVector<QPointF> >(value);
m_item->setGeometryPoints(vector);
m_item->updateGeometry();
m_item->setDirty(true);
diff --git a/src/axis/chartaxis.cpp b/src/axis/chartaxis.cpp
index 290ddb45..54290523 100644
--- a/src/axis/chartaxis.cpp
+++ b/src/axis/chartaxis.cpp
@@ -78,10 +78,10 @@ void ChartAxis::setLayout(QVector<qreal> &layout)
void ChartAxis::createItems(int count)
{
- if (m_arrow->children().size() == 0)
+ if (m_arrow->childItems().size() == 0)
m_arrow->addToGroup(new AxisItem(this, presenter()->rootItem()));
- if (m_intervalAxis && m_grid->children().size() == 0) {
+ if (m_intervalAxis && m_grid->childItems().size() == 0) {
for (int i = 0 ; i < 2 ; i ++)
m_grid->addToGroup(new QGraphicsLineItem(presenter()->rootItem()));
}
@@ -440,7 +440,7 @@ QStringList ChartAxis::createValueLabels(int ticks) const
labels << QString::number(value, 'f', n);
}
} else {
- QByteArray array = format.toAscii();
+ QByteArray array = format.toLatin1();
for (int i = 0; i < ticks; i++) {
qreal value = m_min + (i * (m_max - m_min) / (ticks - 1));
labels << QString().sprintf(array, value);
diff --git a/src/legend/legendmarkeritem.cpp b/src/legend/legendmarkeritem.cpp
index 5a5460e7..7ada923c 100644
--- a/src/legend/legendmarkeritem.cpp
+++ b/src/legend/legendmarkeritem.cpp
@@ -43,7 +43,7 @@ LegendMarkerItem::LegendMarkerItem(QLegendMarkerPrivate *marker, QGraphicsObject
m_pressPos(0, 0)
{
m_rectItem->setRect(m_markerRect);
- setAcceptsHoverEvents(true);
+ setAcceptHoverEvents(true);
}
LegendMarkerItem::~LegendMarkerItem()
diff --git a/tests/auto/inc/tst_definitions.h b/tests/auto/inc/tst_definitions.h
index 5adb93c3..08524db1 100644
--- a/tests/auto/inc/tst_definitions.h
+++ b/tests/auto/inc/tst_definitions.h
@@ -24,6 +24,17 @@
#include <QtTest/QtTest>
#include <QPushButton>
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+namespace QTest
+{
+ // This was deprecated in Qt5. This is a small hack for the sake of compatibility.
+ inline static bool qWaitForWindowShown(QWidget *window)
+ {
+ return QTest::qWaitForWindowExposed(window);
+ }
+}
+#endif
+
#define TRY_COMPARE(actual, expected) { \
do { \
const int timeout(1000); \
diff --git a/tests/auto/qbarset/tst_qbarset.cpp b/tests/auto/qbarset/tst_qbarset.cpp
index 9e049a2c..f470df34 100644
--- a/tests/auto/qbarset/tst_qbarset.cpp
+++ b/tests/auto/qbarset/tst_qbarset.cpp
@@ -22,6 +22,7 @@
#include <qbarset.h>
#include <qbarseries.h>
#include <qchartview.h>
+#include "tst_definitions.h"
QTCOMMERCIALCHART_USE_NAMESPACE
diff --git a/tests/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp
index 5d53fdeb..4c6f5bc6 100644
--- a/tests/auto/qchart/tst_qchart.cpp
+++ b/tests/auto/qchart/tst_qchart.cpp
@@ -31,6 +31,7 @@
#include <qstackedbarseries.h>
#include <qvalueaxis.h>
#include <qbarcategoryaxis.h>
+#include "tst_definitions.h"
QTCOMMERCIALCHART_USE_NAMESPACE
@@ -466,10 +467,10 @@ void tst_QChart::removeSeries()
void tst_QChart::scroll_right_data()
{
- QTest::addColumn<QAbstractSeries *>("series");
+ QTest::addColumn<QAbstractSeries *>("series");
- QLineSeries* series0 = new QLineSeries(this);
- *series0 << QPointF(0, 0) << QPointF(100, 100);
+ QLineSeries* series0 = new QLineSeries(this);
+ *series0 << QPointF(0, 0) << QPointF(100, 100);
QTest::newRow("lineSeries") << (QAbstractSeries*) series0;
@@ -490,77 +491,77 @@ void tst_QChart::scroll_right()
{
case QAbstractAxis::AxisTypeValue:{
QValueAxis* vaxis = qobject_cast<QValueAxis*>(axis);
- QVERIFY(vaxis!=0);
- qreal min = vaxis->min();
- qreal max = vaxis->max();
- QVERIFY(max>min);
- m_chart->scroll(50, 0);
- QVERIFY(min<vaxis->min());
- QVERIFY(max<vaxis->max());
- break;
- }
+ QVERIFY(vaxis!=0);
+ qreal min = vaxis->min();
+ qreal max = vaxis->max();
+ QVERIFY(max>min);
+ m_chart->scroll(50, 0);
+ QVERIFY(min<vaxis->min());
+ QVERIFY(max<vaxis->max());
+ break;
+ }
case QAbstractAxis::AxisTypeBarCategory:{
QBarCategoryAxis* caxis = qobject_cast<QBarCategoryAxis*>(axis);
- QVERIFY(caxis!=0);
- qreal min = caxis->min().toDouble();
- qreal max = caxis->max().toDouble();
- m_chart->scroll(50, 0);
- QVERIFY(min<caxis->min().toDouble());
- QVERIFY(max<caxis->max().toDouble());
- break;
- }
- default:
- qFatal("Unsupported type");
- break;
+ QVERIFY(caxis!=0);
+ qreal min = caxis->min().toDouble();
+ qreal max = caxis->max().toDouble();
+ m_chart->scroll(50, 0);
+ QVERIFY(min<caxis->min().toDouble());
+ QVERIFY(max<caxis->max().toDouble());
+ break;
+ }
+ default:
+ qFatal("Unsupported type");
+ break;
}
}
void tst_QChart::scroll_left_data()
{
- scroll_right_data();
+ scroll_right_data();
}
void tst_QChart::scroll_left()
{
- QFETCH(QAbstractSeries *, series);
- m_chart->addSeries(series);
- m_chart->createDefaultAxes();
- m_view->show();
- QTest::qWaitForWindowShown(m_view);
- QAbstractAxis * axis = m_chart->axisX();
- QVERIFY(axis!=0);
+ QFETCH(QAbstractSeries *, series);
+ m_chart->addSeries(series);
+ m_chart->createDefaultAxes();
+ m_view->show();
+ QTest::qWaitForWindowShown(m_view);
+ QAbstractAxis * axis = m_chart->axisX();
+ QVERIFY(axis!=0);
- switch(axis->type())
- {
+ switch(axis->type())
+ {
case QAbstractAxis::AxisTypeValue:{
QValueAxis* vaxis = qobject_cast<QValueAxis*>(axis);
- QVERIFY(vaxis!=0);
- qreal min = vaxis->min();
- qreal max = vaxis->max();
- m_chart->scroll(-50, 0);
- QVERIFY(min>vaxis->min());
- QVERIFY(max>vaxis->max());
- break;
- }
+ QVERIFY(vaxis!=0);
+ qreal min = vaxis->min();
+ qreal max = vaxis->max();
+ m_chart->scroll(-50, 0);
+ QVERIFY(min>vaxis->min());
+ QVERIFY(max>vaxis->max());
+ break;
+ }
case QAbstractAxis::AxisTypeBarCategory:{
QBarCategoryAxis* caxis = qobject_cast<QBarCategoryAxis*>(axis);
- QVERIFY(caxis!=0);
- qreal min = caxis->min().toDouble();
- qreal max = caxis->max().toDouble();
- m_chart->scroll(-50, 0);
- QVERIFY(min>caxis->min().toDouble());
- QVERIFY(max>caxis->max().toDouble());
- break;
- }
- default:
- qFatal("Unsupported type");
- break;
- }
+ QVERIFY(caxis!=0);
+ qreal min = caxis->min().toDouble();
+ qreal max = caxis->max().toDouble();
+ m_chart->scroll(-50, 0);
+ QVERIFY(min>caxis->min().toDouble());
+ QVERIFY(max>caxis->max().toDouble());
+ break;
+ }
+ default:
+ qFatal("Unsupported type");
+ break;
+ }
}
void tst_QChart::scroll_up_data()
{
- scroll_right_data();
+ scroll_right_data();
}
void tst_QChart::scroll_up()
@@ -577,71 +578,71 @@ void tst_QChart::scroll_up()
{
case QAbstractAxis::AxisTypeValue:{
QValueAxis* vaxis = qobject_cast<QValueAxis*>(axis);
- QVERIFY(vaxis!=0);
- qreal min = vaxis->min();
- qreal max = vaxis->max();
- m_chart->scroll(0, 50);
- QVERIFY(min<vaxis->min());
- QVERIFY(max<vaxis->max());
- break;
- }
+ QVERIFY(vaxis!=0);
+ qreal min = vaxis->min();
+ qreal max = vaxis->max();
+ m_chart->scroll(0, 50);
+ QVERIFY(min<vaxis->min());
+ QVERIFY(max<vaxis->max());
+ break;
+ }
case QAbstractAxis::AxisTypeBarCategory:{
QBarCategoryAxis* caxis = qobject_cast<QBarCategoryAxis*>(axis);
- QVERIFY(caxis!=0);
- qreal min = caxis->min().toDouble();
- qreal max = caxis->max().toDouble();
- m_chart->scroll(0, 50);
- QVERIFY(min<caxis->min().toDouble());
- QVERIFY(max<caxis->max().toDouble());
- break;
- }
- default:
- qFatal("Unsupported type");
- break;
+ QVERIFY(caxis!=0);
+ qreal min = caxis->min().toDouble();
+ qreal max = caxis->max().toDouble();
+ m_chart->scroll(0, 50);
+ QVERIFY(min<caxis->min().toDouble());
+ QVERIFY(max<caxis->max().toDouble());
+ break;
+ }
+ default:
+ qFatal("Unsupported type");
+ break;
}
}
void tst_QChart::scroll_down_data()
{
- scroll_right_data();
+ scroll_right_data();
}
void tst_QChart::scroll_down()
{
- QFETCH(QAbstractSeries *, series);
- m_chart->addSeries(series);
- m_chart->createDefaultAxes();
- m_view->show();
- QTest::qWaitForWindowShown(m_view);
- QAbstractAxis * axis = m_chart->axisY();
- QVERIFY(axis!=0);
+ QFETCH(QAbstractSeries *, series);
+ m_chart->addSeries(series);
+ m_chart->createDefaultAxes();
+ m_view->show();
+ QTest::qWaitForWindowShown(m_view);
+ QAbstractAxis * axis = m_chart->axisY();
+ QVERIFY(axis!=0);
- switch(axis->type())
- {
+ switch(axis->type())
+ {
case QAbstractAxis::AxisTypeValue:{
QValueAxis* vaxis = qobject_cast<QValueAxis*>(axis);
- QVERIFY(vaxis!=0);
- qreal min = vaxis->min();
- qreal max = vaxis->max();
- m_chart->scroll(0, -50);
- QVERIFY(min>vaxis->min());
- QVERIFY(max>vaxis->max());
- break;
- }
+ QVERIFY(vaxis!=0);
+ qreal min = vaxis->min();
+ qreal max = vaxis->max();
+ m_chart->scroll(0, -50);
+ QVERIFY(min>vaxis->min());
+ QVERIFY(max>vaxis->max());
+ break;
+ }
case QAbstractAxis::AxisTypeBarCategory:{
QBarCategoryAxis* caxis = qobject_cast<QBarCategoryAxis*>(axis);
- QVERIFY(caxis!=0);
- qreal min = caxis->min().toDouble();
- qreal max = caxis->max().toDouble();
- m_chart->scroll(0, -50);
- QVERIFY(min>caxis->min().toDouble());
- QVERIFY(max>caxis->max().toDouble());
- break;
- }
- default:
- qFatal("Unsupported type");
- break;
- }
+ QVERIFY(caxis!=0);
+ qreal min = caxis->min().toDouble();
+ qreal max = caxis->max().toDouble();
+ m_chart->scroll(0, -50);
+ QVERIFY(min>caxis->min().toDouble());
+ QVERIFY(max>caxis->max().toDouble());
+ break;
+ }
+ default:
+ qFatal("Unsupported type");
+ break;
+ }
}
void tst_QChart::theme_data()
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 13:14:18 +0000