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

added description of using barcategory axis with line chart

Michal Klocek - - Load All Authors

File last commit:

r1641:86403ed53535


                r1650:d4aaf12f2380

Download file

             chartdataset.cpp
        
                    464 lines
            
             | 12.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"

        Jani Honkonen
    
Implemented QAbstractSeries::chart()...

              r1314
            
      #include "qchart.h"

        Michal Klocek
    
Refactors QAxis to QAbstractAxis...

              r1541
            
      #include "qvaluesaxis.h"

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2

              r1613
            
      #include "qbarcategoriesaxis.h"

        Michal Klocek
    
Refactors QAxis to QAbstractAxis...

              r1541
            
      #include "qvaluesaxis_p.h"

        Tero Ahola
    
Renamed QSeries to QAbstractSeries

              r988
            
      #include "qabstractseries_p.h"

        sauimone
    
renamed barseries files to abstractbarseries

              r1586
            
      #include "qabstractbarseries.h"

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

              r338
            
      #include "qstackedbarseries.h"

      #include "qpercentbarseries.h"

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

              r146
            
      #include "qpieseries.h"

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
      QTCOMMERCIALCHART_BEGIN_NAMESPACE

        Jani Honkonen
    
Implemented QAbstractSeries::chart()...

              r1314
            
      ChartDataSet::ChartDataSet(QChart *parent):QObject(parent),

        Michal Klocek
    
Refactors core to support mulitpile axis and domains...

              r1556
            
          m_domainIndex(0)

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
      {

        Michal Klocek
    
Refactors core to support mulitpile axis and domains...

              r1556
            
        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
      }

      ChartDataSet::~ChartDataSet()

      {

        Michal Klocek
    
Adds if series deleted , remove series from chart

              r1062
            
          removeAllSeries();

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
      }

        Michal Klocek
    
Refactors QAxis to QAbstractAxis...

              r1541
            
      void ChartDataSet::addSeries(QAbstractSeries* series)

        Michal Klocek
    
Refactors qchart , adds line animation...

              r131
            
      {

        Michal Klocek
    
Refactor QChart API...

              r1577
            
          Domain* domain = m_seriesDomainMap.value(series);

        Michal Klocek
    
Fix indexing issue of series

              r910
            
        Michal Klocek
    
Refactor QChart API...

              r1577
            
          if(domain) {

        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
    
Krazy reported errors...

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

        Michal Klocek
    
Refactors axis handling...

              r223
            
        Michal Klocek
    
Refactor QChart API...

              r1577
            
          domain = new Domain(series);

        Michal Klocek
    
Adds area chart...

              r421
            
        Michal Klocek
    
Refactors core to support mulitpile axis and domains...

              r1556
            
          m_seriesDomainMap.insert(series,domain);

        Michal Klocek
    
Adds area chart...

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

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

        Tero Ahola
    
Renamed QSeries to QAbstractSeries

              r988
            
          QMapIterator<int, QAbstractSeries*> i(m_indexSeriesMap);

        Michal Klocek
    
Fix indexing issue of series

              r910
            
          int key=0;

          while (i.hasNext()) {

              i.next();

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

                  break;

              }

              key++;

          }

          m_indexSeriesMap.insert(key,series);

        Jani Honkonen
    
Implemented QAbstractSeries::chart()...

              r1314
            
          series->d_ptr->m_chart = qobject_cast<QChart*>(parent());

          series->d_ptr->m_dataset = this;

        Michal Klocek
    
Adds if series deleted , remove series from chart

              r1062
            
        Michal Klocek
    
Fix indexing issue of series

              r910
            
          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 QChart API...

              r1577
            
      void ChartDataSet::createDefaultAxes()

      {

        Michal Klocek
    
Adds createDefaultAxes logic

              r1588
            
          if(m_seriesDomainMap.isEmpty()) return;

          QAbstractAxis::AxisTypes typeX(0);

          QAbstractAxis::AxisTypes typeY(0);

          QMapIterator<QAbstractSeries*, Domain*> i(m_seriesDomainMap);

        Michal Klocek
    
Refactor QChart API...

              r1577
            
          while (i.hasNext()) {

        Michal Klocek
    
Adds createDefaultAxes logic

              r1588
            
                     i.next();

                     removeAxes(i.key());

          }

        Michal Klocek
    
Refactor QChart API...

              r1577
            
        Michal Klocek
    
Adds createDefaultAxes logic

              r1588
            
          i.toFront();

        Michal Klocek
    
Refactor QChart API...

              r1577
            
        Michal Klocek
    
Adds createDefaultAxes logic

              r1588
            
          while (i.hasNext()) {

                  i.next();

                  QAbstractAxis* axisX = m_seriesAxisXMap.value(i.key());

                  QAbstractAxis* axisY = m_seriesAxisYMap.value(i.key());

                  if(axisX) typeX&=axisX->type();

                  else typeX|=i.key()->d_ptr->defaultAxisXType();

                  if(axisY) typeY&=axisY->type();

                  else typeY|=i.key()->d_ptr->defaultAxisYType();

          }

        Michal Klocek
    
Refactor QChart API...

              r1577
            
        Michal Klocek
    
Adds createDefaultAxes logic

              r1588
            
          if(typeX.testFlag(QAbstractAxis::AxisTypeValues) && typeX.testFlag(QAbstractAxis::AxisTypeCategories))

          {

              i.toFront();

              while (i.hasNext()) {

                     i.next();

                     QAbstractAxis* axis = createAxis(i.key()->d_ptr->defaultAxisXType());

        Michal Klocek
    
Fixes for qmlcustom model

              r1616
            
                     if(!axis) continue;

        Michal Klocek
    
Adds createDefaultAxes logic

              r1588
            
                     i.key()->d_ptr->initializeAxisX(axis);

                     addAxisX(axis,i.key());

                     emit axisAdded(axis,i.value());

        Michal Klocek
    
Refactor QChart API...

              r1577
            
              }

        Michal Klocek
    
Adds createDefaultAxes logic

              r1588
            
          }else if(!typeY.testFlag(QAbstractAxis::AxisTypeNoAxis)){

              QAbstractAxis* axis = createAxis(QAbstractAxis::AxisType(int(typeX)));

              i.toFront();

                    while (i.hasNext()) {

                           i.next();

                           i.key()->d_ptr->initializeAxisX(axis);

                           addAxisX(axis,i.key());

                    }

              emit axisAdded(axis,i.value());

          }

          if(typeY.testFlag(QAbstractAxis::AxisTypeValues) && typeY.testFlag(QAbstractAxis::AxisTypeCategories))

          {

              i.toFront();

              while (i.hasNext()) {

                     i.next();

                     QAbstractAxis* axis = createAxis(i.key()->d_ptr->defaultAxisYType());

                     i.key()->d_ptr->initializeAxisY(axis);

                     addAxisY(axis,i.key());

                     emit axisAdded(axis,i.value());

        Michal Klocek
    
Refactor QChart API...

              r1577
            
              }

        Michal Klocek
    
Adds createDefaultAxes logic

              r1588
            
          }else if(!typeY.testFlag(QAbstractAxis::AxisTypeNoAxis)){

              QAbstractAxis* axis = createAxis(QAbstractAxis::AxisType(int(typeY)));

              i.toFront();

                    while (i.hasNext()) {

                           i.next();

                           i.key()->d_ptr->initializeAxisY(axis);

                           addAxisY(axis,i.key());

                    }

                    emit axisAdded(axis,i.value());

        Michal Klocek
    
Refactor QChart API...

              r1577
            
          }

      }

        Michal Klocek
    
Adds createDefaultAxes logic

              r1588
            
      QAbstractAxis* ChartDataSet::createAxis(QAbstractAxis::AxisType type)

      {

          QAbstractAxis* axis =0;

          switch(type) {

              case QAbstractAxis::AxisTypeValues:

              axis = new QValuesAxis(this);

              break;

              case QAbstractAxis::AxisTypeCategories:

        Michal Klocek
    
Refactor CategoriesAxis to BarCategoriesAxis part 1 of 2

              r1612
            
              axis = new QBarCategoriesAxis(this);

        Michal Klocek
    
Adds createDefaultAxes logic

              r1588
            
              break;

              default:

              axis = 0;

              break;

          }

          return axis;

      }

      void ChartDataSet::addAxisX(QAbstractAxis* axis,QAbstractSeries* series) {

          Domain* domain = m_seriesDomainMap.value(series);

          QObject::connect(axis->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisXChanged(qreal,qreal,int,bool)));

          QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),axis->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));

          axis->d_ptr->m_orientation=Qt::Horizontal;

          m_seriesAxisXMap.insert(series,axis);

      }

      void ChartDataSet::addAxisY(QAbstractAxis* axis,QAbstractSeries* series) {

          Domain* domain = m_seriesDomainMap.value(series);

          QObject::connect(axis->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisYChanged(qreal,qreal,int,bool)));

          QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),axis->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));

          axis->d_ptr->m_orientation=Qt::Vertical;

          m_seriesAxisYMap.insert(series,axis);

      }

        Michal Klocek
    
Refactors core to support mulitpile axis and domains...

              r1556
            
      void ChartDataSet::removeSeries(QAbstractSeries* series)

        Michal Klocek
    
Refactor domain model...

              r439
            
      {

        Michal Klocek
    
Refactors core to support mulitpile axis and domains...

              r1556
            
          Domain* domain = m_seriesDomainMap.take(series);

        Michal Klocek
    
Fix indexing issue of series

              r910
            
        Michal Klocek
    
Refactors core to support mulitpile axis and domains...

              r1556
            
          if(!domain) {

        Michal Klocek
    
Fix indexing issue of series

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

        Michal Klocek
    
Refactors core to support mulitpile axis and domains...

              r1556
            
          }

        Michal Klocek
    
Krazy reported errors...

              r974
            
        Michal Klocek
    
Fix indexing issue of series

              r910
            
          emit seriesRemoved(series);

        Michal Klocek
    
Krazy reported errors...

              r974
            
        Michal Klocek
    
Fixes for stackedbarchartdrilldown

              r1558
            
          delete domain;

          domain = 0;

        Michal Klocek
    
Fix indexing issue of series

              r910
            
          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);

        Jani Honkonen
    
Implemented QAbstractSeries::chart()...

              r1314
            
        Michal Klocek
    
Krazy reported errors...

              r974
            
          series->setParent(0);

        Jani Honkonen
    
Implemented QAbstractSeries::chart()...

              r1314
            
          series->d_ptr->m_chart = 0;

          series->d_ptr->m_dataset = 0;

        Michal Klocek
    
Refactored for MVP...

              r139
            
        Michal Klocek
    
Adds createDefaultAxes logic

              r1588
            
          removeAxes(series);

      }

      void ChartDataSet::removeAxes(QAbstractSeries* series)

      {

        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
          QAbstractAxis* axisX = m_seriesAxisXMap.take(series);

        Michal Klocek
    
Fix indexing issue of series

              r910
            
        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
          if(axisX) {

              QList<QAbstractAxis*> axesX = m_seriesAxisXMap.values();

              int x = axesX.indexOf(axisX);

        Michal Klocek
    
Refactors axis handling...

              r223
            
        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
              if(x==-1) {

                  emit axisRemoved(axisX);

        Michal Klocek
    
Fix deleteLater in case presenter keeps deleteLater objects

              r1569
            
                  axisX->deleteLater();

        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
              }

        Michal Klocek
    
Refactor domain model...

              r439
            
          }

        Michal Klocek
    
Refactors axis handling...

              r223
            
        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
          QAbstractAxis* axisY = m_seriesAxisYMap.take(series);

          if(axisY) {

              QList<QAbstractAxis*> axesY = m_seriesAxisYMap.values();

              int y = axesY.indexOf(axisY);

              if(y==-1) {

                  emit axisRemoved(axisY);

        Michal Klocek
    
Fix deleteLater in case presenter keeps deleteLater objects

              r1569
            
                  axisY->deleteLater();

        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
              }

        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
    
Refactors core to support mulitpile axis and domains...

              r1556
            
          QList<QAbstractSeries*> series =   m_seriesDomainMap.keys();

        Tero Ahola
    
Renamed QSeries to QAbstractSeries

              r988
            
          foreach(QAbstractSeries *s , series) {

        Michal Klocek
    
Refactors core to support mulitpile axis and domains...

              r1556
            
              removeSeries(s);

        Michal Klocek
    
Refactored for MVP...

              r139
            
          }

        sauimone
    
added map for yaxises methods to set axis

              r1554
            
          Q_ASSERT(m_seriesAxisXMap.count()==0);

        Michal Klocek
    
Refactors core to support mulitpile axis and domains...

              r1556
            
          Q_ASSERT(m_seriesAxisXMap.count()==0);

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

        Michal Klocek
    
Fix indexing issue of series

              r910
            
        Michal Klocek
    
Krazy reported errors...

              r974
            
          qDeleteAll(series);

        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
    
Fix all tst_chartdataset test cases

              r1593
            
          //for performance reasons block, signals and scale "full" domain one by one. Gives twice less screen updates

          blockAxisSignals(true);

        Michal Klocek
    
Refactors core to support mulitpile axis and domains...

              r1556
            
          QMapIterator<QAbstractSeries*, Domain*> i(m_seriesDomainMap);

        Michal Klocek
    
Fix all tst_chartdataset test cases

              r1593
            
        Michal Klocek
    
Refactor domain model...

              r439
            
          while (i.hasNext()) {

              i.next();

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

        Michal Klocek
    
Refactors axis handling...

              r223
            
          }

        Michal Klocek
    
Fix all tst_chartdataset test cases

              r1593
            
          blockAxisSignals(false);

        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
    
Fix all tst_chartdataset test cases

              r1593
            
          //for performance reasons block, signals and scale "full" domain one by one. Gives twice less screen updates

          blockAxisSignals(true);

        Michal Klocek
    
Refactors core to support mulitpile axis and domains...

              r1556
            
          QMapIterator<QAbstractSeries*, Domain*> i(m_seriesDomainMap);

        Michal Klocek
    
Fix all tst_chartdataset test cases

              r1593
            
        Michal Klocek
    
Refactor domain model...

              r439
            
          while (i.hasNext()) {

              i.next();

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

          }

        Michal Klocek
    
Fix all tst_chartdataset test cases

              r1593
            
          blockAxisSignals(false);

      }

      void ChartDataSet::blockAxisSignals(bool enabled)

      {

          QMapIterator<QAbstractSeries*, Domain*> i(m_seriesDomainMap);

          while (i.hasNext()) {

                 i.next();

                 QAbstractAxis* axisX = m_seriesAxisXMap.value(i.key());

                 QAbstractAxis* axisY = m_seriesAxisYMap.value(i.key());

                 if(axisX) axisX->blockSignals(enabled);

                 if(axisY) axisY->blockSignals(enabled);

             }

        Michal Klocek
    
Refactors axis handling...

              r223
            
      }

        Michal Klocek
    
Fixes to API , QSeriesType -> SeriesType , add missing getters

              r1107
            
      int ChartDataSet::seriesCount(QAbstractSeries::SeriesType type)

        Michal Klocek
    
Fix indexing issue of series

              r910
            
      {

          int count=0;

        Michal Klocek
    
Refactor QChart API...

              r1577
            
          QMapIterator<QAbstractSeries*, Domain*> i(m_seriesDomainMap);

        Michal Klocek
    
Fix indexing issue of series

              r910
            
          while (i.hasNext()) {

                 i.next();

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

          }

          return count;

      }

        Tero Ahola
    
Renamed QSeries to QAbstractSeries

              r988
            
      int ChartDataSet::seriesIndex(QAbstractSeries *series)

        Tero Ahola
    
Fixed bug with changing theme when several series exist

              r538
            
      {

        Tero Ahola
    
Renamed QSeries to QAbstractSeries

              r988
            
          QMapIterator<int, QAbstractSeries*> i(m_indexSeriesMap);

        Michal Klocek
    
Fix indexing issue of series

              r910
            
          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
            
      }

        sauimone
    
added map for yaxises methods to set axis

              r1554
            
      QAbstractAxis* ChartDataSet::axisX(QAbstractSeries *series) const

      {

        Michal Klocek
    
Adds return of visible axes

              r1641
            
          if(series == 0) {

                 QMapIterator<QAbstractSeries*, QAbstractAxis *> i(m_seriesAxisXMap);

                 while (i.hasNext()) {

                        i.next();

                        if(i.value()->isVisible()) return i.value();

                 }

                 return 0;

          }

        sauimone
    
added map for yaxises methods to set axis

              r1554
            
          return m_seriesAxisXMap.value(series);

      }

        Michal Klocek
    
Refactors QAxis to QAbstractAxis...

              r1541
            
      QAbstractAxis* ChartDataSet::axisY(QAbstractSeries *series) const

        Michal Klocek
    
Refactors axis handling...

              r223
            
      {

        Michal Klocek
    
Adds return of visible axes

              r1641
            
          if(series == 0) {

              QMapIterator<QAbstractSeries*, QAbstractAxis *> i(m_seriesAxisYMap);

              while (i.hasNext()) {

                  i.next();

                  if(i.value()->isVisible()) return i.value();

              }

              return 0;

          }

        sauimone
    
added map for yaxises methods to set axis

              r1554
            
          return m_seriesAxisYMap.value(series);

        Michal Klocek
    
Refactors axis handling...

              r223
            
      }

        sauimone
    
added map for yaxises methods to set axis

              r1554
            
      void ChartDataSet::setAxisX(QAbstractSeries *series, QAbstractAxis *axis)

      {

        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
          Q_ASSERT(axis);

        Michal Klocek
    
Refactor QChart API...

              r1577
            
          Domain* domain = m_seriesDomainMap.value(series);

        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
        Michal Klocek
    
Refactor QChart API...

              r1577
            
          if(!domain) {

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

              return;

        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
          }

          if(axis->d_ptr->m_orientation==Qt::Vertical) {

        Michal Klocek
    
Refactor QChart API...

              r1577
            
              qWarning()<<"Axis already defined as axis Y";

              return;

        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
          }

        Michal Klocek
    
Refactor QChart API...

              r1577
            
          QAbstractAxis *oldAxis = m_seriesAxisXMap.take(series);

          QList<QAbstractAxis*> axesX = m_seriesAxisXMap.values();

        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
        Michal Klocek
    
Refactor QChart API...

              r1577
            
          if(oldAxis) {

              int x = axesX.indexOf(oldAxis);

              if(x==-1) {

                  emit axisRemoved(oldAxis);

                  oldAxis->deleteLater();

              }

          }

        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
          QObject::connect(axis->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisXChanged(qreal,qreal,int,bool)));

          QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),axis->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));

        Michal Klocek
    
Refactor QChart API...

              r1577
            
          int x = axesX.indexOf(axis);

        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
          if(x==-1) {

        Michal Klocek
    
Refactor QChart API...

              r1577
            
              axis->d_ptr->m_orientation=Qt::Horizontal;

              emit axisAdded(axis,domain);

        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
          }

          m_seriesAxisXMap.insert(series,axis);

        Michal Klocek
    
Refactor categories implementation...

              r1611
            
          axis->d_ptr->emitRange();

        sauimone
    
added map for yaxises methods to set axis

              r1554
            
      }

      void ChartDataSet::setAxisY(QAbstractSeries *series, QAbstractAxis *axis)

        Michal Klocek
    
Adds missing functions to qchart API

              r1542
            
      {

        Michal Klocek
    
Refactor QChart API...

              r1577
            
          Q_ASSERT(axis);

          Domain* domain = m_seriesDomainMap.value(series);

        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
        Michal Klocek
    
Refactor QChart API...

              r1577
            
          if(!domain) {

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

              return;

          }

        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
          if(axis->d_ptr->m_orientation==Qt::Horizontal) {

              qWarning()<<"Axis already defined as axis X";

              return;

          }

        Michal Klocek
    
Refactor QChart API...

              r1577
            
          QAbstractAxis *oldAxis = m_seriesAxisYMap.take(series);

          QList<QAbstractAxis*> axesY = m_seriesAxisYMap.values();

        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
        Michal Klocek
    
Refactor QChart API...

              r1577
            
          if(oldAxis) {

              int y = axesY.indexOf(oldAxis);

              if(y==-1) {

                  emit axisRemoved(oldAxis);

                  oldAxis->deleteLater();

              }

          }

        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
        Michal Klocek
    
Refactor QChart API...

              r1577
            
          QObject::connect(axis->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisYChanged(qreal,qreal,int,bool)));

          QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),axis->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));

        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
        Michal Klocek
    
Refactor QChart API...

              r1577
            
          int y = axesY.indexOf(axis);

        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
          if(y==-1) {

              axis->d_ptr->m_orientation=Qt::Vertical;

              emit axisAdded(axis,domain);

          }

        Michal Klocek
    
Refactor QChart API...

              r1577
            
          m_seriesAxisYMap.insert(series,axis);

        Michal Klocek
    
Refactor categories implementation...

              r1611
            
          axis->d_ptr->emitRange();

        Michal Klocek
    
Update of chartdataset_tst

              r1564
            
      }

      Domain* ChartDataSet::domain(QAbstractSeries *series) const

      {

          return m_seriesDomainMap.value(series);

        Michal Klocek
    
Adds missing functions to qchart API

              r1542
            
      }

        Michal Klocek
    
Fix precision issue when scrolling domain

              r1267
            
      void ChartDataSet::scrollDomain(qreal dx,qreal dy,const QSizeF& size)

        Michal Klocek
    
Adds scroll support...

              r531
            
      {

        Michal Klocek
    
Fix all tst_chartdataset test cases

              r1593
            
          blockAxisSignals(true);

        Michal Klocek
    
Refactors core to support mulitpile axis and domains...

              r1556
            
          QMapIterator<QAbstractSeries*, Domain*> i(m_seriesDomainMap);

        Michal Klocek
    
Refactor axis hadnling...

              r1078
            
          while (i.hasNext()) {

              i.next();

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

          }

        Michal Klocek
    
Fix all tst_chartdataset test cases

              r1593
            
          blockAxisSignals(false);

        Michal Klocek
    
Refactor axis hadnling...

              r1078
            
      }

      QList<QAbstractSeries*> ChartDataSet::series() const

      {

        sauimone
    
added map for yaxises methods to set axis

              r1554
            
          return m_seriesAxisXMap.keys();

        Michal Klocek
    
Adds scroll support...

              r531
            
      }

        sauimone
    
legend detach example. Bug fixes to legend.

              r1263
            
      void ChartDataSet::updateSeries(QAbstractSeries *series)

      {

          emit seriesUpdated(series);

      }

        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"
Jani Honkonen Implemented QAbstractSeries::chart()...	r1314	#include "qchart.h"
Michal Klocek Refactors QAxis to QAbstractAxis...	r1541	#include "qvaluesaxis.h"
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2	r1613	#include "qbarcategoriesaxis.h"
Michal Klocek Refactors QAxis to QAbstractAxis...	r1541	#include "qvaluesaxis_p.h"
Tero Ahola Renamed QSeries to QAbstractSeries	r988	#include "qabstractseries_p.h"
sauimone renamed barseries files to abstractbarseries	r1586	#include "qabstractbarseries.h"
sauimone Naming convention change for barcharts. QBarChartSeries is now QBarSeries etc.	r338	#include "qstackedbarseries.h"
		#include "qpercentbarseries.h"
Jani Honkonen Moved pie stuff to own .pri file and rename stuff	r146	#include "qpieseries.h"
Michal Klocek Refactors qchart , adds line animation...	r131
		QTCOMMERCIALCHART_BEGIN_NAMESPACE

Jani Honkonen Implemented QAbstractSeries::chart()...	r1314	ChartDataSet::ChartDataSet(QChart *parent):QObject(parent),
Michal Klocek Refactors core to support mulitpile axis and domains...	r1556	m_domainIndex(0)
Michal Klocek Refactors qchart , adds line animation...	r131	{
Michal Klocek Refactors core to support mulitpile axis and domains...	r1556
Michal Klocek Refactors qchart , adds line animation...	r131	}

		ChartDataSet::~ChartDataSet()
		{
Michal Klocek Adds if series deleted , remove series from chart	r1062	removeAllSeries();
Michal Klocek Refactors qchart , adds line animation...	r131	}

Michal Klocek Refactors QAxis to QAbstractAxis...	r1541	void ChartDataSet::addSeries(QAbstractSeries* series)
Michal Klocek Refactors qchart , adds line animation...	r131	{
Michal Klocek Refactor QChart API...	r1577	Domain* domain = m_seriesDomainMap.value(series);
Michal Klocek Fix indexing issue of series	r910
Michal Klocek Refactor QChart API...	r1577	if(domain) {
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 Krazy reported errors...	r974	series->setParent(this); // take ownership
Michal Klocek Refactors axis handling...	r223
Michal Klocek Refactor QChart API...	r1577	domain = new Domain(series);
Michal Klocek Adds area chart...	r421
Michal Klocek Refactors core to support mulitpile axis and domains...	r1556	m_seriesDomainMap.insert(series,domain);
Michal Klocek Adds area chart...	r421
Michal Klocek Refactor to use qseries private for implmentation interface...	r943	series->d_ptr->scaleDomain(*domain);

Tero Ahola Renamed QSeries to QAbstractSeries	r988	QMapIterator<int, QAbstractSeries*> i(m_indexSeriesMap);
Michal Klocek Fix indexing issue of series	r910
		int key=0;
		while (i.hasNext()) {
		i.next();
		if(i.key()!=key) {
		break;
		}
		key++;
		}

		m_indexSeriesMap.insert(key,series);

Jani Honkonen Implemented QAbstractSeries::chart()...	r1314	series->d_ptr->m_chart = qobject_cast<QChart*>(parent());
		series->d_ptr->m_dataset = this;
Michal Klocek Adds if series deleted , remove series from chart	r1062
Michal Klocek Fix indexing issue of series	r910	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 QChart API...	r1577	void ChartDataSet::createDefaultAxes()
		{

Michal Klocek Adds createDefaultAxes logic	r1588	if(m_seriesDomainMap.isEmpty()) return;

		QAbstractAxis::AxisTypes typeX(0);
		QAbstractAxis::AxisTypes typeY(0);

		QMapIterator<QAbstractSeries, Domain> i(m_seriesDomainMap);
Michal Klocek Refactor QChart API...	r1577	while (i.hasNext()) {
Michal Klocek Adds createDefaultAxes logic	r1588	i.next();
		removeAxes(i.key());
		}
Michal Klocek Refactor QChart API...	r1577
Michal Klocek Adds createDefaultAxes logic	r1588	i.toFront();
Michal Klocek Refactor QChart API...	r1577
Michal Klocek Adds createDefaultAxes logic	r1588	while (i.hasNext()) {
		i.next();
		QAbstractAxis* axisX = m_seriesAxisXMap.value(i.key());
		QAbstractAxis* axisY = m_seriesAxisYMap.value(i.key());
		if(axisX) typeX&=axisX->type();
		else typeX\|=i.key()->d_ptr->defaultAxisXType();
		if(axisY) typeY&=axisY->type();
		else typeY\|=i.key()->d_ptr->defaultAxisYType();
		}
Michal Klocek Refactor QChart API...	r1577

Michal Klocek Adds createDefaultAxes logic	r1588	if(typeX.testFlag(QAbstractAxis::AxisTypeValues) && typeX.testFlag(QAbstractAxis::AxisTypeCategories))
		{
		i.toFront();
		while (i.hasNext()) {
		i.next();
		QAbstractAxis* axis = createAxis(i.key()->d_ptr->defaultAxisXType());
Michal Klocek Fixes for qmlcustom model	r1616	if(!axis) continue;
Michal Klocek Adds createDefaultAxes logic	r1588	i.key()->d_ptr->initializeAxisX(axis);
		addAxisX(axis,i.key());
		emit axisAdded(axis,i.value());
Michal Klocek Refactor QChart API...	r1577	}

Michal Klocek Adds createDefaultAxes logic	r1588	}else if(!typeY.testFlag(QAbstractAxis::AxisTypeNoAxis)){
		QAbstractAxis* axis = createAxis(QAbstractAxis::AxisType(int(typeX)));
		i.toFront();
		while (i.hasNext()) {
		i.next();
		i.key()->d_ptr->initializeAxisX(axis);
		addAxisX(axis,i.key());
		}
		emit axisAdded(axis,i.value());

		}

		if(typeY.testFlag(QAbstractAxis::AxisTypeValues) && typeY.testFlag(QAbstractAxis::AxisTypeCategories))
		{
		i.toFront();
		while (i.hasNext()) {
		i.next();
		QAbstractAxis* axis = createAxis(i.key()->d_ptr->defaultAxisYType());
		i.key()->d_ptr->initializeAxisY(axis);
		addAxisY(axis,i.key());
		emit axisAdded(axis,i.value());
Michal Klocek Refactor QChart API...	r1577	}
Michal Klocek Adds createDefaultAxes logic	r1588
		}else if(!typeY.testFlag(QAbstractAxis::AxisTypeNoAxis)){
		QAbstractAxis* axis = createAxis(QAbstractAxis::AxisType(int(typeY)));
		i.toFront();
		while (i.hasNext()) {
		i.next();
		i.key()->d_ptr->initializeAxisY(axis);
		addAxisY(axis,i.key());
		}
		emit axisAdded(axis,i.value());

Michal Klocek Refactor QChart API...	r1577	}
		}


Michal Klocek Adds createDefaultAxes logic	r1588	QAbstractAxis* ChartDataSet::createAxis(QAbstractAxis::AxisType type)
		{
		QAbstractAxis* axis =0;

		switch(type) {
		case QAbstractAxis::AxisTypeValues:
		axis = new QValuesAxis(this);
		break;
		case QAbstractAxis::AxisTypeCategories:
Michal Klocek Refactor CategoriesAxis to BarCategoriesAxis part 1 of 2	r1612	axis = new QBarCategoriesAxis(this);
Michal Klocek Adds createDefaultAxes logic	r1588	break;
		default:
		axis = 0;
		break;
		}

		return axis;
		}

		void ChartDataSet::addAxisX(QAbstractAxis* axis,QAbstractSeries* series) {
		Domain* domain = m_seriesDomainMap.value(series);
		QObject::connect(axis->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisXChanged(qreal,qreal,int,bool)));
		QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),axis->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
		axis->d_ptr->m_orientation=Qt::Horizontal;
		m_seriesAxisXMap.insert(series,axis);
		}

		void ChartDataSet::addAxisY(QAbstractAxis* axis,QAbstractSeries* series) {
		Domain* domain = m_seriesDomainMap.value(series);
		QObject::connect(axis->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisYChanged(qreal,qreal,int,bool)));
		QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),axis->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
		axis->d_ptr->m_orientation=Qt::Vertical;
		m_seriesAxisYMap.insert(series,axis);
		}

Michal Klocek Refactors core to support mulitpile axis and domains...	r1556	void ChartDataSet::removeSeries(QAbstractSeries* series)
Michal Klocek Refactor domain model...	r439	{
Michal Klocek Refactors core to support mulitpile axis and domains...	r1556	Domain* domain = m_seriesDomainMap.take(series);
Michal Klocek Fix indexing issue of series	r910
Michal Klocek Refactors core to support mulitpile axis and domains...	r1556	if(!domain) {
Michal Klocek Fix indexing issue of series	r910	qWarning()<<"Can not remove series. Series not found on the chart.";
Michal Klocek Refactors core to support mulitpile axis and domains...	r1556	}
Michal Klocek Krazy reported errors...	r974
Michal Klocek Fix indexing issue of series	r910	emit seriesRemoved(series);
Michal Klocek Krazy reported errors...	r974
Michal Klocek Fixes for stackedbarchartdrilldown	r1558	delete domain;
		domain = 0;

Michal Klocek Fix indexing issue of series	r910	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);
Jani Honkonen Implemented QAbstractSeries::chart()...	r1314
Michal Klocek Krazy reported errors...	r974	series->setParent(0);
Jani Honkonen Implemented QAbstractSeries::chart()...	r1314	series->d_ptr->m_chart = 0;
		series->d_ptr->m_dataset = 0;
Michal Klocek Refactored for MVP...	r139
Michal Klocek Adds createDefaultAxes logic	r1588	removeAxes(series);
		}

		void ChartDataSet::removeAxes(QAbstractSeries* series)
		{
Michal Klocek Update of chartdataset_tst	r1564	QAbstractAxis* axisX = m_seriesAxisXMap.take(series);
Michal Klocek Fix indexing issue of series	r910
Michal Klocek Update of chartdataset_tst	r1564	if(axisX) {
		QList<QAbstractAxis*> axesX = m_seriesAxisXMap.values();
		int x = axesX.indexOf(axisX);
Michal Klocek Refactors axis handling...	r223
Michal Klocek Update of chartdataset_tst	r1564	if(x==-1) {
		emit axisRemoved(axisX);
Michal Klocek Fix deleteLater in case presenter keeps deleteLater objects	r1569	axisX->deleteLater();
Michal Klocek Update of chartdataset_tst	r1564	}
Michal Klocek Refactor domain model...	r439	}
Michal Klocek Refactors axis handling...	r223
Michal Klocek Update of chartdataset_tst	r1564	QAbstractAxis* axisY = m_seriesAxisYMap.take(series);

		if(axisY) {
		QList<QAbstractAxis*> axesY = m_seriesAxisYMap.values();

		int y = axesY.indexOf(axisY);

		if(y==-1) {
		emit axisRemoved(axisY);
Michal Klocek Fix deleteLater in case presenter keeps deleteLater objects	r1569	axisY->deleteLater();
Michal Klocek Update of chartdataset_tst	r1564	}
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 Refactors core to support mulitpile axis and domains...	r1556	QList<QAbstractSeries*> series = m_seriesDomainMap.keys();
Tero Ahola Renamed QSeries to QAbstractSeries	r988	foreach(QAbstractSeries *s , series) {
Michal Klocek Refactors core to support mulitpile axis and domains...	r1556	removeSeries(s);
Michal Klocek Refactored for MVP...	r139	}

sauimone added map for yaxises methods to set axis	r1554	Q_ASSERT(m_seriesAxisXMap.count()==0);
Michal Klocek Refactors core to support mulitpile axis and domains...	r1556	Q_ASSERT(m_seriesAxisXMap.count()==0);
		Q_ASSERT(m_seriesDomainMap.count()==0);
Michal Klocek Fix indexing issue of series	r910
Michal Klocek Krazy reported errors...	r974	qDeleteAll(series);
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 Fix all tst_chartdataset test cases	r1593	//for performance reasons block, signals and scale "full" domain one by one. Gives twice less screen updates

		blockAxisSignals(true);

Michal Klocek Refactors core to support mulitpile axis and domains...	r1556	QMapIterator<QAbstractSeries, Domain> i(m_seriesDomainMap);
Michal Klocek Fix all tst_chartdataset test cases	r1593
Michal Klocek Refactor domain model...	r439	while (i.hasNext()) {
		i.next();
		i.value()->zoomIn(rect,size);
Michal Klocek Refactors axis handling...	r223	}
Michal Klocek Fix all tst_chartdataset test cases	r1593
		blockAxisSignals(false);

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 Fix all tst_chartdataset test cases	r1593	//for performance reasons block, signals and scale "full" domain one by one. Gives twice less screen updates

		blockAxisSignals(true);

Michal Klocek Refactors core to support mulitpile axis and domains...	r1556	QMapIterator<QAbstractSeries, Domain> i(m_seriesDomainMap);
Michal Klocek Fix all tst_chartdataset test cases	r1593
Michal Klocek Refactor domain model...	r439	while (i.hasNext()) {
		i.next();
		i.value()->zoomOut(rect,size);
		}
Michal Klocek Fix all tst_chartdataset test cases	r1593
		blockAxisSignals(false);
		}

		void ChartDataSet::blockAxisSignals(bool enabled)
		{
		QMapIterator<QAbstractSeries, Domain> i(m_seriesDomainMap);

		while (i.hasNext()) {
		i.next();
		QAbstractAxis* axisX = m_seriesAxisXMap.value(i.key());
		QAbstractAxis* axisY = m_seriesAxisYMap.value(i.key());
		if(axisX) axisX->blockSignals(enabled);
		if(axisY) axisY->blockSignals(enabled);
		}
Michal Klocek Refactors axis handling...	r223	}

Michal Klocek Fixes to API , QSeriesType -> SeriesType , add missing getters	r1107	int ChartDataSet::seriesCount(QAbstractSeries::SeriesType type)
Michal Klocek Fix indexing issue of series	r910	{
		int count=0;
Michal Klocek Refactor QChart API...	r1577	QMapIterator<QAbstractSeries, Domain> i(m_seriesDomainMap);
Michal Klocek Fix indexing issue of series	r910	while (i.hasNext()) {
		i.next();
		if(i.key()->type()==type) count++;
		}
		return count;
		}

Tero Ahola Renamed QSeries to QAbstractSeries	r988	int ChartDataSet::seriesIndex(QAbstractSeries *series)
Tero Ahola Fixed bug with changing theme when several series exist	r538	{
Tero Ahola Renamed QSeries to QAbstractSeries	r988	QMapIterator<int, QAbstractSeries*> i(m_indexSeriesMap);
Michal Klocek Fix indexing issue of series	r910	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	}

sauimone added map for yaxises methods to set axis	r1554	QAbstractAxis* ChartDataSet::axisX(QAbstractSeries *series) const
		{
Michal Klocek Adds return of visible axes	r1641	if(series == 0) {

		QMapIterator<QAbstractSeries, QAbstractAxis > i(m_seriesAxisXMap);

		while (i.hasNext()) {
		i.next();
		if(i.value()->isVisible()) return i.value();
		}
		return 0;
		}
sauimone added map for yaxises methods to set axis	r1554	return m_seriesAxisXMap.value(series);
		}

Michal Klocek Refactors QAxis to QAbstractAxis...	r1541	QAbstractAxis* ChartDataSet::axisY(QAbstractSeries *series) const
Michal Klocek Refactors axis handling...	r223	{
Michal Klocek Adds return of visible axes	r1641	if(series == 0) {
		QMapIterator<QAbstractSeries, QAbstractAxis > i(m_seriesAxisYMap);

		while (i.hasNext()) {
		i.next();
		if(i.value()->isVisible()) return i.value();
		}
		return 0;
		}
sauimone added map for yaxises methods to set axis	r1554	return m_seriesAxisYMap.value(series);
Michal Klocek Refactors axis handling...	r223	}

sauimone added map for yaxises methods to set axis	r1554	void ChartDataSet::setAxisX(QAbstractSeries series, QAbstractAxis axis)
		{
Michal Klocek Update of chartdataset_tst	r1564	Q_ASSERT(axis);
Michal Klocek Refactor QChart API...	r1577	Domain* domain = m_seriesDomainMap.value(series);
Michal Klocek Update of chartdataset_tst	r1564
Michal Klocek Refactor QChart API...	r1577	if(!domain) {
		qWarning() << "Series not found on the chart.";
		return;
Michal Klocek Update of chartdataset_tst	r1564	}

		if(axis->d_ptr->m_orientation==Qt::Vertical) {
Michal Klocek Refactor QChart API...	r1577	qWarning()<<"Axis already defined as axis Y";
		return;
Michal Klocek Update of chartdataset_tst	r1564	}

Michal Klocek Refactor QChart API...	r1577	QAbstractAxis *oldAxis = m_seriesAxisXMap.take(series);
		QList<QAbstractAxis*> axesX = m_seriesAxisXMap.values();
Michal Klocek Update of chartdataset_tst	r1564
Michal Klocek Refactor QChart API...	r1577	if(oldAxis) {

		int x = axesX.indexOf(oldAxis);
		if(x==-1) {
		emit axisRemoved(oldAxis);
		oldAxis->deleteLater();
		}
		}
Michal Klocek Update of chartdataset_tst	r1564
		QObject::connect(axis->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisXChanged(qreal,qreal,int,bool)));
		QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal,int)),axis->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));

Michal Klocek Refactor QChart API...	r1577	int x = axesX.indexOf(axis);
Michal Klocek Update of chartdataset_tst	r1564	if(x==-1) {
Michal Klocek Refactor QChart API...	r1577	axis->d_ptr->m_orientation=Qt::Horizontal;
		emit axisAdded(axis,domain);
Michal Klocek Update of chartdataset_tst	r1564	}

		m_seriesAxisXMap.insert(series,axis);
Michal Klocek Refactor categories implementation...	r1611	axis->d_ptr->emitRange();
sauimone added map for yaxises methods to set axis	r1554	}

		void ChartDataSet::setAxisY(QAbstractSeries series, QAbstractAxis axis)
Michal Klocek Adds missing functions to qchart API	r1542	{
Michal Klocek Refactor QChart API...	r1577	Q_ASSERT(axis);
		Domain* domain = m_seriesDomainMap.value(series);
Michal Klocek Update of chartdataset_tst	r1564
Michal Klocek Refactor QChart API...	r1577	if(!domain) {
		qWarning() << "Series not found on the chart.";
		return;
		}
Michal Klocek Update of chartdataset_tst	r1564
		if(axis->d_ptr->m_orientation==Qt::Horizontal) {
		qWarning()<<"Axis already defined as axis X";
		return;
		}

Michal Klocek Refactor QChart API...	r1577	QAbstractAxis *oldAxis = m_seriesAxisYMap.take(series);
		QList<QAbstractAxis*> axesY = m_seriesAxisYMap.values();
Michal Klocek Update of chartdataset_tst	r1564
Michal Klocek Refactor QChart API...	r1577	if(oldAxis) {
		int y = axesY.indexOf(oldAxis);
		if(y==-1) {
		emit axisRemoved(oldAxis);
		oldAxis->deleteLater();
		}
		}
Michal Klocek Update of chartdataset_tst	r1564
Michal Klocek Refactor QChart API...	r1577	QObject::connect(axis->d_ptr.data(),SIGNAL(changed(qreal,qreal,int,bool)),domain,SLOT(handleAxisYChanged(qreal,qreal,int,bool)));
		QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal,int)),axis->d_ptr.data(),SLOT(handleAxisRangeChanged(qreal,qreal,int)));
Michal Klocek Update of chartdataset_tst	r1564
Michal Klocek Refactor QChart API...	r1577	int y = axesY.indexOf(axis);
Michal Klocek Update of chartdataset_tst	r1564	if(y==-1) {
		axis->d_ptr->m_orientation=Qt::Vertical;
		emit axisAdded(axis,domain);
		}

Michal Klocek Refactor QChart API...	r1577	m_seriesAxisYMap.insert(series,axis);
Michal Klocek Refactor categories implementation...	r1611	axis->d_ptr->emitRange();
Michal Klocek Update of chartdataset_tst	r1564	}

		Domain* ChartDataSet::domain(QAbstractSeries *series) const
		{
		return m_seriesDomainMap.value(series);
Michal Klocek Adds missing functions to qchart API	r1542	}

Michal Klocek Fix precision issue when scrolling domain	r1267	void ChartDataSet::scrollDomain(qreal dx,qreal dy,const QSizeF& size)
Michal Klocek Adds scroll support...	r531	{
Michal Klocek Fix all tst_chartdataset test cases	r1593	blockAxisSignals(true);
Michal Klocek Refactors core to support mulitpile axis and domains...	r1556	QMapIterator<QAbstractSeries, Domain> i(m_seriesDomainMap);
Michal Klocek Refactor axis hadnling...	r1078	while (i.hasNext()) {
		i.next();
		i.value()->move(dx,dy,size);
		}
Michal Klocek Fix all tst_chartdataset test cases	r1593	blockAxisSignals(false);
Michal Klocek Refactor axis hadnling...	r1078	}

		QList<QAbstractSeries*> ChartDataSet::series() const
		{
sauimone added map for yaxises methods to set axis	r1554	return m_seriesAxisXMap.keys();
Michal Klocek Adds scroll support...	r531	}

sauimone legend detach example. Bug fixes to legend.	r1263	void ChartDataSet::updateSeries(QAbstractSeries *series)
		{
		emit seriesUpdated(series);
		}

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

		QTCOMMERCIALCHART_END_NAMESPACE