HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1824:4fa1dedc5aa7

fix to baranimations leaving crap on screen with negative bars

sauimone -

r1824:4fa1dedc5aa7

parent child

Context file:

r1824:4fa1dedc5aa7

Collapse all files

examples/populationpyramid/main.cpp +1 0

             /****************************************************************************
             **
             ** 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 <QApplication>
             #include <QMainWindow>
             #include <QChartView>
             #include <QBarSeries>
             #include <QBarSet>
             #include <QLegend>
             #include <QBarCategoryAxis>
             #include <QHorizontalBarSeries>
             QTCOMMERCIALCHART_USE_NAMESPACE
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
             //![1]
                 QBarSet *male = new QBarSet("Male");
                 QBarSet *female = new QBarSet("Female");
                 // From wikipedia
                 *male << -145596 << -149894 << -167327 << -164118 << -170710 << -169408 << -158395 << -176975 << -191803 << -191198 << -196815
                       << -207826 << -145517 << -113204 << -90986 << -70909 << -40013 << -15887 << -5769;
                 *female << 139353 << 143522 << 161212 << 156824 << 163226 << 161766 << 150595 << 170779 << 185979 << 187897 << 196158
                         << 209062 << 152460 << 129230 << 114778 << 109611 << 83845 << 44605 << 22328;
             //![1]
             //![2]
                 QHorizontalBarSeries *series = new QHorizontalBarSeries();
                 series->append(male);
                 series->append(female);
                 series->setBarWidth(0.5);
                 series->setGrouping(false);
             //![2]
             //![3]
                 QChart* chart = new QChart();
                 chart->addSeries(series);
                 chart->setTitle("Population of Finland in 2005 by age group");
                 chart->createDefaultAxes();
                 chart->setAnimationOptions(QChart::SeriesAnimations);
             //![3]
             //![4]
                 QStringList categories;
                 categories << "0-4" << "5-9" << "10-14" << "15-19" << "20-24" << "25-29" << "30-34" << "35-39" << "40-44" << "45-49"
                            << "50-54" << "55-59" << "60-64" << "65-69" << "70-74" << "75-79" << "80-84" << "85-89" << "90-";
                 QBarCategoryAxis* axis = new QBarCategoryAxis();
                 axis->append(categories);
                 chart->setAxisY(axis,series);
+                chart->axisX(series)->setRange(-210000,210000);
             //![4]
             //![5]
                 chart->legend()->setVisible(true);
                 chart->legend()->setAlignment(Qt::AlignBottom);
             //![5]
             //![6]
                 QChartView* chartView = new QChartView(chart);
                 chartView->setRenderHint(QPainter::Antialiasing);
             //![6]
             //![7]
                 QMainWindow window;
                 window.setCentralWidget(chartView);
                 window.resize(400, 800);
                 window.show();
             //![7]
                 return a.exec();
             }

src/animations/baranimation.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 "baranimation_p.h"
             #include "abstractbarchartitem_p.h"
             #include <QTimer>
             Q_DECLARE_METATYPE(QVector<QRectF>)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarAnimation::BarAnimation(AbstractBarChartItem *item)
                 :AbstractBarAnimation(item)
             {
             }
             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> result;
                 Q_ASSERT(startVector.count() == endVector.count());
                 for(int i = 0; i < startVector.count(); i++) {
                     qreal w = endVector[i].width();
                     qreal h = startVector[i].height() + ((endVector[i].height() - startVector[i].height()) * progress);
                     qreal x = endVector[i].topLeft().x();
                     qreal y = endVector[i].topLeft().y() + endVector[i].height() - h;
                     QRectF value(x,y,w,h);
-                    result << value;
+                    result << value.normalized();
                 }
                 return qVariantFromValue(result);
             }
             #include "moc_baranimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/horizontalbaranimation.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 "horizontalbaranimation_p.h"
             #include "abstractbarchartitem_p.h"
             #include <QTimer>
             Q_DECLARE_METATYPE(QVector<QRectF>)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             HorizontalBarAnimation::HorizontalBarAnimation(AbstractBarChartItem *item) :
                 AbstractBarAnimation(item)
             {
             }
             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> result;
                 Q_ASSERT(startVector.count() == endVector.count());
                 for(int i = 0; i < startVector.count(); i++) {
                     qreal h = endVector[i].height();
                     qreal w = startVector[i].width() + ((endVector[i].width() - startVector[i].width()) * progress);
                     qreal x = endVector[i].left();
                     qreal y = endVector[i].top();
                     QRectF value(x,y,w,h);
-                    result << value;
+                    result << value.normalized();
                 }
                 return qVariantFromValue(result);
             }
             #include "moc_horizontalbaranimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/horizontalpercentbaranimation.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 "horizontalpercentbaranimation_p.h"
             #include "abstractbarchartitem_p.h"
             #include <QTimer>
             Q_DECLARE_METATYPE(QVector<QRectF>)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             HorizontalPercentBarAnimation::HorizontalPercentBarAnimation(AbstractBarChartItem *item) :
                 AbstractBarAnimation(item)
             {
             }
             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> result;
                 Q_ASSERT(startVector.count() == endVector.count());
                 qreal xAxis = m_item->geometry().x();
                 for(int i = 0; i < startVector.count(); i++) {
                     qreal h = endVector[i].height();
                     qreal w = endVector[i].width() * progress;
                     qreal x = xAxis + ((endVector[i].left() - xAxis) * progress);
                     qreal y = endVector[i].top();
                     QRectF value(x,y,w,h);
-                    result << value;
+                    result << value.normalized();
                 }
                 return qVariantFromValue(result);
             }
             #include "moc_horizontalpercentbaranimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/horizontalstackedbaranimation.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 "horizontalstackedbaranimation_p.h"
             #include "abstractbarchartitem_p.h"
             #include <QTimer>
             Q_DECLARE_METATYPE(QVector<QRectF>)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             HorizontalStackedBarAnimation::HorizontalStackedBarAnimation(AbstractBarChartItem *item) :
                 AbstractBarAnimation(item)
             {
             }
             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> result;
                 Q_ASSERT(startVector.count() == endVector.count());
                 qreal xAxis = m_item->geometry().x();
                 for(int i = 0; i < startVector.count(); i++) {
                     qreal h = endVector[i].height();
                     qreal w = endVector[i].width() * progress;
                     qreal x = xAxis + ((endVector[i].left() - xAxis) * progress);
                     qreal y = endVector[i].top();
                     QRectF value(x,y,w,h);
-                    result << value;
+                    result << value.normalized();
                 }
                 return qVariantFromValue(result);
             }
             #include "moc_horizontalstackedbaranimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/percentbaranimation.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 "percentbaranimation_p.h"
             #include "percentbarchartitem_p.h"
             #include <QTimer>
             Q_DECLARE_METATYPE(QVector<QRectF>)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             PercentBarAnimation::PercentBarAnimation(PercentBarChartItem *item)
                 :AbstractBarAnimation(item)
             {
                 setDuration(ChartAnimationDuration);
                 setEasingCurve(QEasingCurve::OutQuart);
             }
             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> result;
                 Q_ASSERT(startVector.count() == endVector.count());
                 qreal yAxis = m_item->geometry().height() + m_item->geometry().y();
                 for(int i = 0; i < startVector.count(); i++) {
                     qreal w = endVector[i].width();
                     qreal h = startVector[i].height() + ((endVector[i].height() - startVector[i].height()) * progress);
                     qreal x = endVector[i].topLeft().x();
                     qreal y = yAxis + ((endVector[i].topLeft().y() - yAxis) * progress);
                     QRectF value(x,y,w,h);
-                    result << value;
+                    result << value.normalized();
                 }
                 return qVariantFromValue(result);
             }
             #include "moc_percentbaranimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/stackedbaranimation.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 "stackedbaranimation_p.h"
             #include "stackedbarchartitem_p.h"
             #include <QTimer>
             Q_DECLARE_METATYPE(QVector<QRectF>)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             StackedBarAnimation::StackedBarAnimation(StackedBarChartItem *item)
                 :AbstractBarAnimation(item)
             {
                 setEasingCurve(QEasingCurve::OutQuart);
             }
             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> result;
                 Q_ASSERT(startVector.count() == endVector.count());
                 qreal yAxis = m_item->geometry().height() + m_item->geometry().y();
                 for(int i = 0; i < startVector.count(); i++) {
                     qreal w = endVector[i].width();
                     qreal h = startVector[i].height() + ((endVector[i].height() - startVector[i].height()) * progress);
                     qreal x = endVector[i].topLeft().x();
                     qreal y = yAxis + ((endVector[i].topLeft().y() - yAxis) * progress);
                     QRectF value(x,y,w,h);
-                    result << value;
+                    result << value.normalized();
                 }
                 return qVariantFromValue(result);
             }
             #include "moc_stackedbaranimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

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