HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r560:5b64457c513a

Adds area chart animations...

Michal Klocek -

r560:5b64457c513a

parent child

Context file:

r560:5b64457c513a

Collapse all files

examples/presenterchart/chartview.cpp +9 0

             #include <qlineseries.h>
             #include <qscatterseries.h>
             #include <qsplineseries.h>
+            #include <qareaseries.h>
             #include <QTime>
             ChartView::ChartView(QWidget* parent):QChartView(parent),
                 QPen green(Qt::green);
                 green.setWidth(3);
                 series2->setPen(green);
+                QAreaSeries* series3 = new QAreaSeries(series0);
+                QPen yellow(Qt::black);
+                yellow.setWidth(3);
+                series3->setPen(yellow);
+                series3->setBrush(Qt::yellow);
             //![1]
             //![2]
                 m_titles<<chartTitle()+": ScatterChart";
                 m_series<<series2;
                 m_titles<<chartTitle()+": SplineChart";
+                m_series<<series3;
+                m_titles<<chartTitle()+": AreaChart";
             //![3]
                 addSeries(series0);
                 setChartTitle(m_titles.at(0));

src/animations/chartanimator.cpp +6 -5

             #include "axisanimation_p.h"
             #include "xyanimation_p.h"
             #include "xychartitem_p.h"
+            #include "areachartitem_p.h"
             #include <QTimer>
             Q_DECLARE_METATYPE(QVector<QPointF>)
             void ChartAnimator::addAnimation(AxisItem* item)
             {
-                AxisAnimation* animation = static_cast<AxisAnimation*>(m_animations.value(item));
+                ChartAnimation* animation = m_animations.value(item);
                 if(!animation) {
                     animation = new AxisAnimation(item);
             void ChartAnimator::addAnimation(XYChartItem*  item)
             {
-                XYAnimation* animation = static_cast<XYAnimation*>(m_animations.value(item));
+                ChartAnimation* animation = m_animations.value(item);
                 if(!animation) {
                     animation = new XYAnimation(item);
             {
                 AxisAnimation* animation = static_cast<AxisAnimation*>(m_animations.value(item));
-                if(!animation) return;
+                Q_ASSERT(animation);
                 QVector<qreal> oldLayout = item->layout();
                 XYAnimation* animation = static_cast<XYAnimation*>(m_animations.value(item));
-                if(!animation) return;
+                Q_ASSERT(animation);
                 QVector<QPointF> oldPoints = item->points();
             {
                 XYAnimation* animation = static_cast<XYAnimation*>(m_animations.value(item));
-                if(!animation) return;
+                Q_ASSERT(animation);
                 animation->setDuration(duration);
                 animation->setAnimationType(XYAnimation::MoveDownAnimation);

src/animations/chartanimator_p.h +1 0

             class ChartItem;
             class XYChartItem;
             class AxisItem;
+            class AreaChartItem;
             class ChartAnimator : public QObject {

src/areachart/areachartitem_p.h +3 0

                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QPainterPath shape() const;
+                LineChartItem* upperLineItem() const { return m_upper ;}
+                LineChartItem* lowerLineItem() const { return m_lower ;}
                 void setPointsVisible(bool visible);
                 void updatePath();
             public slots:

src/chartpresenter.cpp +12 -2

                     QAreaSeries* areaSeries = static_cast<QAreaSeries*>(series);
                     AreaChartItem* area = new AreaChartItem(areaSeries,m_chart);
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
-                      //  m_animator->addAnimation(area);
+                       m_animator->addAnimation(area->upperLineItem());
+                       if(areaSeries->lowerSeries())  m_animator->addAnimation(area->lowerLineItem());
                     }
                     m_chartTheme->decorate(area, areaSeries, m_dataset->seriesIndex(series));
                     QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),area,SLOT(handleGeometryChanged(const QRectF&)));
             {
                 ChartItem* item = m_chartItems.take(series);
                 Q_ASSERT(item);
-                if(m_animator) m_animator->removeAnimation(item);
+                if(m_animator) {
+                    //small hack to handle area animations
+                    if(series->type()==QSeries::SeriesTypeArea){
+                         QAreaSeries* areaSeries = static_cast<QAreaSeries*>(series);
+                         AreaChartItem* area = static_cast<AreaChartItem*>(item);
+                         m_animator->removeAnimation(area->upperLineItem());
+                         if(areaSeries->lowerSeries())  m_animator->addAnimation(area->lowerLineItem());
+                    }else
+                    m_animator->removeAnimation(item);
+                }
                 delete item;
             }

src/charttheme.cpp +3 -6

                 QPen pen;
                 QBrush brush;
-                if (pen != series->pen()){
+                if (pen == series->pen()){
                     pen.setColor(colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 1.0));
                     pen.setWidthF(2);
                     series->setPen(pen);
                 }
-                if (brush != series->brush()) {
+                if (brush == series->brush()) {
                    QBrush brush(m_seriesColors.at(index % m_seriesColors.size()));
                    series->setBrush(brush);
                 }
             void ChartTheme::decorate(LineChartItem* item, QLineSeries* series,int index)
             {
                 QPen pen;
-                if(pen != series->pen()){
+                if(pen == series->pen()){
-                    series->setPen(series->pen());
-                    return;
-                }else{
                     pen.setColor(m_seriesColors.at(index%m_seriesColors.size()));
                     pen.setWidthF(2);
                     series->setPen(pen);

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