HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1250:7fae50a1e446

Fix setTheme() docs and lineseries test

Jani Honkonen -

r1250:7fae50a1e446

parent child

Context file:

r1250:7fae50a1e446

Collapse all files

src/qchart.cpp +3 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qchart.h"
             #include "qchart_p.h"
             #include "legendscroller_p.h"
             #include "qlegend_p.h"
             #include "chartbackground_p.h"
             #include "qaxis.h"
             #include <QGraphicsScene>
             #include <QGraphicsSceneResizeEvent>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
              \enum QChart::ChartTheme
              This enum describes the theme used by the chart.
              \value ChartThemeLight The default theme
              \value ChartThemeBlueCerulean
              \value ChartThemeDark
              \value ChartThemeBrownSand
              \value ChartThemeBlueNcs
              \value ChartThemeHighContrast
              \value ChartThemeBlueIcy
              */
             /*!
              \enum QChart::AnimationOption
              For enabling/disabling animations. Defaults to NoAnimation.
              \value NoAnimation
              \value GridAxisAnimations
              \value SeriesAnimations
              \value AllAnimations
              */
             /*!
              \class QChart
              \brief QtCommercial chart API.
              QChart is a QGraphicsWidget that you can show in a QGraphicsScene. It manages the graphical
              representation of different types of series and other chart related objects like
              QAxis and QLegend. If you simply want to show a chart in a layout, you can use the
              convenience class QChartView instead of QChart.
              \sa QChartView
              */
             /*!
              Constructs a chart object which is a child of a\a parent. Parameter \a wFlags is passed to the QGraphicsWidget constructor.
              */
             QChart::QChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QGraphicsWidget(parent,wFlags),
                 d_ptr(new QChartPrivate())
             {
                 d_ptr->m_dataset = new ChartDataSet(this);
                 d_ptr->m_presenter = new ChartPresenter(this,d_ptr->m_dataset);
                 d_ptr->createConnections();
                 d_ptr->m_legend = new LegendScroller(this);
                 d_ptr->m_presenter->setTheme(QChart::ChartThemeLight, false);
             }
             /*!
              Destroys the object and it's children, like series and axis objects added to it.
              */
             QChart::~QChart()
             {
                 //delete first presenter , since this is a root of all the graphical items
                 delete d_ptr->m_presenter;
                 d_ptr->m_presenter=0;
             }
             /*!
              Adds the \a series and optional \a axisY onto the chart and takes the ownership of the objects.
              If auto scaling is enabled, re-scales the axes the series is bound to (both the x axis and
              the y axis).
              */
             void QChart::addSeries(QAbstractSeries *series, QAxis *axisY)
             {
                 Q_ASSERT(series);
                 d_ptr->m_dataset->addSeries(series, axisY);
             }
             /*!
              Removes the \a series specified in a perameter from the QChartView.
              It releses its ownership of the specified QChartSeries object.
              It does not delete the pointed QChartSeries data object
              \sa addSeries(), removeAllSeries()
              */
             void QChart::removeSeries(QAbstractSeries *series)
             {
                 Q_ASSERT(series);
                 d_ptr->m_dataset->removeSeries(series);
             }
             /*!
              Removes all the QChartSeries that have been added to the QChartView
              It also deletes the pointed QChartSeries data objects
              \sa addSeries(), removeSeries()
              */
             void QChart::removeAllSeries()
             {
                 d_ptr->m_dataset->removeAllSeries();
             }
             /*!
              Sets the \a brush that is used for painting the background of the chart area.
              */
             void QChart::setBackgroundBrush(const QBrush& brush)
             {
                 //TODO: refactor me
                 d_ptr->m_presenter->createChartBackgroundItem();
                 d_ptr->m_presenter->m_backgroundItem->setBrush(brush);
                 d_ptr->m_presenter->m_backgroundItem->update();
             }
             /*!
                 Gets the brush that is used for painting the background of the chart area.
              */
             QBrush QChart::backgroundBrush() const
             {
                 //TODO: refactor me
                 if (!d_ptr->m_presenter->m_backgroundItem) return QBrush();
                 return (d_ptr->m_presenter->m_backgroundItem)->brush();
             }
             /*!
              Sets the \a pen that is used for painting the background of the chart area.
              */
             void QChart::setBackgroundPen(const QPen& pen)
             {
                 //TODO: refactor me
                 d_ptr->m_presenter->createChartBackgroundItem();
                 d_ptr->m_presenter->m_backgroundItem->setPen(pen);
                 d_ptr->m_presenter->m_backgroundItem->update();
             }
             /*!
                 Gets the pen that is used for painting the background of the chart area.
              */
             QPen QChart::backgroundPen() const
             {
                 //TODO: refactor me
                 if (!d_ptr->m_presenter->m_backgroundItem) return QPen();
                 return d_ptr->m_presenter->m_backgroundItem->pen();
             }
             /*!
              Sets the chart \a title. The description text that is drawn above the chart.
              */
             void QChart::setTitle(const QString& title)
             {
                 //TODO: refactor me
                 d_ptr->m_presenter->createChartTitleItem();
                 d_ptr->m_presenter->m_titleItem->setText(title);
                 d_ptr->m_presenter->updateLayout();
             }
             /*!
              Returns the chart title. The description text that is drawn above the chart.
              */
             QString QChart::title() const
             {
                 //TODO: refactor me
                 if (d_ptr->m_presenter->m_titleItem)
                     return d_ptr->m_presenter->m_titleItem->text();
                 else
                     return QString();
             }
             /*!
              Sets the \a font that is used for drawing the chart description text that is rendered above the chart.
              */
             void QChart::setTitleFont(const QFont& font)
             {
                 //TODO: refactor me
                 d_ptr->m_presenter->createChartTitleItem();
                 d_ptr->m_presenter->m_titleItem->setFont(font);
                 d_ptr->m_presenter->updateLayout();
             }
             /*!
                 Gets the font that is used for drawing the chart description text that is rendered above the chart.
              */
             QFont QChart::titleFont() const
             {
                 if (d_ptr->m_presenter->m_titleItem)
                     return d_ptr->m_presenter->m_titleItem->font();
                 else
                     return QFont();
             }
             /*!
              Sets the \a brush used for rendering the title text.
              */
             void QChart::setTitleBrush(const QBrush &brush)
             {
                 //TODO: refactor me
                 d_ptr->m_presenter->createChartTitleItem();
                 d_ptr->m_presenter->m_titleItem->setBrush(brush);
                 d_ptr->m_presenter->updateLayout();
             }
             /*!
              Returns the brush used for rendering the title text.
              */
             QBrush QChart::titleBrush() const
             {
                 //TODO: refactor me
                 if (!d_ptr->m_presenter->m_titleItem) return QBrush();
                 return d_ptr->m_presenter->m_titleItem->brush();
             }
             /*!
-             Sets the \a theme used by the chart for rendering the graphical representation of the data
+             Sets the \a theme used by the chart for rendering the graphical representation of the data.
+             Note: changing the theme will overwrite all customizations (pen, brush, font, ect.) done to the series.
              \sa theme()
              */
             void QChart::setTheme(QChart::ChartTheme theme)
             {
                 d_ptr->m_presenter->setTheme(theme);
             }
             /*!
              Returns the theme enum used by the chart.
              \sa ChartTheme, setTheme()
              */
             QChart::ChartTheme QChart::theme() const
             {
                 return d_ptr->m_presenter->theme();
             }
             /*!
              Zooms in the view by a factor of 2
              */
             void QChart::zoomIn()
             {
                 d_ptr->m_presenter->zoomIn(2.0);
             }
             /*!
              Zooms in the view to a maximum level at which \a rect is still fully visible.
              */
             void QChart::zoomIn(const QRectF& rect)
             {
                 if (!rect.isValid()) return;
                 d_ptr->m_presenter->zoomIn(rect);
             }
             /*!
              Restores the view zoom level to the previous one.
              */
             void QChart::zoomOut()
             {
                 d_ptr->m_presenter->zoomOut(2.0);
             }
             /*!
              Zooms in the view by a \a factor.
              A factor over 1.0 zooms the view in and factor between 0.0 and 1.0 zooms out.
              */
             void QChart::zoom(qreal factor)
             {
                 if (qFuzzyIsNull(factor))
                     return;
                 if (qFuzzyCompare(factor, 1.0))
                     return;
                 if (factor < 0)
                     return;
                 if (factor > 1.0)
                     d_ptr->m_presenter->zoomIn(factor);
                 else
                     d_ptr->m_presenter->zoomOut(1.0 / factor);
             }
             /*!
              Returns the pointer to the x axis object of the chart
              */
             QAxis* QChart::axisX() const
             {
                 return d_ptr->m_dataset->axisX();
             }
             /*!
              Returns the pointer to the y axis object of the \a series
              If no \a series is provided then default Y axis of the chart is returned.
              */
             QAxis* QChart::axisY(QAbstractSeries *series) const
             {
                 return d_ptr->m_dataset->axisY(series);
             }
             /*!
              Returns the legend object of the chart. Ownership stays in chart.
              */
             QLegend* QChart::legend() const
             {
                 return d_ptr->m_legend;
             }
             /*!
                 Returns the rect that contains information about margins (distance between chart widget edge and axes).
                 Individual margins can be obtained by calling left, top, right, bottom on the returned rect.
              */
             QRectF QChart::margins() const
             {
                 return d_ptr->m_presenter->margins();
             }
             /*!
              Resizes and updates the chart area using the \a event data
              */
             void QChart::resizeEvent(QGraphicsSceneResizeEvent *event)
             {
                 d_ptr->m_rect = QRectF(QPoint(0,0),event->newSize());
                 QGraphicsWidget::resizeEvent(event);
                 d_ptr->m_presenter->setGeometry(d_ptr->m_rect);
             }
             /*!
              Sets animation \a options for the chart
              */
             void QChart::setAnimationOptions(AnimationOptions options)
             {
                 d_ptr->m_presenter->setAnimationOptions(options);
             }
             /*!
              Returns animation options for the chart
              */
             QChart::AnimationOptions QChart::animationOptions() const
             {
                 return d_ptr->m_presenter->animationOptions();
             }
             /*!
                 Scrolls the visible area of the chart to the left by the distance between two x axis ticks
              */
             void QChart::scrollLeft()
             {
                 d_ptr->m_presenter->scroll(-d_ptr->m_presenter->chartGeometry().width()/(axisX()->ticksCount()-1),0);
             }
             /*!
                 Scrolls the visible area of the chart to the right by the distance between two x axis ticks
              */
             void QChart::scrollRight()
             {
                 d_ptr->m_presenter->scroll(d_ptr->m_presenter->chartGeometry().width()/(axisX()->ticksCount()-1),0);
             }
             /*!
                 Scrolls the visible area of the chart up by the distance between two y axis ticks
              */
             void QChart::scrollUp()
             {
                 d_ptr->m_presenter->scroll(0,d_ptr->m_presenter->chartGeometry().width()/(axisY()->ticksCount()-1));
             }
             /*!
                 Scrolls the visible area of the chart down by the distance between two y axis ticks
              */
             void QChart::scrollDown()
             {
                 d_ptr->m_presenter->scroll(0,-d_ptr->m_presenter->chartGeometry().width()/(axisY()->ticksCount()-1));
             }
             /*!
                 Scrolls the visible area of the chart by the distance defined in the \a delta.
              */
             void QChart::scroll(const QPointF &delta)
             {
                 d_ptr->m_presenter->scroll(-delta.x(), delta.y());
             }
             /*!
                 Sets the chart background visibility state to \a visible
              */
             void QChart::setBackgroundVisible(bool visible)
             {
                 //TODO: refactor me
                 d_ptr->m_presenter->createChartBackgroundItem();
                 d_ptr->m_presenter->m_backgroundItem->setVisible(visible);
             }
             /*!
                 Returns the chart's background visibility state
              */
             bool QChart::isBackgroundVisible() const
             {
                 //TODO: refactor me
                 if (!d_ptr->m_presenter->m_backgroundItem)
                     return false;
                 return d_ptr->m_presenter->m_backgroundItem->isVisible();
             }
             /*!
                 Sets the background drop shadow effect state to \a enabled.
             */
             void QChart::setBackgroundDropShadowEnabled(bool enabled)
             {
                 d_ptr->m_presenter->createChartBackgroundItem();
                 d_ptr->m_presenter->m_backgroundItem->setDropShadowEnabled(enabled);
             }
             /*!
                 Returns true if the drop shadow effect is enabled for the chart background.
             */
             bool QChart::isBackgroundDropShadowEnabled() const
             {
                 if (!d_ptr->m_presenter->m_backgroundItem)
                     return false;
                 return d_ptr->m_presenter->m_backgroundItem->isDropShadowEnabled();
             }
             QList<QAbstractSeries*> QChart::series() const
             {
                 return d_ptr->m_dataset->series();
             }
             //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QChartPrivate::QChartPrivate():
                 m_legend(0),
                 m_dataset(0),
                 m_presenter(0)
             {
             }
             QChartPrivate::~QChartPrivate()
             {
             }
             void QChartPrivate::createConnections()
             {
                 QObject::connect(m_dataset,SIGNAL(seriesAdded(QAbstractSeries*,Domain*)),m_presenter,SLOT(handleSeriesAdded(QAbstractSeries*,Domain*)));
                 QObject::connect(m_dataset,SIGNAL(seriesRemoved(QAbstractSeries*)),m_presenter,SLOT(handleSeriesRemoved(QAbstractSeries*)));
                 QObject::connect(m_dataset,SIGNAL(axisAdded(QAxis*,Domain*)),m_presenter,SLOT(handleAxisAdded(QAxis*,Domain*)));
                 QObject::connect(m_dataset,SIGNAL(axisRemoved(QAxis*)),m_presenter,SLOT(handleAxisRemoved(QAxis*)));
             }
             #include "moc_qchart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

tests/auto/qlineseries/tst_qlineseries.cpp +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include <QtTest/QtTest>
             #include <qlineseries.h>
             #include <qxymodelmapper.h>
             #include <qchartview.h>
             #include <QStandardItemModel>
             #include <tst_definitions.h>
             Q_DECLARE_METATYPE(QList<QPointF>)
             QTCOMMERCIALCHART_USE_NAMESPACE
             class tst_QLineSeries : public QObject
             {
                 Q_OBJECT
                 public slots:
                 void initTestCase();
                 void cleanupTestCase();
                 void init();
                 void cleanup();
                 private slots:
                 void qlineseries_data();
                 void qlineseries();
                 void append_raw_data();
                 void append_raw();
                 void append_chart_data();
                 void append_chart();
                 void append_chart_animation_data();
                 void append_chart_animation();
                 void chart_append_data();
                 void chart_append();
                 void count_raw_data();
                 void count_raw();
                 void oper_data();
                 void oper();
                 void pen_data();
                 void pen();
                 void pointsVisible_raw_data();
                 void pointsVisible_raw();
                 void remove_raw_data();
                 void remove_raw();
                 void remove_chart_data();
                 void remove_chart();
                 void remove_chart_animation_data();
                 void remove_chart_animation();
                 void removeAll_raw_data();
                 void removeAll_raw();
                 void removeAll_chart_data();
                 void removeAll_chart();
                 void removeAll_chart_animation_data();
                 void removeAll_chart_animation();
                 void replace_raw_data();
                 void replace_raw();
                 void replace_chart_data();
                 void replace_chart();
                 void replace_chart_animation_data();
                 void replace_chart_animation();
                 private:
                 void append_data();
                 void count_data();
                 void pointsVisible_data();
                 private:
                 QChartView* m_view;
                 QChart* m_chart;
                 QLineSeries* m_series;
             };
             void tst_QLineSeries::initTestCase()
             {
             }
             void tst_QLineSeries::cleanupTestCase()
             {
             }
             void tst_QLineSeries::init()
             {
                 m_view = new QChartView(new QChart());
                 m_chart = m_view->chart();
                 m_series = new QLineSeries();
             }
             void tst_QLineSeries::cleanup()
             {
                 delete m_series;
                 delete m_view;
                 m_view = 0;
                 m_chart = 0;
                 m_series = 0;
             }
             void tst_QLineSeries::qlineseries_data()
             {
             }
             void tst_QLineSeries::qlineseries()
             {
                 QLineSeries series;
                 QCOMPARE(series.count(),0);
                 QCOMPARE(series.brush(), QBrush());
                 QCOMPARE(series.points(), QList<QPointF>());
                 QCOMPARE(series.pen(), QPen());
                 QCOMPARE(series.pointsVisible(), false);
                 series.append(QList<QPointF>());
                 series.append(0.0,0.0);
                 series.append(QPointF());
                 series.remove(0.0,0.0);
                 series.remove(QPointF());
                 series.removeAll();
                 series.replace(QPointF(),QPointF());
                 series.replace(0,0,0,0);
                 series.setBrush(QBrush());
             //    QCOMPARE(series.setModel((QAbstractItemModel*)0), false);
             //    series.setModelMapping(-1, -1, Qt::Orientation(0));
                 series.setPen(QPen());
                 series.setPointsVisible(false);
                 m_chart->addSeries(&series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
             }
             void tst_QLineSeries::append_data()
             {
                 QTest::addColumn< QList<QPointF> >("points");
                 QTest::newRow("0,0 1,1 2,2 3,3") << (QList<QPointF>() << QPointF(0,0) << QPointF(1,1) << QPointF(2,2) << QPointF(3,3));
                 QTest::newRow("0,0 -1,-1 -2,-2 -3,-3") << (QList<QPointF>() << QPointF(0,0) << QPointF(-1,-1) << QPointF(-2,-2) << QPointF(-3,-3));
             }
             void tst_QLineSeries::append_raw_data()
             {
                 append_data();
             }
             void tst_QLineSeries::append_raw()
             {
                 QFETCH(QList<QPointF>, points);
                 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&)));
                 m_series->append(points);
                 TRY_COMPARE(spy0.count(), 0);
                 QCOMPARE(m_series->points(), points);
             }
             void tst_QLineSeries::chart_append_data()
             {
                 append_data();
             }
             void tst_QLineSeries::chart_append()
             {
                 append_raw();
                 m_chart->addSeries(m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
             }
             void tst_QLineSeries::append_chart_data()
             {
                 append_data();
             }
             void tst_QLineSeries::append_chart()
             {
                 m_view->show();
                 m_chart->addSeries(m_series);
                 QTest::qWaitForWindowShown(m_view);
                 append_raw();
             }
             void tst_QLineSeries::append_chart_animation_data()
             {
                 append_data();
             }
             void tst_QLineSeries::append_chart_animation()
             {
                 m_chart->setAnimationOptions(QChart::AllAnimations);
                 append_chart();
             }
             void tst_QLineSeries::count_data()
             {
                 QTest::addColumn<int>("count");
                 QTest::newRow("0") << 0;
                 QTest::newRow("5") << 5;
                 QTest::newRow("10") << 5;
             }
             void tst_QLineSeries::count_raw_data()
             {
                 count_data();
             }
             void tst_QLineSeries::count_raw()
             {
                 QFETCH(int, count);
                 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&)));
                 for(int i=0 ; i< count; ++i)
                     m_series->append(i,i);
                 TRY_COMPARE(spy0.count(), 0);
                 QCOMPARE(m_series->count(), count);
             }
             void tst_QLineSeries::oper_data()
             {
                 append_data();
             }
             void tst_QLineSeries::oper()
             {
                 QFETCH(QList<QPointF>, points);
                 QLineSeries series;
                 QSignalSpy spy0(&series, SIGNAL(clicked(QPointF const&)));
                 foreach(const QPointF& point,points)
                 {
                     series<<point;
                 }
                 QCOMPARE(series.points(), points);
                 TRY_COMPARE(spy0.count(), 0);
             }
             void tst_QLineSeries::pen_data()
             {
                 QTest::addColumn<QPen>("pen");
                 QTest::newRow("null") << QPen();
                 QTest::newRow("blue") << QPen(Qt::blue);
                 QTest::newRow("black") << QPen(Qt::black);
                 QTest::newRow("red") << QPen(Qt::red);
             }
             void tst_QLineSeries::pen()
             {
                 QFETCH(QPen, pen);
                 QLineSeries series;
                 QSignalSpy spy0(&series, SIGNAL(clicked(QPointF const&)));
                 series.setPen(pen);
                 TRY_COMPARE(spy0.count(), 0);
                 QCOMPARE(series.pen(), pen);
                 m_chart->addSeries(&series);
                 if(pen!=QPen()) QCOMPARE(series.pen(), pen);
                 m_chart->setTheme(QChart::ChartThemeDark);
-                if(pen!=QPen()) QCOMPARE(series.pen(), pen);
+                QVERIFY(series.pen() != pen);
             }
             void tst_QLineSeries::pointsVisible_data()
             {
                 QTest::addColumn<bool>("pointsVisible");
                 QTest::newRow("true") << true;
                 QTest::newRow("false") << false;
             }
             void tst_QLineSeries::pointsVisible_raw_data()
             {
                 pointsVisible_data();
             }
             void tst_QLineSeries::pointsVisible_raw()
             {
                 QFETCH(bool, pointsVisible);
                 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&)));
                 m_series->setPointsVisible(pointsVisible);
                 TRY_COMPARE(spy0.count(), 0);
                 QCOMPARE(m_series->pointsVisible(), pointsVisible);
             }
             void tst_QLineSeries::remove_raw_data()
             {
                 append_data();
             }
             void tst_QLineSeries::remove_raw()
             {
                 QFETCH(QList<QPointF>, points);
                 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&)));
                 m_series->append(points);
                 TRY_COMPARE(spy0.count(), 0);
                 QCOMPARE(m_series->points(), points);
                 foreach(const QPointF& point,points)
                     m_series->remove(point);
                 TRY_COMPARE(spy0.count(), 0);
                 QCOMPARE(m_series->points().count(), 0);
             }
             void tst_QLineSeries::remove_chart_data()
             {
                 append_data();
             }
             void tst_QLineSeries::remove_chart()
             {
                 m_view->show();
                 m_chart->addSeries(m_series);
                 QTest::qWaitForWindowShown(m_view);
                 remove_raw();
             }
             void tst_QLineSeries::remove_chart_animation_data()
             {
                 append_data();
             }
             void tst_QLineSeries::remove_chart_animation()
             {
                 m_chart->setAnimationOptions(QChart::AllAnimations);
                 remove_chart();
             }
             void tst_QLineSeries::removeAll_raw_data()
             {
                 append_data();
             }
             void tst_QLineSeries::removeAll_raw()
             {
                 QFETCH(QList<QPointF>, points);
                 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&)));
                 m_series->append(points);
                 TRY_COMPARE(spy0.count(), 0);
                 QCOMPARE(m_series->points(), points);
                 m_series->removeAll();
                 TRY_COMPARE(spy0.count(), 0);
                 QCOMPARE(m_series->points().count(), 0);
             }
             void tst_QLineSeries::removeAll_chart_data()
             {
                 append_data();
             }
             void tst_QLineSeries::removeAll_chart()
             {
                 m_view->show();
                 m_chart->addSeries(m_series);
                 QTest::qWaitForWindowShown(m_view);
                 removeAll_raw();
             }
             void tst_QLineSeries::removeAll_chart_animation_data()
             {
                 append_data();
             }
             void tst_QLineSeries::removeAll_chart_animation()
             {
                 m_chart->setAnimationOptions(QChart::AllAnimations);
                 removeAll_chart();
             }
             void tst_QLineSeries::replace_raw_data()
             {
                 append_data();
             }
             void tst_QLineSeries::replace_raw()
             {
                 QFETCH(QList<QPointF>, points);
                 QSignalSpy spy0(m_series, SIGNAL(clicked(QPointF const&)));
                 m_series->append(points);
                 TRY_COMPARE(spy0.count(), 0);
                 QCOMPARE(m_series->points(), points);
                 foreach(const QPointF& point,points)
                    m_series->replace(point.x(),point.y(),point.x(),0);
                 QList<QPointF> newPoints = m_series->points();
                 QCOMPARE(newPoints.count(), points.count());
                 for(int i =0 ; i<points.count() ; ++i) {
                     QCOMPARE(points[i].x(), newPoints[i].x());
                     QCOMPARE(newPoints[i].y(), 0.0);
                 }
             }
             void tst_QLineSeries::replace_chart_data()
             {
                 append_data();
             }
             void tst_QLineSeries::replace_chart()
             {
                 m_view->show();
                 m_chart->addSeries(m_series);
                 QTest::qWaitForWindowShown(m_view);
                 replace_raw();
             }
             void tst_QLineSeries::replace_chart_animation_data()
             {
                 append_data();
             }
             void tst_QLineSeries::replace_chart_animation()
             {
                 m_chart->setAnimationOptions(QChart::AllAnimations);
                 replace_chart();
             }
             QTEST_MAIN(tst_QLineSeries)
             #include "tst_qlineseries.moc"

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages