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

Renames header axisitem -> axis

Michal Klocek - - Load All Authors

File last commit:

r943:d79a954416af


                r959:6fbac6697666

Download file

             chartdataset.cpp
        
                    259 lines
            
             | 6.4 KiB
            
                | text/x-c
            
             |
                CppLexer
            
             / src / chartdataset.cpp
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Michal Klocek
    
Updates chartdataset unit test

              r771
            
      /****************************************************************************

      **

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

      **

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

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
      #include "chartdataset_p.h"

        Michal Klocek
    
Refactors axis handling...

              r223
            
      #include "qchartaxis.h"

        Michal Klocek
    
Refactored for MVP...

              r139
            
      //series

        Michal Klocek
    
Refactor to use qseries private for implmentation interface...

              r943
            
      #include "qseries_p.h"

        Michal Klocek
    
Rename QLineChartSeries to QLineSeries

              r349
            
      #include "qlineseries.h"

        Michal Klocek
    
Adds area chart...

              r421
            
      #include "qareaseries.h"

        sauimone
    
Naming convention change for barcharts. QBarChartSeries is now QBarSeries etc.

              r338
            
      #include "qbarseries.h"

      #include "qstackedbarseries.h"

      #include "qpercentbarseries.h"

        Jani Honkonen
    
Moved pie stuff to own .pri file and rename stuff

              r146
            
      #include "qpieseries.h"

        Tero Ahola
    
Integrated scatter again. Missing functionality....

              r158
            
      #include "qscatterseries.h"

        Marek Rosa
    
Spline working somewhat

              r401
            
      #include "qsplineseries.h"

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        Michal Klocek
    
Refactors axis handling...

              r223
            
      ChartDataSet::ChartDataSet(QObject *parent):QObject(parent),

        Marek Rosa
    
Spline working somewhat

              r401
            
          m_axisX(new QChartAxis(this)),

          m_axisY(new QChartAxis(this)),

          m_domainIndex(0),

          m_axisXInitialized(false)

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
      {

      }

      ChartDataSet::~ChartDataSet()

      {

      }

        Michal Klocek
    
Rename QChartSeries to QSeries

              r360
            
      void ChartDataSet::addSeries(QSeries* series, QChartAxis *axisY)

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
      {

        Michal Klocek
    
Refactor domain model...

              r439
            
          if(axisY==0) axisY = m_axisY;

        Michal Klocek
    
Refactored for MVP...

              r139
            
        Michal Klocek
    
Fix indexing issue of series

              r910
            
          QChartAxis* axis = m_seriesAxisMap.value(series);

          if(axis) {

        Michal Klocek
    
Refactor domain model...

              r439
            
              qWarning() << "Can not add series. Series already on the chart";

              return;

          }

        Michal Klocek
    
Refactors axis handling...

              r223
            
        Michal Klocek
    
Refactor domain model...

              r439
            
          if(!series->parent()){

             series->setParent(this); // take ownership

          };

        Michal Klocek
    
Refactors axis handling...

              r223
            
        Michal Klocek
    
Refactor domain model...

              r439
            
          if(!axisY->parent()){

             axisY->setParent(this); // take ownership

          }

        Michal Klocek
    
Refactors axis handling...

              r223
            
        Michal Klocek
    
Refactor domain model...

              r439
            
          Domain* domain = m_axisDomainMap.value(axisY);

        Michal Klocek
    
Fix indexing issue of series

              r910
            
          if(!domain) {

        Michal Klocek
    
Adds owvership to domain

              r787
            
              domain = new Domain(axisY);

        Michal Klocek
    
Fix worng slot signature in axis initilization

              r688
            
              QObject::connect(axisY,SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisYChanged(qreal,qreal,int,bool)));

              QObject::connect(axisX(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisXChanged(qreal,qreal,int,bool)));

        Michal Klocek
    
Adds loosenumber algorithm...

              r678
            
              QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),axisY,SLOT(handleAxisRangeChanged(qreal,qreal,int)));

              QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),axisX(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));

        Michal Klocek
    
Bugfix missing min max intialization when axis added to domain

              r442
            
              //initialize

        Michal Klocek
    
Refactor domain model...

              r439
            
              m_axisDomainMap.insert(axisY,domain);

              emit axisAdded(axisY,domain);

        Marek Rosa
    
Spline working somewhat

              r401
            
          }

        Michal Klocek
    
Adds area chart...

              r421
            
        Michal Klocek
    
Fix indexing issue of series

              r910
            
          if(!m_axisXInitialized){

             emit axisAdded(axisX(),domain);

             m_axisXInitialized=true;

        Michal Klocek
    
Refactor domain model...

              r439
            
          }

        Michal Klocek
    
Adds area chart...

              r421
            
        Michal Klocek
    
Refactor to use qseries private for implmentation interface...

              r943
            
          series->d_ptr->scaleDomain(*domain);

          if(series->type() == QSeries::SeriesTypeBar || series->type() == QSeries::SeriesTypeStackedBar || series->type() == QSeries::SeriesTypePercentBar)

          {

              QBarSeries* barSeries = static_cast<QBarSeries*>(series);

              setupCategories(barSeries);

          }

          if (series->type()== QSeries::SeriesTypePie &&  m_seriesAxisMap.count()==0)

          {

              axisX()->hide();

              this->axisY()->hide();

          }

        Michal Klocek
    
Adds area chart...

              r421
            
        Michal Klocek
    
Fix indexing issue of series

              r910
            
          m_seriesAxisMap.insert(series,axisY);

          QMapIterator<int, QSeries*> i(m_indexSeriesMap);

          int key=0;

          while (i.hasNext()) {

              i.next();

              if(i.key()!=key) {

                  break;

              }

              key++;

          }

          m_indexSeriesMap.insert(key,series);

          emit seriesAdded(series,domain);

        Michal Klocek
    
Refactored for MVP...

              r139
            
        Michal Klocek
    
Refactor domain model...

              r439
            
      }

        Jani Honkonen
    
Pie chart refactoring

              r142
            
        Michal Klocek
    
Refactor domain model...

              r439
            
      void ChartDataSet::removeSeries(QSeries* series)

      {

        Michal Klocek
    
Fix indexing issue of series

              r910
            
          QChartAxis* axis = m_seriesAxisMap.value(series);

          if(!axis){

              qWarning()<<"Can not remove series. Series not found on the chart.";

        Marek Rosa
    
Spline working somewhat

              r401
            
              return;

          }

        Michal Klocek
    
Fix indexing issue of series

              r910
            
          emit seriesRemoved(series);

          m_seriesAxisMap.remove(series);

          int key = seriesIndex(series);

          Q_ASSERT(key!=-1);

        Michal Klocek
    
Refactored for MVP...

              r139
            
        Michal Klocek
    
Fix indexing issue of series

              r910
            
          m_indexSeriesMap.remove(key);

        Tero Ahola
    
Reserve ordering of chart series internally....

              r825
            
        Michal Klocek
    
Fix indexing issue of series

              r910
            
          if(series->parent()==this){

        Michal Klocek
    
Refactor domain model...

              r439
            
              delete series;

        Michal Klocek
    
Fix indexing issue of series

              r910
            
              series=0;

        Michal Klocek
    
Refactored for MVP...

              r139
            
          }

        Michal Klocek
    
Fix indexing issue of series

              r910
            
          QList<QChartAxis*> axes =  m_seriesAxisMap.values();

          int i = axes.indexOf(axis);

        Michal Klocek
    
Refactors axis handling...

              r223
            
        Michal Klocek
    
Fix indexing issue of series

              r910
            
          if(i==-1){

        Michal Klocek
    
Refactor domain model...

              r439
            
              Domain* domain = m_axisDomainMap.take(axis);

              emit axisRemoved(axis);

        Michal Klocek
    
Fix indexing issue of series

              r910
            
              if(axis!=axisY()){

                  if(axis->parent()==this){

        Michal Klocek
    
Fix ownership handling: if object has a parent do not delete it

              r444
            
                      delete axis;

        Michal Klocek
    
Fix indexing issue of series

              r910
            
                      axis=0;

        Michal Klocek
    
Fix ownership handling: if object has a parent do not delete it

              r444
            
                  }

              }

        Michal Klocek
    
Refactor domain model...

              r439
            
              delete domain;

          }

        Michal Klocek
    
Refactors axis handling...

              r223
            
        Michal Klocek
    
Fix indexing issue of series

              r910
            
          if(m_seriesAxisMap.values().size()==0)

          {

              m_axisXInitialized=false;

        Michal Klocek
    
Refactor domain model...

              r439
            
              emit axisRemoved(axisX());

        Michal Klocek
    
Refactors axis handling...

              r223
            
          }

        Michal Klocek
    
Refactored for MVP...

              r139
            
      }

        Michal Klocek
    
Adds RemoveAllSeries method to API

              r258
            
      void ChartDataSet::removeAllSeries()

      {

        Michal Klocek
    
Fix indexing issue of series

              r910
            
          QList<QSeries*> series =  m_seriesAxisMap.keys();

          foreach(QSeries* s , series) {

              removeSeries(s);

        Michal Klocek
    
Refactored for MVP...

              r139
            
          }

        Michal Klocek
    
Fix indexing issue of series

              r910
            
          Q_ASSERT(m_seriesAxisMap.count()==0);

          Q_ASSERT(m_axisDomainMap.count()==0);

        Michal Klocek
    
Refactored for MVP...

              r139
            
      }

        Michal Klocek
    
Adds back reimplemnted categories handling

              r701
            
      void ChartDataSet::setupCategories(QBarSeries* series)

      {

         QChartAxisCategories* categories = axisX()->categories();

         categories->clear();

        Michal Klocek
    
Adds BarCategories typedef

              r703
            
         categories->insert(series->categories());

        Michal Klocek
    
Refactored for MVP...

              r139
            
      }

        Michal Klocek
    
Refactor domain model...

              r439
            
      void ChartDataSet::zoomInDomain(const QRectF& rect, const QSizeF& size)

        Michal Klocek
    
Refactored for MVP...

              r139
            
      {

        Michal Klocek
    
Updates chartdataset unit test

              r771
            
          QMapIterator<QChartAxis*, Domain*> i(m_axisDomainMap);

        Michal Klocek
    
Refactor domain model...

              r439
            
          while (i.hasNext()) {

              i.next();

              i.value()->zoomIn(rect,size);

        Michal Klocek
    
Refactors axis handling...

              r223
            
          }

        Michal Klocek
    
Refactor domain model...

              r439
            
      }

        Michal Klocek
    
Refactors axis handling...

              r223
            
        Michal Klocek
    
Refactor domain model...

              r439
            
      void ChartDataSet::zoomOutDomain(const QRectF& rect, const QSizeF& size)

      {

        Michal Klocek
    
Updates chartdataset unit test

              r771
            
          QMapIterator<QChartAxis*, Domain*> i(m_axisDomainMap);

        Michal Klocek
    
Refactor domain model...

              r439
            
          while (i.hasNext()) {

              i.next();

              i.value()->zoomOut(rect,size);

          }

        Michal Klocek
    
Refactors axis handling...

              r223
            
      }

        Michal Klocek
    
Fix indexing issue of series

              r910
            
      int ChartDataSet::seriesCount(QSeries::QSeriesType type)

      {

          int count=0;

          QMapIterator<QSeries*, QChartAxis*> i(m_seriesAxisMap);

          while (i.hasNext()) {

                 i.next();

                 if(i.key()->type()==type) count++;

          }

          return count;

      }

      int ChartDataSet::seriesIndex(QSeries *series)

        Tero Ahola
    
Fixed bug with changing theme when several series exist

              r538
            
      {

        Michal Klocek
    
Fix indexing issue of series

              r910
            
          QMapIterator<int, QSeries*> i(m_indexSeriesMap);

          while (i.hasNext()) {

              i.next();

              if (i.value() == series)

                  return i.key();

        Tero Ahola
    
Fixed bug with changing theme when several series exist

              r538
            
          }

        Tero Ahola
    
Reserve ordering of chart series internally....

              r825
            
          return -1;

        Tero Ahola
    
Fixed bug with changing theme when several series exist

              r538
            
      }

        Michal Klocek
    
Rename QChartSeries to QSeries

              r360
            
      QChartAxis* ChartDataSet::axisY(QSeries* series) const

        Michal Klocek
    
Refactors axis handling...

              r223
            
      {

        Michal Klocek
    
Fix indexing issue of series

              r910
            
          if(series == 0) return m_axisY;

          return m_seriesAxisMap.value(series);

        Michal Klocek
    
Refactors axis handling...

              r223
            
      }

        Michal Klocek
    
Refactor domain model...

              r439
            
      Domain* ChartDataSet::domain(QSeries* series) const

        Michal Klocek
    
Refactors axis handling...

              r223
            
      {

        Michal Klocek
    
Fix indexing issue of series

              r910
            
      	QChartAxis* axis = m_seriesAxisMap.value(series);

      	if(axis){

        Michal Klocek
    
Refactor domain model...

              r439
            
      		return m_axisDomainMap.value(axis);

        Michal Klocek
    
Fix indexing issue of series

              r910
            
      	}else

      		return 0;

        Michal Klocek
    
Refactors axis handling...

              r223
            
      }

        Michal Klocek
    
Refactor domain model...

              r439
            
      Domain* ChartDataSet::domain(QChartAxis* axis) const

        Michal Klocek
    
Refactors axis handling...

              r223
            
      {

        Michal Klocek
    
Updates chartdataset unit test

              r771
            
          if(!axis || axis==axisX()) {

        Michal Klocek
    
Fix ownership handling: if object has a parent do not delete it

              r444
            
              return  m_axisDomainMap.value(axisY());

          }

          else {

              return m_axisDomainMap.value(axis);

          }

        Michal Klocek
    
Refactors axis handling...

              r223
            
      }

        Michal Klocek
    
Adds scroll support...

              r531
            
      void ChartDataSet::scrollDomain(int dx,int dy,const QSizeF& size)

      {

      	 QMapIterator<QChartAxis*, Domain*> i( m_axisDomainMap);

      	 	while (i.hasNext()) {

      	        i.next();

      	        i.value()->move(dx,dy,size);

      	    }

      }

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
      #include "moc_chartdataset_p.cpp"

      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

Michal Klocek Updates chartdataset unit test	r771	/****************************************************************************
		**
		** 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$
		**
		****************************************************************************/

Michal Klocek Refactors qchart , adds line animation...	r131	#include "chartdataset_p.h"
Michal Klocek Refactors axis handling...	r223	#include "qchartaxis.h"
Michal Klocek Refactored for MVP...	r139	//series
Michal Klocek Refactor to use qseries private for implmentation interface...	r943	#include "qseries_p.h"
Michal Klocek Rename QLineChartSeries to QLineSeries	r349	#include "qlineseries.h"
Michal Klocek Adds area chart...	r421	#include "qareaseries.h"
sauimone Naming convention change for barcharts. QBarChartSeries is now QBarSeries etc.	r338	#include "qbarseries.h"
		#include "qstackedbarseries.h"
		#include "qpercentbarseries.h"
Jani Honkonen Moved pie stuff to own .pri file and rename stuff	r146	#include "qpieseries.h"
Tero Ahola Integrated scatter again. Missing functionality....	r158	#include "qscatterseries.h"
Marek Rosa Spline working somewhat	r401	#include "qsplineseries.h"
Michal Klocek Refactors qchart , adds line animation...	r131
		QTCOMMERCIALCHART_BEGIN_NAMESPACE

Michal Klocek Refactors axis handling...	r223	ChartDataSet::ChartDataSet(QObject *parent):QObject(parent),
Marek Rosa Spline working somewhat	r401	m_axisX(new QChartAxis(this)),
		m_axisY(new QChartAxis(this)),
		m_domainIndex(0),
		m_axisXInitialized(false)
Michal Klocek Refactors qchart , adds line animation...	r131	{
		}

		ChartDataSet::~ChartDataSet()
		{
		}

Michal Klocek Rename QChartSeries to QSeries	r360	void ChartDataSet::addSeries(QSeries* series, QChartAxis *axisY)
Michal Klocek Refactors qchart , adds line animation...	r131	{
Michal Klocek Refactor domain model...	r439	if(axisY==0) axisY = m_axisY;
Michal Klocek Refactored for MVP...	r139
Michal Klocek Fix indexing issue of series	r910	QChartAxis* axis = m_seriesAxisMap.value(series);

		if(axis) {
Michal Klocek Refactor domain model...	r439	qWarning() << "Can not add series. Series already on the chart";
		return;
		}
Michal Klocek Refactors axis handling...	r223
Michal Klocek Refactor domain model...	r439	if(!series->parent()){
		series->setParent(this); // take ownership
		};
Michal Klocek Refactors axis handling...	r223
Michal Klocek Refactor domain model...	r439	if(!axisY->parent()){
		axisY->setParent(this); // take ownership
		}
Michal Klocek Refactors axis handling...	r223
Michal Klocek Refactor domain model...	r439	Domain* domain = m_axisDomainMap.value(axisY);
Michal Klocek Fix indexing issue of series	r910
		if(!domain) {
Michal Klocek Adds owvership to domain	r787	domain = new Domain(axisY);
Michal Klocek Fix worng slot signature in axis initilization	r688	QObject::connect(axisY,SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisYChanged(qreal,qreal,int,bool)));
		QObject::connect(axisX(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisXChanged(qreal,qreal,int,bool)));
Michal Klocek Adds loosenumber algorithm...	r678	QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),axisY,SLOT(handleAxisRangeChanged(qreal,qreal,int)));
		QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),axisX(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
Michal Klocek Bugfix missing min max intialization when axis added to domain	r442	//initialize
Michal Klocek Refactor domain model...	r439	m_axisDomainMap.insert(axisY,domain);
		emit axisAdded(axisY,domain);
Marek Rosa Spline working somewhat	r401	}
Michal Klocek Adds area chart...	r421
Michal Klocek Fix indexing issue of series	r910	if(!m_axisXInitialized){
		emit axisAdded(axisX(),domain);
		m_axisXInitialized=true;
Michal Klocek Refactor domain model...	r439	}
Michal Klocek Adds area chart...	r421
Michal Klocek Refactor to use qseries private for implmentation interface...	r943	series->d_ptr->scaleDomain(*domain);

		if(series->type() == QSeries::SeriesTypeBar \|\| series->type() == QSeries::SeriesTypeStackedBar \|\| series->type() == QSeries::SeriesTypePercentBar)
		{
		QBarSeries* barSeries = static_cast<QBarSeries*>(series);
		setupCategories(barSeries);
		}

		if (series->type()== QSeries::SeriesTypePie && m_seriesAxisMap.count()==0)
		{
		axisX()->hide();
		this->axisY()->hide();
		}
Michal Klocek Adds area chart...	r421
Michal Klocek Fix indexing issue of series	r910	m_seriesAxisMap.insert(series,axisY);

		QMapIterator<int, QSeries*> i(m_indexSeriesMap);

		int key=0;
		while (i.hasNext()) {
		i.next();
		if(i.key()!=key) {
		break;
		}
		key++;
		}

		m_indexSeriesMap.insert(key,series);

		emit seriesAdded(series,domain);
Michal Klocek Refactored for MVP...	r139
Michal Klocek Refactor domain model...	r439	}
Jani Honkonen Pie chart refactoring	r142
Michal Klocek Refactor domain model...	r439	void ChartDataSet::removeSeries(QSeries* series)
		{
Michal Klocek Fix indexing issue of series	r910
		QChartAxis* axis = m_seriesAxisMap.value(series);

		if(!axis){
		qWarning()<<"Can not remove series. Series not found on the chart.";
Marek Rosa Spline working somewhat	r401	return;
		}
Michal Klocek Fix indexing issue of series	r910	emit seriesRemoved(series);
		m_seriesAxisMap.remove(series);
		int key = seriesIndex(series);
		Q_ASSERT(key!=-1);
Michal Klocek Refactored for MVP...	r139
Michal Klocek Fix indexing issue of series	r910	m_indexSeriesMap.remove(key);
Tero Ahola Reserve ordering of chart series internally....	r825
Michal Klocek Fix indexing issue of series	r910	if(series->parent()==this){
Michal Klocek Refactor domain model...	r439	delete series;
Michal Klocek Fix indexing issue of series	r910	series=0;
Michal Klocek Refactored for MVP...	r139	}

Michal Klocek Fix indexing issue of series	r910	QList<QChartAxis*> axes = m_seriesAxisMap.values();

		int i = axes.indexOf(axis);
Michal Klocek Refactors axis handling...	r223
Michal Klocek Fix indexing issue of series	r910	if(i==-1){
Michal Klocek Refactor domain model...	r439	Domain* domain = m_axisDomainMap.take(axis);
		emit axisRemoved(axis);
Michal Klocek Fix indexing issue of series	r910	if(axis!=axisY()){
		if(axis->parent()==this){
Michal Klocek Fix ownership handling: if object has a parent do not delete it	r444	delete axis;
Michal Klocek Fix indexing issue of series	r910	axis=0;
Michal Klocek Fix ownership handling: if object has a parent do not delete it	r444	}
		}
Michal Klocek Refactor domain model...	r439	delete domain;
		}
Michal Klocek Refactors axis handling...	r223
Michal Klocek Fix indexing issue of series	r910	if(m_seriesAxisMap.values().size()==0)
		{
		m_axisXInitialized=false;
Michal Klocek Refactor domain model...	r439	emit axisRemoved(axisX());
Michal Klocek Refactors axis handling...	r223	}
Michal Klocek Refactored for MVP...	r139	}

Michal Klocek Adds RemoveAllSeries method to API	r258	void ChartDataSet::removeAllSeries()
		{
Michal Klocek Fix indexing issue of series	r910
		QList<QSeries*> series = m_seriesAxisMap.keys();

		foreach(QSeries* s , series) {
		removeSeries(s);
Michal Klocek Refactored for MVP...	r139	}

Michal Klocek Fix indexing issue of series	r910	Q_ASSERT(m_seriesAxisMap.count()==0);
		Q_ASSERT(m_axisDomainMap.count()==0);

Michal Klocek Refactored for MVP...	r139	}

Michal Klocek Adds back reimplemnted categories handling	r701	void ChartDataSet::setupCategories(QBarSeries* series)
		{
		QChartAxisCategories* categories = axisX()->categories();
		categories->clear();
Michal Klocek Adds BarCategories typedef	r703	categories->insert(series->categories());
Michal Klocek Refactored for MVP...	r139	}

Michal Klocek Refactor domain model...	r439	void ChartDataSet::zoomInDomain(const QRectF& rect, const QSizeF& size)
Michal Klocek Refactored for MVP...	r139	{
Michal Klocek Updates chartdataset unit test	r771	QMapIterator<QChartAxis, Domain> i(m_axisDomainMap);
Michal Klocek Refactor domain model...	r439	while (i.hasNext()) {
		i.next();
		i.value()->zoomIn(rect,size);
Michal Klocek Refactors axis handling...	r223	}
Michal Klocek Refactor domain model...	r439	}
Michal Klocek Refactors axis handling...	r223
Michal Klocek Refactor domain model...	r439	void ChartDataSet::zoomOutDomain(const QRectF& rect, const QSizeF& size)
		{
Michal Klocek Updates chartdataset unit test	r771	QMapIterator<QChartAxis, Domain> i(m_axisDomainMap);
Michal Klocek Refactor domain model...	r439	while (i.hasNext()) {
		i.next();
		i.value()->zoomOut(rect,size);
		}
Michal Klocek Refactors axis handling...	r223	}

Michal Klocek Fix indexing issue of series	r910	int ChartDataSet::seriesCount(QSeries::QSeriesType type)
		{
		int count=0;
		QMapIterator<QSeries, QChartAxis> i(m_seriesAxisMap);
		while (i.hasNext()) {
		i.next();
		if(i.key()->type()==type) count++;
		}
		return count;
		}

		int ChartDataSet::seriesIndex(QSeries *series)
Tero Ahola Fixed bug with changing theme when several series exist	r538	{
Michal Klocek Fix indexing issue of series	r910	QMapIterator<int, QSeries*> i(m_indexSeriesMap);
		while (i.hasNext()) {
		i.next();
		if (i.value() == series)
		return i.key();
Tero Ahola Fixed bug with changing theme when several series exist	r538	}
Tero Ahola Reserve ordering of chart series internally....	r825	return -1;
Tero Ahola Fixed bug with changing theme when several series exist	r538	}

Michal Klocek Rename QChartSeries to QSeries	r360	QChartAxis* ChartDataSet::axisY(QSeries* series) const
Michal Klocek Refactors axis handling...	r223	{
Michal Klocek Fix indexing issue of series	r910	if(series == 0) return m_axisY;
		return m_seriesAxisMap.value(series);
Michal Klocek Refactors axis handling...	r223	}

Michal Klocek Refactor domain model...	r439	Domain* ChartDataSet::domain(QSeries* series) const
Michal Klocek Refactors axis handling...	r223	{
Michal Klocek Fix indexing issue of series	r910	QChartAxis* axis = m_seriesAxisMap.value(series);
		if(axis){
Michal Klocek Refactor domain model...	r439	return m_axisDomainMap.value(axis);
Michal Klocek Fix indexing issue of series	r910	}else
		return 0;
Michal Klocek Refactors axis handling...	r223	}

Michal Klocek Refactor domain model...	r439	Domain* ChartDataSet::domain(QChartAxis* axis) const
Michal Klocek Refactors axis handling...	r223	{
Michal Klocek Updates chartdataset unit test	r771	if(!axis \|\| axis==axisX()) {
Michal Klocek Fix ownership handling: if object has a parent do not delete it	r444	return m_axisDomainMap.value(axisY());
		}
		else {
		return m_axisDomainMap.value(axis);
		}
Michal Klocek Refactors axis handling...	r223	}

Michal Klocek Adds scroll support...	r531	void ChartDataSet::scrollDomain(int dx,int dy,const QSizeF& size)
		{
		QMapIterator<QChartAxis, Domain> i( m_axisDomainMap);
		while (i.hasNext()) {
		i.next();
		i.value()->move(dx,dy,size);
		}
		}

Michal Klocek Refactors qchart , adds line animation...	r131	#include "moc_chartdataset_p.cpp"

		QTCOMMERCIALCHART_END_NAMESPACE