HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2316:74962bdcee07

0

src/animations/animations.pri +2 -14

                  $$PWD/pieanimation.cpp \
                  $$PWD/piesliceanimation.cpp \
                  $$PWD/splineanimation.cpp \
-                 $$PWD/baranimation.cpp \
-                 $$PWD/stackedbaranimation.cpp \
-                 $$PWD/percentbaranimation.cpp \
-                 $$PWD/abstractbaranimation.cpp \
-                 $$PWD/horizontalbaranimation.cpp \
-                 $$PWD/horizontalstackedbaranimation.cpp \
-                 $$PWD/horizontalpercentbaranimation.cpp
+                 $$PWD/baranimation.cpp
              PRIVATE_HEADERS += \
                  $$PWD/axisanimation_p.h \
                  $$PWD/pieanimation_p.h \
                  $$PWD/piesliceanimation_p.h \
                  $$PWD/splineanimation_p.h \
-                 $$PWD/baranimation_p.h \
-                 $$PWD/stackedbaranimation_p.h \
-                 $$PWD/percentbaranimation_p.h \
-                 $$PWD/abstractbaranimation_p.h \
-                 $$PWD/horizontalbaranimation_p.h \
-                 $$PWD/horizontalstackedbaranimation_p.h \
-                 $$PWD/horizontalpercentbaranimation_p.h
+                 $$PWD/baranimation_p.h

0

src/animations/baranimation.cpp +24 -17

              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              BarAnimation::BarAnimation(AbstractBarChartItem *item)
-                 : AbstractBarAnimation(item)
+                 : ChartAnimation(item),
+                   m_item(item)
              {
+                 setDuration(ChartAnimationDuration);
+                 setEasingCurve(QEasingCurve::OutQuart);
              }
              BarAnimation::~BarAnimation()
                  for (int i = 0; i < startVector.count(); i++) {
                      QRectF start = startVector[i].normalized();
                      QRectF end = endVector[i].normalized();
+                     qreal x1 = start.left() + progress * (end.left() - start.left());
+                     qreal x2 = start.right() + progress * (end.right() - start.right());
+                     qreal y1 = start.top() + progress * (end.top() - start.top());
+                     qreal y2 = start.bottom() + progress * (end.bottom() - start.bottom());
-                     qreal x = end.left();
-                     qreal y;
-                     qreal w = end.width();
-                     qreal h;
-                     if (endVector[i].height() < 0) {
-                         // Negative bar
-                         y = end.top();
-                         h = start.height() + ((end.height() - start.height()) * progress);
-                     } else {
-                         h = startVector[i].height() + ((endVector[i].height() - startVector[i].height()) * progress);
-                         y = endVector[i].top() + endVector[i].height() - h;
+                     }
-                     QRectF value(x, y, w, h);
+                     QRectF value(QPointF(x1, y1), QPointF(x2, y2));
                      result << value.normalized();
                  }
                  return qVariantFromValue(result);
              }
+             void BarAnimation::updateCurrentValue(const QVariant &value)
+             {
+                 QVector<QRectF> layout = qvariant_cast<QVector<QRectF> >(value);
+                 m_item->setLayout(layout);
+             }
+             void BarAnimation::setup(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
+             {
+                 QVariantAnimation::KeyValues value;
+                 setKeyValues(value); //workaround for wrong interpolation call
+                 setKeyValueAt(0.0, qVariantFromValue(oldLayout));
+                 setKeyValueAt(1.0, qVariantFromValue(newLayout));
+             }
              #include "moc_baranimation_p.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

0

src/animations/baranimation_p.h +10 -6

              //
              // We mean it.
-             #ifndef BARANIMATION_P_H
-             #define BARANIMATION_P_H
+             #ifndef ABSTRACTBARANIMATION_P_H
+             #define ABSTRACTBARANIMATION_P_H
-             #include "abstractbaranimation_p.h"
              #include "chartanimation_p.h"
-             #include "abstractbarchartitem_p.h"
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              class AbstractBarChartItem;
-             class BarAnimation : public AbstractBarAnimation
+             class BarAnimation : public ChartAnimation
              {
                  Q_OBJECT
              public: // from QVariantAnimation
                  virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const;
+                 virtual void updateCurrentValue(const QVariant &value);
+                 void setup(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout);
+             protected:
+                 AbstractBarChartItem *m_item;
              };
              QTCOMMERCIALCHART_END_NAMESPACE
-             #endif
+             #endif // ABSTRACTBARANIMATION_P_H

0

src/barchart/abstractbarchartitem.cpp +17 -10

              #include "qchart.h"
              #include "chartpresenter_p.h"
              #include "charttheme_p.h"
-             #include "abstractbaranimation_p.h"
+             #include "baranimation_p.h"
              #include "chartdataset_p.h"
              #include <QPainter>
                  connect(series->d_func(), SIGNAL(restructuredBars()), this, SLOT(handleDataStructureChanged()));
                  connect(series, SIGNAL(visibleChanged()), this, SLOT(handleVisibleChanged()));
                  connect(series, SIGNAL(opacityChanged()), this, SLOT(handleOpacityChanged()));
-                 setZValue(ChartPresenter::BarSeriesZValue);
+                 setZValue(ChartPresenter::BarSeriesZValue);
                  handleDataStructureChanged();
                  handleVisibleChanged();
                  handleUpdatedBars();
              void AbstractBarChartItem::applyLayout(const QVector<QRectF> &layout)
              {
-                 if (m_animation) {
-                     m_animation->setup(m_layout, layout);
-                     presenter()->startAnimation(m_animation);
-                 } else {
-                     setLayout(layout);
-                     update();
+                 QSizeF size = geometry().size();
+                 if (geometry().size().isValid()) {
+                     if (m_animation) {
+                         if (m_layout.count() == 0 || m_oldSize != size) {
+                             initializeLayout();
+                             m_oldSize = size;
+                         }
+                         m_animation->setup(m_layout, layout);
+                         presenter()->startAnimation(m_animation);
+                     } else {
+                         setLayout(layout);
+                         update();
+                     }
                  }
              }
-             void AbstractBarChartItem::setAnimation(AbstractBarAnimation *animation)
+             void AbstractBarChartItem::setAnimation(BarAnimation *animation)
              {
                  m_animation = animation;
              }
                          connect(bar, SIGNAL(hovered(bool,QBarSet*)), m_series, SIGNAL(hovered(bool,QBarSet*)));
                          connect(bar, SIGNAL(clicked(int,QBarSet*)), set, SIGNAL(clicked(int)));
                          connect(bar, SIGNAL(hovered(bool,QBarSet*)), set, SIGNAL(hovered(bool)));
-                         m_layout.append(QRectF(0, 0, 0, 0));
+                         //            m_layout.append(QRectF(0, 0, 1, 1));
                          // Labels
                          m_labels.append(new QGraphicsSimpleTextItem(this));

0

src/barchart/abstractbarchartitem_p.h +5 -3

              class Bar;
              class QAxisCategories;
              class QChart;
-             class AbstractBarAnimation;
+             class BarAnimation;
              class AbstractBarChartItem : public ChartItem
              {
                  QRectF boundingRect() const;
                  virtual QVector<QRectF> calculateLayout() = 0;
+                 virtual void initializeLayout() = 0;
                  virtual void applyLayout(const QVector<QRectF> &layout);
-                 virtual void setAnimation(AbstractBarAnimation *animation);
+                 virtual void setAnimation(BarAnimation *animation);
                  void setLayout(const QVector<QRectF> &layout);
                  void updateLayout(const QVector<QRectF> &layout);
                  QRectF geometry() const { return m_rect;}
                  QRectF m_rect;
                  QVector<QRectF> m_layout;
-                 AbstractBarAnimation *m_animation;
+                 BarAnimation *m_animation;
                  QAbstractBarSeries *m_series; // Not owned.
                  QList<Bar *> m_bars;
                  QList<QGraphicsSimpleTextItem *> m_labels;
+                 QSizeF m_oldSize;
              };
              QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/horizontal/bar/horizontalbarchartitem.cpp +31 -11

              {
              }
+             void HorizontalBarChartItem::initializeLayout()
+             {
+                 qreal categoryCount = m_series->d_func()->categoryCount();
+                 qreal setCount = m_series->count();
+                 qreal barWidth = m_series->d_func()->barWidth();
+                 m_layout.clear();
+                 for(int category = 0; category < categoryCount; category++) {
+                     for (int set = 0; set < setCount; set++) {
+                         QRectF rect;
+                         QPointF topLeft;
+                         QPointF bottomRight;
+                         if (domain()->type() == AbstractDomain::LogXYDomain || domain()->type() == AbstractDomain::LogXLogYDomain) {
+                             topLeft = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category - barWidth / 2 + set/setCount * barWidth));
+                             bottomRight = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category + barWidth / 2 + (set + 1)/setCount * barWidth));
+                         } else {
+                             topLeft = domain()->calculateGeometryPoint(QPointF(0, category - barWidth / 2 + set/setCount * barWidth));
+                             bottomRight = domain()->calculateGeometryPoint(QPointF(0, category - barWidth / 2 + (set + 1)/setCount * barWidth));
+                         }
+                         rect.setTopLeft(topLeft);
+                         rect.setBottomRight(bottomRight);
+                         m_layout.append(rect.normalized());
+                     }
+                 }
+             }
              QVector<QRectF> HorizontalBarChartItem::calculateLayout()
              {
                  QVector<QRectF> layout;
                  qreal setCount = m_series->count();
                  qreal barWidth = m_series->d_func()->barWidth();
-                 int itemIndex(0);
                  for(int category = 0; category < categoryCount; category++) {
                      for (int set = 0; set < setCount; set++) {
                          qreal value = m_series->barSets().at(set)->at(category);
                          QRectF rect;
                          QPointF topLeft;
                          if (domain()->type() == AbstractDomain::LogXYDomain || domain()->type() == AbstractDomain::LogXLogYDomain)
-                             topLeft = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category - barWidth / 2 + (set + 1)/(setCount) * barWidth));
+                             topLeft = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category - barWidth / 2 + set/setCount * barWidth));
                          else
-                             topLeft = domain()->calculateGeometryPoint(QPointF(0, category - barWidth / 2 + (set + 1)/(setCount) * barWidth));
+                             topLeft = domain()->calculateGeometryPoint(QPointF(0, category - barWidth / 2 + set/setCount * barWidth));
-                         QPointF bottomRight = domain()->calculateGeometryPoint(QPointF(value, category - barWidth / 2 + (set)/(setCount) * barWidth));
+                         QPointF bottomRight = domain()->calculateGeometryPoint(QPointF(value, category - barWidth / 2 + (set + 1)/setCount * barWidth));
                          rect.setTopLeft(topLeft);
                          rect.setBottomRight(bottomRight);
-                         layout.append(rect);
-                         QGraphicsSimpleTextItem *label = m_labels.at(itemIndex);
-                         label->setPos(rect.center() - label->boundingRect().center());
-                         label->setZValue(200);
-                         itemIndex++;
-                         label->setBrush(Qt::black);
+                         layout.append(rect.normalized());
                      }
                  }
                  return layout;

0

src/barchart/horizontal/bar/horizontalbarchartitem_p.h +1 0

              private:
                  virtual QVector<QRectF> calculateLayout();
+                 void initializeLayout();
              };
              QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/horizontal/bar/qhorizontalbarseries.cpp 0 -13

              #include "qhorizontalbarseries.h"
              #include "qhorizontalbarseries_p.h"
              #include "horizontalbarchartitem_p.h"
-             #include "horizontalbaranimation_p.h"
              #include "qbarcategoryaxis.h"
              #include "chartdataset_p.h"
                  QAbstractSeriesPrivate::initializeGraphics(parent);
              }
-             void QHorizontalBarSeriesPrivate::initializeAnimations(QtCommercialChart::QChart::AnimationOptions options)
+             {
-                 HorizontalBarChartItem *bar = static_cast<HorizontalBarChartItem *>(m_item.data());
-                 Q_ASSERT(bar);
-                 if (options.testFlag(QChart::SeriesAnimations)) {
-                     bar->setAnimation(new HorizontalBarAnimation(bar));
-                 }else{
-                     bar->setAnimation(0);
+                 }
-                 QAbstractSeriesPrivate::initializeAnimations(options);
+             }
              #include "moc_qhorizontalbarseries.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/horizontal/bar/qhorizontalbarseries_p.h 0 -1

              public:
                  QHorizontalBarSeriesPrivate(QHorizontalBarSeries *q);
                  void initializeGraphics(QGraphicsItem* parent);
-                 void initializeAnimations(QtCommercialChart::QChart::AnimationOptions options);
                  void initializeDomain();
              private:
                  Q_DECLARE_PUBLIC(QHorizontalBarSeries)

0

src/barchart/horizontal/percent/horizontalpercentbarchartitem.cpp +31 -4

              {
              }
+             void HorizontalPercentBarChartItem::initializeLayout()
+             {
+                 qreal categoryCount = m_series->d_func()->categoryCount();
+                 qreal setCount = m_series->count();
+                 qreal barWidth = m_series->d_func()->barWidth();
+                 m_layout.clear();
+                 for(int category = 0; category < categoryCount; category++) {
+                     for (int set = 0; set < setCount; set++) {
+                         QRectF rect;
+                         QPointF topLeft;
+                         QPointF bottomRight;
+                         if (domain()->type() == AbstractDomain::LogXYDomain || domain()->type() == AbstractDomain::LogXLogYDomain) {
+                             topLeft = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category - barWidth / 2));
+                             bottomRight = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category + barWidth / 2));
+                         } else {
+                             topLeft = domain()->calculateGeometryPoint(QPointF(0, category - barWidth / 2));
+                             bottomRight = domain()->calculateGeometryPoint(QPointF(0, category + barWidth / 2));
+                         }
+                         rect.setTopLeft(topLeft);
+                         rect.setBottomRight(bottomRight);
+                         m_layout.append(rect.normalized());
+                     }
+                 }
+             }
              QVector<QRectF> HorizontalPercentBarChartItem::calculateLayout()
              {
                  QVector<QRectF> layout;
                          QRectF rect;
                          QPointF topLeft;
                          if (domain()->type() == AbstractDomain::LogXYDomain || domain()->type() == AbstractDomain::LogXLogYDomain)
-                             topLeft = domain()->calculateGeometryPoint(QPointF(set ? 100 * sum/categorySum : domain()->minX(), category + barWidth/2));
+                             topLeft = domain()->calculateGeometryPoint(QPointF(set ? 100 * sum/categorySum : domain()->minX(), category - barWidth/2));
                          else
-                             topLeft = domain()->calculateGeometryPoint(QPointF(set ? 100 * sum/categorySum : 0, category + barWidth/2));
-                         QPointF bottomRight = domain()->calculateGeometryPoint(QPointF(100 * (value + sum)/categorySum, category - barWidth/2));
+                             topLeft = domain()->calculateGeometryPoint(QPointF(set ? 100 * sum/categorySum : 0, category - barWidth/2));
+                         QPointF bottomRight = domain()->calculateGeometryPoint(QPointF(100 * (value + sum)/categorySum, category + barWidth/2));
                          rect.setTopLeft(topLeft);
                          rect.setBottomRight(bottomRight);
-                         layout.append(rect);
+                         layout.append(rect.normalized());
                          sum +=value;
                      }
                  }

0

src/barchart/horizontal/percent/horizontalpercentbarchartitem_p.h +1 0

              private:
                  virtual QVector<QRectF> calculateLayout();
+                 void initializeLayout();
              };
              QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp 0 -12

              #include "qhorizontalpercentbarseries.h"
              #include "qhorizontalpercentbarseries_p.h"
              #include "horizontalpercentbarchartitem_p.h"
-             #include "horizontalpercentbaranimation_p.h"
              #include "chartdataset_p.h"
              #include "charttheme_p.h"
                  QAbstractSeriesPrivate::initializeGraphics(parent);
              }
-             void QHorizontalPercentBarSeriesPrivate::initializeAnimations(QtCommercialChart::QChart::AnimationOptions options)
+             {
-                 HorizontalPercentBarChartItem *bar = static_cast<HorizontalPercentBarChartItem *>(m_item.data());
-                 Q_ASSERT(bar);
-                 if (options.testFlag(QChart::SeriesAnimations)) {
-                     bar->setAnimation(new HorizontalPercentBarAnimation(bar));
-                 }else{
-                     bar->setAnimation(0);
+                 }
-                 QAbstractSeriesPrivate::initializeAnimations(options);
+             }
              #include "moc_qhorizontalpercentbarseries.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h 0 -1

              public:
                  QHorizontalPercentBarSeriesPrivate(QHorizontalPercentBarSeries *q);
                  void initializeGraphics(QGraphicsItem* parent);
-                 void initializeAnimations(QtCommercialChart::QChart::AnimationOptions options);
                  void initializeDomain();
              private:
                  Q_DECLARE_PUBLIC(QHorizontalPercentBarSeries)

0

src/barchart/horizontal/stacked/horizontalstackedbarchartitem.cpp +28 -1

              {
              }
+             void HorizontalStackedBarChartItem::initializeLayout()
+             {
+                 qreal categoryCount = m_series->d_func()->categoryCount();
+                 qreal setCount = m_series->count();
+                 qreal barWidth = m_series->d_func()->barWidth();
+                 m_layout.clear();
+                 for(int category = 0; category < categoryCount; category++) {
+                     for (int set = 0; set < setCount; set++) {
+                         QRectF rect;
+                         QPointF topLeft;
+                         QPointF bottomRight;
+                         if (domain()->type() == AbstractDomain::LogXYDomain || domain()->type() == AbstractDomain::LogXLogYDomain) {
+                             topLeft = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category - barWidth / 2));
+                             bottomRight = domain()->calculateGeometryPoint(QPointF(domain()->minX(), category + barWidth / 2));
+                         } else {
+                             topLeft = domain()->calculateGeometryPoint(QPointF(0, category - barWidth / 2));
+                             bottomRight = domain()->calculateGeometryPoint(QPointF(0, category + barWidth / 2));
+                         }
+                         rect.setTopLeft(topLeft);
+                         rect.setBottomRight(bottomRight);
+                         m_layout.append(rect.normalized());
+                     }
+                 }
+             }
              QVector<QRectF> HorizontalStackedBarChartItem::calculateLayout()
              {
                  QVector<QRectF> layout;
                          }
                          rect.setTopLeft(topLeft);
                          rect.setBottomRight(bottomRight);
-                         layout.append(rect);
+                         layout.append(rect.normalized());
                      }
                  }
                  return layout;

0

src/barchart/horizontal/stacked/horizontalstackedbarchartitem_p.h +1 0

              private:
                  virtual QVector<QRectF> calculateLayout();
+                 void initializeLayout();
              };
              QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp 0 -12

              #include "qhorizontalstackedbarseries.h"
              #include "qhorizontalstackedbarseries_p.h"
              #include "horizontalstackedbarchartitem_p.h"
-             #include "horizontalstackedbaranimation_p.h"
              #include "chartdataset_p.h"
              #include "charttheme_p.h"
                  QAbstractSeriesPrivate::initializeGraphics(parent);
              }
-             void QHorizontalStackedBarSeriesPrivate::initializeAnimations(QtCommercialChart::QChart::AnimationOptions options)
+             {
-                 HorizontalStackedBarChartItem *bar = static_cast<HorizontalStackedBarChartItem *>(m_item.data());
-                 Q_ASSERT(bar);
-                 if (options.testFlag(QChart::SeriesAnimations)) {
-                     bar->setAnimation(new HorizontalStackedBarAnimation(bar));
-                 }else{
-                     bar->setAnimation(0);
+                 }
-                 QAbstractSeriesPrivate::initializeAnimations(options);
+             }
              #include "moc_qhorizontalstackedbarseries.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h 0 -1

              public:
                  QHorizontalStackedBarSeriesPrivate(QHorizontalStackedBarSeries *q);
                  void initializeGraphics(QGraphicsItem* parent);
-                 void initializeAnimations(QtCommercialChart::QChart::AnimationOptions options);
                  void initializeDomain();
              private:
                  Q_DECLARE_PUBLIC(QHorizontalStackedBarSeries)

0

src/barchart/qabstractbarseries.cpp +14 0

              #include "qvalueaxis.h"
              #include "qbarcategoryaxis.h"
              #include "qbarlegendmarker.h"
+             #include "baranimation_p.h"
+             #include "abstractbarchartitem_p.h"
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
                  }
              }
+             void QAbstractBarSeriesPrivate::initializeAnimations(QChart::AnimationOptions options)
+             {
+                 AbstractBarChartItem *bar = static_cast<AbstractBarChartItem *>(m_item.data());
+                 Q_ASSERT(bar);
+                 if (options.testFlag(QChart::SeriesAnimations)) {
+                     bar->setAnimation(new BarAnimation(bar));
+                 }else{
+                     bar->setAnimation(0);
+                 }
+                 QAbstractSeriesPrivate::initializeAnimations(options);
+             }
              #include "moc_qabstractbarseries.cpp"
              #include "moc_qabstractbarseries_p.cpp"

0

src/barchart/qabstractbarseries_p.h +1 0

                  void initializeDomain();
                  void initializeAxes();
+                 void initializeAnimations(QChart::AnimationOptions options);
                  void initializeTheme(int index, ChartTheme* theme, bool forced = false);
                  QList<QLegendMarker*> createLegendMarkers(QLegend *legend);

0

src/barchart/vertical/bar/barchartitem.cpp +29 -1

              {
              }
+             void BarChartItem::initializeLayout()
+             {
+                 qreal categoryCount = m_series->d_func()->categoryCount();
+                 qreal setCount = m_series->count();
+                 qreal barWidth = m_series->d_func()->barWidth();
+                 m_layout.clear();
+                 for(int category = 0; category < categoryCount; category++) {
+                     for (int set = 0; set < setCount; set++) {
+                         QRectF rect;
+                         QPointF topLeft;
+                         QPointF bottomRight;
+                         if (domain()->type() == AbstractDomain::XLogYDomain || domain()->type() == AbstractDomain::LogXLogYDomain) {
+                             topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + set/setCount * barWidth, domain()->minY()));
+                             bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2 + (set + 1)/setCount * barWidth, domain()->minY()));
+                         } else {
+                             topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + set/setCount * barWidth, 0));
+                             bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set + 1)/setCount * barWidth, 0));
+                         }
+                         rect.setTopLeft(topLeft);
+                         rect.setBottomRight(bottomRight);
+                         m_layout.append(rect.normalized());
+                     }
+                 }
+             }
              QVector<QRectF> BarChartItem::calculateLayout()
              {
                  QVector<QRectF> layout;
                              bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set + 1)/(setCount) * barWidth, 0));
                          rect.setTopLeft(topLeft);
                          rect.setBottomRight(bottomRight);
-                         layout.append(rect);
+                         layout.append(rect.normalized());
                      }
                  }
                  return layout;

0

src/barchart/vertical/bar/barchartitem_p.h +1 0

              private:
                  virtual QVector<QRectF> calculateLayout();
+                 void initializeLayout();
              };
              QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/vertical/bar/qbarseries.cpp 0 -13

              #include "barchartitem_p.h"
              #include "chartdataset_p.h"
              #include "charttheme_p.h"
-             #include "baranimation_p.h"
              #include "qvalueaxis.h"
              #include "qbarcategoryaxis.h"
                  QAbstractSeriesPrivate::initializeGraphics(parent);
              }
-             void QBarSeriesPrivate::initializeAnimations(QtCommercialChart::QChart::AnimationOptions options)
+             {
-                 BarChartItem *bar = static_cast<BarChartItem *>(m_item.data());
-                 Q_ASSERT(bar);
-                 if (options.testFlag(QChart::SeriesAnimations)) {
-                     bar->setAnimation(new BarAnimation(bar));
-                 }else{
-                     bar->setAnimation(0);
+                 }
-                 QAbstractSeriesPrivate::initializeAnimations(options);
+             }
              #include "moc_qbarseries.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/vertical/bar/qbarseries_p.h 0 -1

              public:
                  QBarSeriesPrivate(QBarSeries *q);
                  void initializeGraphics(QGraphicsItem* parent);
-                 void initializeAnimations(QtCommercialChart::QChart::AnimationOptions options);
                  void initializeDomain();
              private:

0

src/barchart/vertical/percent/percentbarchartitem.cpp +29 -1

              {
              }
+             void PercentBarChartItem::initializeLayout()
+             {
+                 qreal categoryCount = m_series->d_func()->categoryCount();
+                 qreal setCount = m_series->count();
+                 qreal barWidth = m_series->d_func()->barWidth();
+                 m_layout.clear();
+                 for(int category = 0; category < categoryCount; category++) {
+                     for (int set = 0; set < setCount; set++) {
+                         QRectF rect;
+                         QPointF topLeft;
+                         QPointF bottomRight;
+                         if (domain()->type() == AbstractDomain::XLogYDomain || domain()->type() == AbstractDomain::LogXLogYDomain) {
+                             topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, domain()->minY()));
+                             bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, domain()->minY()));
+                         } else {
+                             topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, 0));
+                             bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, 0));
+                         }
+                         rect.setTopLeft(topLeft);
+                         rect.setBottomRight(bottomRight);
+                         m_layout.append(rect.normalized());
+                     }
+                 }
+             }
              QVector<QRectF> PercentBarChartItem::calculateLayout()
              {
                  QVector<QRectF> layout;
                              bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth/2, set ? 100 * sum/categorySum : 0));
                          rect.setTopLeft(topLeft);
                          rect.setBottomRight(bottomRight);
-                         layout.append(rect);
+                         layout.append(rect.normalized());
                          sum +=value;
                      }
                  }

0

src/barchart/vertical/percent/percentbarchartitem_p.h +2 -1

                  void handleUpdatedBars();
              private:
-                 virtual QVector<QRectF> calculateLayout();
+                 virtual QVector<QRectF> calculateLayout();
+                 void initializeLayout();
              };
              QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/vertical/percent/qpercentbarseries.cpp 0 -12

              #include "chartdataset_p.h"
              #include "charttheme_p.h"
              #include "qvalueaxis.h"
-             #include "percentbaranimation_p.h"
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
                  QAbstractSeriesPrivate::initializeGraphics(parent);
              }
-             void QPercentBarSeriesPrivate::initializeAnimations(QtCommercialChart::QChart::AnimationOptions options)
+             {
-                 PercentBarChartItem *bar = static_cast<PercentBarChartItem *>(m_item.data());
-                 Q_ASSERT(bar);
-                 if (options.testFlag(QChart::SeriesAnimations)) {
-                     bar->setAnimation(new PercentBarAnimation(bar));
-                 }else{
-                     bar->setAnimation(0);
+                 }
-                 QAbstractSeriesPrivate::initializeAnimations(options);
+             }
              #include "moc_qpercentbarseries.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/vertical/percent/qpercentbarseries_p.h 0 -1

                  QPercentBarSeriesPrivate(QPercentBarSeries *q);
                  void initializeDomain();
                  void initializeGraphics(QGraphicsItem* parent);
-                 void initializeAnimations(QtCommercialChart::QChart::AnimationOptions options);
              private:
                  Q_DECLARE_PUBLIC(QPercentBarSeries)
              };

0

src/barchart/vertical/stacked/qstackedbarseries.cpp 0 -12

              #include "chartdataset_p.h"
              #include "charttheme_p.h"
              #include "qvalueaxis.h"
-             #include "stackedbaranimation_p.h"
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
                  QAbstractSeriesPrivate::initializeGraphics(parent);
              }
-             void QStackedBarSeriesPrivate::initializeAnimations(QtCommercialChart::QChart::AnimationOptions options)
+             {
-                 StackedBarChartItem *bar = static_cast<StackedBarChartItem *>(m_item.data());
-                 Q_ASSERT(bar);
-                 if (options.testFlag(QChart::SeriesAnimations)) {
-                     bar->setAnimation(new StackedBarAnimation(bar));
-                 }else{
-                     bar->setAnimation(0);
+                 }
-                 QAbstractSeriesPrivate::initializeAnimations(options);
+             }
              #include "moc_qstackedbarseries.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

0

src/barchart/vertical/stacked/qstackedbarseries_p.h 0 -1

              public:
                  QStackedBarSeriesPrivate(QStackedBarSeries *q);
                  void initializeGraphics(QGraphicsItem* parent);
-                 void initializeAnimations(QtCommercialChart::QChart::AnimationOptions options);
                  void initializeDomain();
              private:
                  Q_DECLARE_PUBLIC(QStackedBarSeries)

0

src/barchart/vertical/stacked/stackedbarchartitem.cpp +32 -4

              {
              }
+             void StackedBarChartItem::initializeLayout()
+             {
+                 qreal categoryCount = m_series->d_func()->categoryCount();
+                 qreal setCount = m_series->count();
+                 qreal barWidth = m_series->d_func()->barWidth();
+                 m_layout.clear();
+                 for(int category = 0; category < categoryCount; category++) {
+                     for (int set = 0; set < setCount; set++) {
+                         QRectF rect;
+                         QPointF topLeft;
+                         QPointF bottomRight;
+                         if (domain()->type() == AbstractDomain::XLogYDomain || domain()->type() == AbstractDomain::LogXLogYDomain) {
+                             topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, domain()->minY()));
+                             bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, domain()->minY()));
+                         } else {
+                             topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, 0));
+                             bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, 0));
+                         }
+                         rect.setTopLeft(topLeft);
+                         rect.setBottomRight(bottomRight);
+                         m_layout.append(rect.normalized());
+                     }
+                 }
+             }
              QVector<QRectF> StackedBarChartItem::calculateLayout()
              {
                  QVector<QRectF> layout;
                                  topLeft = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? negativeSum : 0));
                              negativeSum += value;
                          } else {
-                             bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, value + positiveSum));
+                             topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2, value + positiveSum));
                              if (domain()->type() == AbstractDomain::XLogYDomain || domain()->type() == AbstractDomain::LogXLogYDomain)
-                                 topLeft = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? positiveSum : domain()->minY()));
+                                 bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? positiveSum : domain()->minY()));
                              else
-                                 topLeft = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? positiveSum : 0));
+                                 bottomRight = domain()->calculateGeometryPoint(QPointF(category + barWidth / 2, set ? positiveSum : 0));
                              positiveSum += value;
                          }
                          rect.setTopLeft(topLeft);
                          rect.setBottomRight(bottomRight);
-                         layout.append(rect);
+                         layout.append(rect.normalized());
                      }
                  }
                  return layout;

0

src/barchart/vertical/stacked/stackedbarchartitem_p.h +2 0

              private:
                  virtual QVector<QRectF> calculateLayout();
+                 void initializeLayout();
              };
              QTCOMMERCIALCHART_END_NAMESPACE

0

src/animations/abstractbaranimation.cpp removed 0 -68

1

NO CONTENT: file was removed

0

src/animations/abstractbaranimation_p.h removed 0 -59

1

NO CONTENT: file was removed

0

src/animations/horizontalbaranimation.cpp removed 0 -74

1

NO CONTENT: file was removed

0

src/animations/horizontalbaranimation_p.h removed 0 -52

1

NO CONTENT: file was removed

0

src/animations/horizontalpercentbaranimation.cpp removed 0 -64

1

NO CONTENT: file was removed

0

src/animations/horizontalpercentbaranimation_p.h removed 0 -52

1

NO CONTENT: file was removed

0

src/animations/horizontalstackedbaranimation.cpp removed 0 -64

1

NO CONTENT: file was removed

0

src/animations/horizontalstackedbaranimation_p.h removed 0 -52

1

NO CONTENT: file was removed

0

src/animations/percentbaranimation.cpp removed 0 -64

1

NO CONTENT: file was removed

0

src/animations/percentbaranimation_p.h removed 0 -55

1

NO CONTENT: file was removed

0

src/animations/stackedbaranimation.cpp removed 0 -63

1

NO CONTENT: file was removed

0

src/animations/stackedbaranimation_p.h removed 0 -55

1

NO CONTENT: file was removed

	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