HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Files · src/xychart/xychart.cpp

Named all series in example applications

Michal Klocek - - Load All Authors

File last commit:

r1220:8dbddb2db883


                r1226:bae2376cbfec

Download file

             xychart.cpp
        
                    304 lines
            
             | 9.6 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / xychart / xychart.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Jani Honkonen
    
Add license headers

              r794
            
      /****************************************************************************

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
       **

       ** 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$

       **

       ****************************************************************************/

        Jani Honkonen
    
Add license headers

              r794
            
        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      #include "xychart_p.h"

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      #include "qxyseries.h"

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
      #include "qxyseries_p.h"

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      #include "chartpresenter_p.h"

        Michal Klocek
    
Animation refactor...

              r530
            
      #include "chartanimator_p.h"

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      #include <QPainter>

        Marek Rosa
    
QXYSeries: support for removing data from model when using custom mapping

              r1055
            
      #include <QAbstractItemModel>

        Marek Rosa
    
Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.

              r1164
            
      #include "qxymodelmapper.h"

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

      //TODO: optimize : remove points which are not visible

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      XYChart::XYChart(QXYSeries *series, ChartPresenter *presenter):Chart(presenter),

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
      m_minX(0),

      m_maxX(0),

      m_minY(0),

      m_maxY(0),

      m_series(series),

      m_animation(0)

      {

          QObject::connect(series->d_func(),SIGNAL(pointReplaced(int)),this,SLOT(handlePointReplaced(int)));

          QObject::connect(series->d_func(),SIGNAL(pointAdded(int)),this,SLOT(handlePointAdded(int)));

          QObject::connect(series->d_func(),SIGNAL(pointsAdded(int, int)),this,SLOT(handlePointsAdded(int, int)));

          QObject::connect(series->d_func(),SIGNAL(pointRemoved(int)),this,SLOT(handlePointRemoved(int)));

          QObject::connect(series->d_func(),SIGNAL(pointsRemoved(int, int)),this,SLOT(handlePointsRemoved(int, int)));

          QObject::connect(series->d_func(),SIGNAL(reinitialized()),this,SLOT(handleReinitialized()));

          QObject::connect(this,SIGNAL(clicked(QPointF)),series,SIGNAL(clicked(QPointF)));

      }

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      void XYChart::setGeometryPoints(QVector<QPointF>& points)

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
      {

          m_points = points;

      }

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      void XYChart::setClipRect(const QRectF &rect)

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
      {

          m_clipRect = rect;

      }

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      void XYChart::setAnimation(XYAnimation* animation)

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      {

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
          m_animation=animation;

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      }

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      QPointF XYChart::calculateGeometryPoint(const QPointF &point) const

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      {

          const qreal deltaX = m_size.width()/(m_maxX-m_minX);

          const qreal deltaY = m_size.height()/(m_maxY-m_minY);

          qreal x = (point.x() - m_minX)* deltaX;

          qreal y = (point.y() - m_minY)*-deltaY + m_size.height();

          return QPointF(x,y);

      }

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      QPointF XYChart::calculateGeometryPoint(int index) const

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      {

          const qreal deltaX = m_size.width()/(m_maxX-m_minX);

          const qreal deltaY = m_size.height()/(m_maxY-m_minY);

        Michal Klocek
    
Fixes and improvments to series API...

              r1057
            
          const QList<QPointF>& vector = m_series->points();

          qreal x = (vector[index].x() - m_minX)* deltaX;

          qreal y = (vector[index].y() - m_minY)*-deltaY + m_size.height();

        Michal Klocek
    
Add missing files from previous commit

              r466
            
          return QPointF(x,y);

      }

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      QVector<QPointF> XYChart::calculateGeometryPoints() const

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      {

          const qreal deltaX = m_size.width()/(m_maxX-m_minX);

          const qreal deltaY = m_size.height()/(m_maxY-m_minY);

        Michal Klocek
    
Fixes and improvments to series API...

              r1057
            
          QVector<QPointF> result;

          result.resize(m_series->count());

          const QList<QPointF>& vector = m_series->points();

        Michal Klocek
    
Add missing files from previous commit

              r466
            
          for (int i = 0; i < m_series->count(); ++i) {

        Michal Klocek
    
Fixes and improvments to series API...

              r1057
            
              qreal x = (vector[i].x() - m_minX)* deltaX;

              qreal y = (vector[i].y() - m_minY)*-deltaY + m_size.height();

              result[i].setX(x);

              result[i].setY(y);

        Michal Klocek
    
Add missing files from previous commit

              r466
            
          }

        Michal Klocek
    
Fixes and improvments to series API...

              r1057
            
          return result;

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      }

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      QPointF XYChart::calculateDomainPoint(const QPointF &point) const

        Michal Klocek
    
Adds clicked(Point) to lineSeries, changes visible points handling

              r544
            
      {

          const qreal deltaX = m_size.width()/(m_maxX-m_minX);

          const qreal deltaY = m_size.height()/(m_maxY-m_minY);

          qreal x = point.x()/deltaX +m_minX;

          qreal y = (point.y()-m_size.height())/(-deltaY)+ m_minY;

          return QPointF(x,y);

      }

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      void XYChart::updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints,int index)

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      {

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
          if (m_animation) {

              m_animation->setValues(oldPoints, newPoints, index);

              animator()->startAnimation(m_animation);

          }

          else {

              setGeometryPoints(newPoints);

              updateGeometry();

        Michal Klocek
    
Animation refactor...

              r530
            
          }

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      }

      //handlers

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      void XYChart::handlePointAdded(int index)

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      {

        Marek Rosa
    
QXYSeries: support for adding data to model when using custom mapping

              r1054
            
          if (m_series->model() == 0) {

              Q_ASSERT(index<m_series->count());

              Q_ASSERT(index>=0);

          }

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
        Marek Rosa
    
Removed unfinished model related methods from PieSeries

              r1018
            
          QVector<QPointF> points = m_points;

          QPointF point;

        Marek Rosa
    
Removed all the unfinished model functionality from XYSeries and BarSeries

              r990
            
          point = calculateGeometryPoint(index);

          points.insert(index, point);

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
          if(m_animation) {

              m_animation->setAnimationType(XYAnimation::LineDrawAnimation);

          }

         updateChart(m_points,points,index);

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      }

        Marek Rosa
    
QXYSeries: support for adding data to model when using custom mapping

              r1054
            
        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      void XYChart::handlePointsAdded(int start, int end)

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
      {

        Marek Rosa
    
QXYSeries: support for adding data to model when using custom mapping

              r1054
            
          if (m_series->model() == 0) {

              for (int i = start; i <= end; i++)

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
              handlePointAdded(i);

          }

          else {

        Marek Rosa
    
Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.

              r1164
            
              int mapFirst = m_series->modelMapper()->first();

              int mapCount = m_series->modelMapper()->count();

              if (mapCount != -1 && start >= mapFirst + mapCount) {

                  return;

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
              }

              else {

        Marek Rosa
    
Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.

              r1164
            
                  int addedCount = end - start + 1;

                  if (mapCount != -1 && addedCount > mapCount)

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
                  addedCount = mapCount;

                  int first = qMax(start, mapFirst); // get the index of the first item that will be added

                  int last = qMin(first + addedCount - 1, mapCount + mapFirst - 1);// get the index of the last item that will be added

        Marek Rosa
    
Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.

              r1164
            
                  for (int i = first; i <= last; i++) {

                      handlePointAdded(i - mapFirst);

                  }

                  // the map is limited therefore the items that are now outside the map

                  // need to be removed from the drawn points

                  if (mapCount != -1 && m_points.size() > mapCount)

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
                  for (int i = m_points.size() - 1; i >= mapCount; i--)

                  handlePointRemoved(i);

        Marek Rosa
    
QXYSeries: support for adding data to model when using custom mapping

              r1054
            
              }

          }

      }

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      void XYChart::handlePointRemoved(int index)

        Michal Klocek
    
Adds big fat pimpl to series classes...

              r938
            
      {

        Marek Rosa
    
QXYSeries: support for adding data to model when using custom mapping

              r1054
            
          if (m_series->model() == 0) {

              Q_ASSERT(index<m_series->count() + 1);

              Q_ASSERT(index>=0);

          }

        Marek Rosa
    
Removed unfinished model related methods from PieSeries

              r1018
            
          QVector<QPointF> points = m_points;

        Marek Rosa
    
Removed all the unfinished model functionality from XYSeries and BarSeries

              r990
            
          points.remove(index);

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
          if(m_animation) {

              m_animation->setAnimationType(XYAnimation::LineDrawAnimation);

          }

          updateChart(m_points,points,index);

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      }

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      void XYChart::handlePointsRemoved(int start, int end)

        Marek Rosa
    
QXYSeries: support for adding data to model when using custom mapping

              r1054
            
      {

          Q_UNUSED(start)

          Q_UNUSED(end)

        Marek Rosa
    
QXYSeries: support for removing data from model when using custom mapping

              r1055
            
          if (m_series->model() == 0) {

              for (int i = end; i >= start; i--)

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
              handlePointRemoved(i);

          }

          else {

        Marek Rosa
    
QXYSeries: support for removing data from model when using custom mapping

              r1055
            
              // series uses model as a data source

        Marek Rosa
    
Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.

              r1164
            
              int mapFirst = m_series->modelMapper()->first();

              int mapCount = m_series->modelMapper()->count();

        Marek Rosa
    
QXYSeries: support for removing data from model when using custom mapping

              r1055
            
              int removedCount = end - start + 1;

        Marek Rosa
    
Refactored model related methods in XYSeries

              r1065
            
              if (mapCount != -1 && start >= mapFirst + mapCount) {

        Marek Rosa
    
QXYSeries: support for removing data from model when using custom mapping

              r1055
            
                  return;

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
              }

              else {

                  int toRemove = qMin(m_points.size(), removedCount); // first find how many items can actually be removed

                  int first = qMax(start, mapFirst);// get the index of the first item that will be removed.

                  int last = qMin(first + toRemove - 1, m_points.size() + mapFirst - 1);// get the index of the last item that will be removed.

        Marek Rosa
    
Improvements to QSpline model support

              r1090
            
                  if (last - first == 0) {

                      for (int i = last; i >= first; i--) {

                          handlePointRemoved(i - mapFirst);

                      }

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
                  }

                  else {

        Marek Rosa
    
Improvements to QSpline model support

              r1090
            
                      QVector<QPointF> points = m_points;

                      for (int i = last; i >= first; i--)

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
                      points.remove(i - mapFirst);

                      setGeometryPoints(points);

                      updateGeometry();

        Marek Rosa
    
Spline series now recalcutes control points on adding/removing data to/from model

              r1072
            
                  }

        Marek Rosa
    
Refactored model related methods in XYSeries

              r1065
            
                  if (mapCount != -1) {

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
                      int itemsAvailable; // check how many are available to be added

        Marek Rosa
    
Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.

              r1164
            
                      if (m_series->modelMapper()->orientation() == Qt::Vertical)

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
                      itemsAvailable = m_series->model()->rowCount() - mapFirst - m_points.size();

        Marek Rosa
    
Refactored model related methods in XYSeries

              r1065
            
                      else

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
                      itemsAvailable = m_series->model()->columnCount() - mapFirst - m_points.size();

                      int toBeAdded = qMin(itemsAvailable, mapCount - m_points.size());// add not more items than there is space left to be filled.

        Marek Rosa
    
Refactored model related methods in XYSeries

              r1065
            
                      int currentSize = m_points.size();

                      if (toBeAdded > 0)

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
                      for (int i = m_points.size(); i < currentSize + toBeAdded; i++) {

                          handlePointAdded(i);

                      }

        Marek Rosa
    
Refactored model related methods in XYSeries

              r1065
            
                  }

        Marek Rosa
    
QXYSeries: support for removing data from model when using custom mapping

              r1055
            
              }

          }

        Marek Rosa
    
QXYSeries: support for adding data to model when using custom mapping

              r1054
            
      }

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      void XYChart::handlePointReplaced(int index)

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      {

          Q_ASSERT(index<m_series->count());

          Q_ASSERT(index>=0);

          QPointF point = calculateGeometryPoint(index);

        Michal Klocek
    
Refactor animation to fit line,spline,scatter...

              r476
            
          QVector<QPointF> points = m_points;

        Marek Rosa
    
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders

              r527
            
          points.replace(index,point);

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
          if(m_animation) {

              m_animation->setAnimationType(XYAnimation::MoveDownAnimation);

          }

          updateChart(m_points,points,index);

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      }

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      void XYChart::handleReinitialized()

        Marek Rosa
    
XYSeries model support refactored

              r1085
            
      {

          QVector<QPointF> points = calculateGeometryPoints();

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
          if(m_animation) {

              m_animation->setAnimationType(XYAnimation::LineDrawAnimation);

          }

          updateChart(m_points,points);

        Marek Rosa
    
XYSeries model support refactored

              r1085
            
      }

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      void XYChart::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      {

          m_minX=minX;

          m_maxX=maxX;

          m_minY=minY;

          m_maxY=maxY;

        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
          if (isEmpty()) return;

        Michal Klocek
    
Add missing files from previous commit

              r466
            
          QVector<QPointF> points = calculateGeometryPoints();

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
          if(m_animation) {

        Michal Klocek
    
prevents flipping in xyseries animation

              r1220
            
              m_animation->setAnimationType(XYAnimation::MoveDownAnimation);

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
          }

          updateChart(m_points,points);

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      }

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      void XYChart::handleGeometryChanged(const QRectF &rect)

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      {

        Marek Rosa
    
XYSeries model with limits working.

              r833
            
          Q_ASSERT(rect.isValid());

          m_size=rect.size();

          m_clipRect=rect.translated(-rect.topLeft());

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
          m_origin=rect.topLeft();

        Michal Klocek
    
Add missing files from previous commit

              r466
            
        sauimone
    
minor code review issues. indent, spaces, brackets etc.

              r743
            
          if (isEmpty()) return;

        Marek Rosa
    
XYSeries model with limits working.

              r833
            
          QVector<QPointF> points = calculateGeometryPoints();

        Michal Klocek
    
Refactors animation handling for xyseries

              r1217
            
          if(m_animation) {

                m_animation->setAnimationType(XYAnimation::LineDrawAnimation);

            }

          updateChart(m_points,points);

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      }

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      bool XYChart::isEmpty()

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      {

        Michal Klocek
    
Bugfixes for spline vector allocation issues

              r1082
            
          return !m_clipRect.isValid() || qFuzzyIsNull(m_maxX - m_minX) || qFuzzyIsNull(m_maxY - m_minY) || m_series->points().isEmpty();

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      }

        Michal Klocek
    
Refactor xychartitem -> xychart

              r1218
            
      #include "moc_xychart_p.cpp"

        Michal Klocek
    
Add missing files from previous commit

              r466
            
      QTCOMMERCIALCHART_END_NAMESPACE

	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

Jani Honkonen Add license headers	r794	/****************************************************************************
Michal Klocek Refactors animation handling for xyseries	r1217	**
		** 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$
		**
		****************************************************************************/
Jani Honkonen Add license headers	r794
Michal Klocek Refactor xychartitem -> xychart	r1218	#include "xychart_p.h"
Michal Klocek Add missing files from previous commit	r466	#include "qxyseries.h"
Michal Klocek Adds big fat pimpl to series classes...	r938	#include "qxyseries_p.h"
Michal Klocek Add missing files from previous commit	r466	#include "chartpresenter_p.h"
Michal Klocek Animation refactor...	r530	#include "chartanimator_p.h"
Michal Klocek Add missing files from previous commit	r466	#include <QPainter>
Marek Rosa QXYSeries: support for removing data from model when using custom mapping	r1055	#include <QAbstractItemModel>
Marek Rosa Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.	r1164	#include "qxymodelmapper.h"
Michal Klocek Add missing files from previous commit	r466
		QTCOMMERCIALCHART_BEGIN_NAMESPACE

		//TODO: optimize : remove points which are not visible

Michal Klocek Refactor xychartitem -> xychart	r1218	XYChart::XYChart(QXYSeries series, ChartPresenter presenter):Chart(presenter),
Michal Klocek Refactors animation handling for xyseries	r1217	m_minX(0),
		m_maxX(0),
		m_minY(0),
		m_maxY(0),
		m_series(series),
		m_animation(0)
		{
		QObject::connect(series->d_func(),SIGNAL(pointReplaced(int)),this,SLOT(handlePointReplaced(int)));
		QObject::connect(series->d_func(),SIGNAL(pointAdded(int)),this,SLOT(handlePointAdded(int)));
		QObject::connect(series->d_func(),SIGNAL(pointsAdded(int, int)),this,SLOT(handlePointsAdded(int, int)));
		QObject::connect(series->d_func(),SIGNAL(pointRemoved(int)),this,SLOT(handlePointRemoved(int)));
		QObject::connect(series->d_func(),SIGNAL(pointsRemoved(int, int)),this,SLOT(handlePointsRemoved(int, int)));
		QObject::connect(series->d_func(),SIGNAL(reinitialized()),this,SLOT(handleReinitialized()));
		QObject::connect(this,SIGNAL(clicked(QPointF)),series,SIGNAL(clicked(QPointF)));
		}

Michal Klocek Refactor xychartitem -> xychart	r1218	void XYChart::setGeometryPoints(QVector<QPointF>& points)
Michal Klocek Refactors animation handling for xyseries	r1217	{
		m_points = points;
		}

Michal Klocek Refactor xychartitem -> xychart	r1218	void XYChart::setClipRect(const QRectF &rect)
Michal Klocek Refactors animation handling for xyseries	r1217	{
		m_clipRect = rect;
		}

Michal Klocek Refactor xychartitem -> xychart	r1218	void XYChart::setAnimation(XYAnimation* animation)
Michal Klocek Add missing files from previous commit	r466	{
Michal Klocek Refactors animation handling for xyseries	r1217	m_animation=animation;
Michal Klocek Add missing files from previous commit	r466	}

Michal Klocek Refactor xychartitem -> xychart	r1218	QPointF XYChart::calculateGeometryPoint(const QPointF &point) const
Michal Klocek Add missing files from previous commit	r466	{
		const qreal deltaX = m_size.width()/(m_maxX-m_minX);
		const qreal deltaY = m_size.height()/(m_maxY-m_minY);
		qreal x = (point.x() - m_minX)* deltaX;
		qreal y = (point.y() - m_minY)*-deltaY + m_size.height();
		return QPointF(x,y);
		}

Michal Klocek Refactor xychartitem -> xychart	r1218	QPointF XYChart::calculateGeometryPoint(int index) const
Michal Klocek Add missing files from previous commit	r466	{
		const qreal deltaX = m_size.width()/(m_maxX-m_minX);
		const qreal deltaY = m_size.height()/(m_maxY-m_minY);
Michal Klocek Fixes and improvments to series API...	r1057	const QList<QPointF>& vector = m_series->points();
		qreal x = (vector[index].x() - m_minX)* deltaX;
		qreal y = (vector[index].y() - m_minY)*-deltaY + m_size.height();
Michal Klocek Add missing files from previous commit	r466	return QPointF(x,y);
		}

Michal Klocek Refactor xychartitem -> xychart	r1218	QVector<QPointF> XYChart::calculateGeometryPoints() const
Michal Klocek Add missing files from previous commit	r466	{
		const qreal deltaX = m_size.width()/(m_maxX-m_minX);
		const qreal deltaY = m_size.height()/(m_maxY-m_minY);

Michal Klocek Fixes and improvments to series API...	r1057	QVector<QPointF> result;
		result.resize(m_series->count());
		const QList<QPointF>& vector = m_series->points();
Michal Klocek Add missing files from previous commit	r466	for (int i = 0; i < m_series->count(); ++i) {
Michal Klocek Fixes and improvments to series API...	r1057	qreal x = (vector[i].x() - m_minX)* deltaX;
		qreal y = (vector[i].y() - m_minY)*-deltaY + m_size.height();
		result[i].setX(x);
		result[i].setY(y);
Michal Klocek Add missing files from previous commit	r466	}
Michal Klocek Fixes and improvments to series API...	r1057	return result;
Michal Klocek Add missing files from previous commit	r466	}

Michal Klocek Refactor xychartitem -> xychart	r1218	QPointF XYChart::calculateDomainPoint(const QPointF &point) const
Michal Klocek Adds clicked(Point) to lineSeries, changes visible points handling	r544	{
		const qreal deltaX = m_size.width()/(m_maxX-m_minX);
		const qreal deltaY = m_size.height()/(m_maxY-m_minY);
		qreal x = point.x()/deltaX +m_minX;
		qreal y = (point.y()-m_size.height())/(-deltaY)+ m_minY;
		return QPointF(x,y);
		}

Michal Klocek Refactor xychartitem -> xychart	r1218	void XYChart::updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints,int index)
Michal Klocek Add missing files from previous commit	r466	{
Michal Klocek Refactors animation handling for xyseries	r1217	if (m_animation) {
		m_animation->setValues(oldPoints, newPoints, index);
		animator()->startAnimation(m_animation);
		}
		else {
		setGeometryPoints(newPoints);
		updateGeometry();
Michal Klocek Animation refactor...	r530	}
Michal Klocek Add missing files from previous commit	r466	}

		//handlers

Michal Klocek Refactor xychartitem -> xychart	r1218	void XYChart::handlePointAdded(int index)
Michal Klocek Add missing files from previous commit	r466	{
Marek Rosa QXYSeries: support for adding data to model when using custom mapping	r1054	if (m_series->model() == 0) {
		Q_ASSERT(index<m_series->count());
		Q_ASSERT(index>=0);
		}
Michal Klocek Refactors animation handling for xyseries	r1217
Marek Rosa Removed unfinished model related methods from PieSeries	r1018	QVector<QPointF> points = m_points;
		QPointF point;
Marek Rosa Removed all the unfinished model functionality from XYSeries and BarSeries	r990	point = calculateGeometryPoint(index);
		points.insert(index, point);
Michal Klocek Refactors animation handling for xyseries	r1217
		if(m_animation) {
		m_animation->setAnimationType(XYAnimation::LineDrawAnimation);
		}

		updateChart(m_points,points,index);
Michal Klocek Add missing files from previous commit	r466	}
Marek Rosa QXYSeries: support for adding data to model when using custom mapping	r1054
Michal Klocek Refactor xychartitem -> xychart	r1218	void XYChart::handlePointsAdded(int start, int end)
Michal Klocek Refactors animation handling for xyseries	r1217	{
Marek Rosa QXYSeries: support for adding data to model when using custom mapping	r1054	if (m_series->model() == 0) {
		for (int i = start; i <= end; i++)
Michal Klocek Refactors animation handling for xyseries	r1217	handlePointAdded(i);
		}
		else {
Marek Rosa Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.	r1164	int mapFirst = m_series->modelMapper()->first();
		int mapCount = m_series->modelMapper()->count();
		if (mapCount != -1 && start >= mapFirst + mapCount) {
		return;
Michal Klocek Refactors animation handling for xyseries	r1217	}
		else {
Marek Rosa Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.	r1164	int addedCount = end - start + 1;
		if (mapCount != -1 && addedCount > mapCount)
Michal Klocek Refactors animation handling for xyseries	r1217	addedCount = mapCount;
		int first = qMax(start, mapFirst); // get the index of the first item that will be added
		int last = qMin(first + addedCount - 1, mapCount + mapFirst - 1);// get the index of the last item that will be added
Marek Rosa Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.	r1164	for (int i = first; i <= last; i++) {
		handlePointAdded(i - mapFirst);
		}
		// the map is limited therefore the items that are now outside the map
		// need to be removed from the drawn points
		if (mapCount != -1 && m_points.size() > mapCount)
Michal Klocek Refactors animation handling for xyseries	r1217	for (int i = m_points.size() - 1; i >= mapCount; i--)
		handlePointRemoved(i);
Marek Rosa QXYSeries: support for adding data to model when using custom mapping	r1054	}
		}
		}

Michal Klocek Refactor xychartitem -> xychart	r1218	void XYChart::handlePointRemoved(int index)
Michal Klocek Adds big fat pimpl to series classes...	r938	{
Marek Rosa QXYSeries: support for adding data to model when using custom mapping	r1054	if (m_series->model() == 0) {
		Q_ASSERT(index<m_series->count() + 1);
		Q_ASSERT(index>=0);
		}
Marek Rosa Removed unfinished model related methods from PieSeries	r1018	QVector<QPointF> points = m_points;
Marek Rosa Removed all the unfinished model functionality from XYSeries and BarSeries	r990	points.remove(index);
Michal Klocek Refactors animation handling for xyseries	r1217
		if(m_animation) {
		m_animation->setAnimationType(XYAnimation::LineDrawAnimation);
		}

		updateChart(m_points,points,index);
Michal Klocek Add missing files from previous commit	r466	}

Michal Klocek Refactor xychartitem -> xychart	r1218	void XYChart::handlePointsRemoved(int start, int end)
Marek Rosa QXYSeries: support for adding data to model when using custom mapping	r1054	{
		Q_UNUSED(start)
		Q_UNUSED(end)
Marek Rosa QXYSeries: support for removing data from model when using custom mapping	r1055	if (m_series->model() == 0) {
		for (int i = end; i >= start; i--)
Michal Klocek Refactors animation handling for xyseries	r1217	handlePointRemoved(i);
		}
		else {
Marek Rosa QXYSeries: support for removing data from model when using custom mapping	r1055	// series uses model as a data source
Marek Rosa Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.	r1164	int mapFirst = m_series->modelMapper()->first();
		int mapCount = m_series->modelMapper()->count();
Marek Rosa QXYSeries: support for removing data from model when using custom mapping	r1055	int removedCount = end - start + 1;
Marek Rosa Refactored model related methods in XYSeries	r1065	if (mapCount != -1 && start >= mapFirst + mapCount) {
Marek Rosa QXYSeries: support for removing data from model when using custom mapping	r1055	return;
Michal Klocek Refactors animation handling for xyseries	r1217	}
		else {
		int toRemove = qMin(m_points.size(), removedCount); // first find how many items can actually be removed
		int first = qMax(start, mapFirst);// get the index of the first item that will be removed.
		int last = qMin(first + toRemove - 1, m_points.size() + mapFirst - 1);// get the index of the last item that will be removed.
Marek Rosa Improvements to QSpline model support	r1090	if (last - first == 0) {
		for (int i = last; i >= first; i--) {
		handlePointRemoved(i - mapFirst);

		}
Michal Klocek Refactors animation handling for xyseries	r1217	}
		else {
Marek Rosa Improvements to QSpline model support	r1090	QVector<QPointF> points = m_points;
		for (int i = last; i >= first; i--)
Michal Klocek Refactors animation handling for xyseries	r1217	points.remove(i - mapFirst);
		setGeometryPoints(points);
		updateGeometry();
Marek Rosa Spline series now recalcutes control points on adding/removing data to/from model	r1072	}
Marek Rosa Refactored model related methods in XYSeries	r1065	if (mapCount != -1) {
Michal Klocek Refactors animation handling for xyseries	r1217	int itemsAvailable; // check how many are available to be added
Marek Rosa Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.	r1164	if (m_series->modelMapper()->orientation() == Qt::Vertical)
Michal Klocek Refactors animation handling for xyseries	r1217	itemsAvailable = m_series->model()->rowCount() - mapFirst - m_points.size();
Marek Rosa Refactored model related methods in XYSeries	r1065	else
Michal Klocek Refactors animation handling for xyseries	r1217	itemsAvailable = m_series->model()->columnCount() - mapFirst - m_points.size();
		int toBeAdded = qMin(itemsAvailable, mapCount - m_points.size());// add not more items than there is space left to be filled.
Marek Rosa Refactored model related methods in XYSeries	r1065	int currentSize = m_points.size();
		if (toBeAdded > 0)
Michal Klocek Refactors animation handling for xyseries	r1217	for (int i = m_points.size(); i < currentSize + toBeAdded; i++) {
		handlePointAdded(i);
		}
Marek Rosa Refactored model related methods in XYSeries	r1065	}
Marek Rosa QXYSeries: support for removing data from model when using custom mapping	r1055	}
		}

Marek Rosa QXYSeries: support for adding data to model when using custom mapping	r1054	}

Michal Klocek Refactor xychartitem -> xychart	r1218	void XYChart::handlePointReplaced(int index)
Michal Klocek Add missing files from previous commit	r466	{
		Q_ASSERT(index<m_series->count());
		Q_ASSERT(index>=0);
		QPointF point = calculateGeometryPoint(index);
Michal Klocek Refactor animation to fit line,spline,scatter...	r476	QVector<QPointF> points = m_points;
Marek Rosa QXYSeries: model data orientation added. QBarSeries: some model data function placeholders	r527	points.replace(index,point);
Michal Klocek Refactors animation handling for xyseries	r1217
		if(m_animation) {
		m_animation->setAnimationType(XYAnimation::MoveDownAnimation);
		}

		updateChart(m_points,points,index);
Michal Klocek Add missing files from previous commit	r466	}

Michal Klocek Refactor xychartitem -> xychart	r1218	void XYChart::handleReinitialized()
Marek Rosa XYSeries model support refactored	r1085	{
		QVector<QPointF> points = calculateGeometryPoints();
Michal Klocek Refactors animation handling for xyseries	r1217
		if(m_animation) {
		m_animation->setAnimationType(XYAnimation::LineDrawAnimation);
		}

		updateChart(m_points,points);
Marek Rosa XYSeries model support refactored	r1085	}

Michal Klocek Refactor xychartitem -> xychart	r1218	void XYChart::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)
Michal Klocek Add missing files from previous commit	r466	{
		m_minX=minX;
		m_maxX=maxX;
		m_minY=minY;
		m_maxY=maxY;
sauimone minor code review issues. indent, spaces, brackets etc.	r743	if (isEmpty()) return;
Michal Klocek Add missing files from previous commit	r466	QVector<QPointF> points = calculateGeometryPoints();
Michal Klocek Refactors animation handling for xyseries	r1217
		if(m_animation) {
Michal Klocek prevents flipping in xyseries animation	r1220	m_animation->setAnimationType(XYAnimation::MoveDownAnimation);
Michal Klocek Refactors animation handling for xyseries	r1217	}
		updateChart(m_points,points);
Michal Klocek Add missing files from previous commit	r466	}

Michal Klocek Refactor xychartitem -> xychart	r1218	void XYChart::handleGeometryChanged(const QRectF &rect)
Michal Klocek Add missing files from previous commit	r466	{
Marek Rosa XYSeries model with limits working.	r833	Q_ASSERT(rect.isValid());
		m_size=rect.size();
		m_clipRect=rect.translated(-rect.topLeft());
Michal Klocek Refactor xychartitem -> xychart	r1218	m_origin=rect.topLeft();
Michal Klocek Add missing files from previous commit	r466
sauimone minor code review issues. indent, spaces, brackets etc.	r743	if (isEmpty()) return;
Marek Rosa XYSeries model with limits working.	r833	QVector<QPointF> points = calculateGeometryPoints();
Michal Klocek Refactors animation handling for xyseries	r1217	if(m_animation) {
		m_animation->setAnimationType(XYAnimation::LineDrawAnimation);
		}
		updateChart(m_points,points);
Michal Klocek Add missing files from previous commit	r466	}

Michal Klocek Refactor xychartitem -> xychart	r1218	bool XYChart::isEmpty()
Michal Klocek Add missing files from previous commit	r466	{
Michal Klocek Bugfixes for spline vector allocation issues	r1082	return !m_clipRect.isValid() \|\| qFuzzyIsNull(m_maxX - m_minX) \|\| qFuzzyIsNull(m_maxY - m_minY) \|\| m_series->points().isEmpty();
Michal Klocek Add missing files from previous commit	r466	}

Michal Klocek Refactor xychartitem -> xychart	r1218	#include "moc_xychart_p.cpp"
Michal Klocek Add missing files from previous commit	r466
		QTCOMMERCIALCHART_END_NAMESPACE