##// END OF EJS Templates
Fixed: qareaseries - commented out code (model stuff.. this will be implemented, right?). Also some commented out code removed from SplineSeries
Fixed: qareaseries - commented out code (model stuff.. this will be implemented, right?). Also some commented out code removed from SplineSeries

File last commit:

r828:efd18f904bfe
r863:e54c97fc02b8
Show More
chartdataset.cpp
334 lines | 9.5 KiB | text/x-c | CppLexer
/ src / chartdataset.cpp
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
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
Tero Ahola
Reserve ordering of chart series internally....
r825 if (seriesIndex(series) > -1) {
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);
Tero Ahola
Reserve ordering of chart series internally....
r825 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
Tero Ahola
Reserve ordering of chart series internally....
r825 if (!m_axisXInitialized) {
emit axisAdded(axisX(), domain);
m_axisXInitialized = true;
Michal Klocek
Refactor domain model...
r439 }
Michal Klocek
Adds area chart...
r421
Tero Ahola
Reserve ordering of chart series internally....
r825 calculateDomain(series, domain);
Michal Klocek
Adds area chart...
r421
Tero Ahola
Reserve ordering of chart series internally....
r825 m_seriesAxisList.append(QPair<QSeries*, QChartAxis*>(series, axisY));
Michal Klocek
Refactored for MVP...
r139
Tero Ahola
Reserve ordering of chart series internally....
r825 emit seriesAdded(series, domain);
Michal Klocek
Refactor domain model...
r439 }
Jani Honkonen
Pie chart refactoring
r142
Michal Klocek
Refactor domain model...
r439 void ChartDataSet::removeSeries(QSeries* series)
{
Tero Ahola
Reserve ordering of chart series internally....
r825 int index = seriesIndex(series);
Jani Honkonen
Fix bug/typo in chartdataset
r828 if (index < 0) {
Tero Ahola
Reserve ordering of chart series internally....
r825 qWarning() << "Can not remove series. Series not found on the chart.";
Marek Rosa
Spline working somewhat
r401 return;
}
Michal Klocek
Refactored for MVP...
r139
Tero Ahola
Reserve ordering of chart series internally....
r825 // Remove the series and the axis from the container
QChartAxis* axis = m_seriesAxisList.at(index).second;
m_seriesAxisList.removeAt(index);
// Delete the series
emit seriesRemoved(series);
if (series->parent() == this) {
Michal Klocek
Refactor domain model...
r439 delete series;
Tero Ahola
Reserve ordering of chart series internally....
r825 series = 0;
Michal Klocek
Refactored for MVP...
r139 }
Tero Ahola
Reserve ordering of chart series internally....
r825 // Check if the Y axis is still in use
bool yAxisInUse(false);
for (int i(0); i < m_seriesAxisList.count(); i++) {
QPair<QSeries *, QChartAxis *> pair = m_seriesAxisList.at(i);
if (pair.second == axis)
yAxisInUse = true;
}
Michal Klocek
Refactors axis handling...
r223
Tero Ahola
Reserve ordering of chart series internally....
r825 // Remove the Y axis if not in use
if (!yAxisInUse) {
Michal Klocek
Refactor domain model...
r439 Domain* domain = m_axisDomainMap.take(axis);
emit axisRemoved(axis);
Tero Ahola
Reserve ordering of chart series internally....
r825 if (axis != axisY()) {
// Delete the Y axis unless it is the default one
if (axis->parent() == this) {
Michal Klocek
Fix ownership handling: if object has a parent do not delete it
r444 delete axis;
Tero Ahola
Reserve ordering of chart series internally....
r825 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
Tero Ahola
Reserve ordering of chart series internally....
r825 // Remove the x axis in case there are no y-axes left
if (m_seriesAxisList.count() == 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()
{
Tero Ahola
Reserve ordering of chart series internally....
r825 while (m_seriesAxisList.count()) {
QPair<QSeries *, QChartAxis *> pair = m_seriesAxisList.last();
removeSeries(pair.first);
Michal Klocek
Refactored for MVP...
r139 }
Tero Ahola
Reserve ordering of chart series internally....
r825 Q_ASSERT(m_seriesAxisList.count() == 0);
Q_ASSERT(m_axisDomainMap.count() == 0);
Michal Klocek
Refactored for MVP...
r139 }
Michal Klocek
Refactor domain model...
r439 //to be removed with PIMPL
Michal Klocek
Adds back reimplemnted categories handling
r701 void ChartDataSet::calculateDomain(QSeries* series,Domain* domain)
Michal Klocek
Refactored for MVP...
r139 {
Michal Klocek
Adds back reimplemnted categories handling
r701 qreal minX(domain->minX());
qreal minY(domain->minY());
qreal maxX(domain->maxX());
qreal maxY(domain->maxY());
int tickXCount(domain->tickXCount());
int tickYCount(domain->tickYCount());
Michal Klocek
Refactor domain model...
r439 switch(series->type())
{
Michal Klocek
Refactor scatter chart to fit the other classes...
r470 case QSeries::SeriesTypeLine:
case QSeries::SeriesTypeSpline:
case QSeries::SeriesTypeScatter:
{
Michal Klocek
Bugfix: check series count before changing domain
r373
Michal Klocek
Refactor scatter chart to fit the other classes...
r470 QXYSeries* xySeries = static_cast<QXYSeries*>(series);
Michal Klocek
Bugfix missing xaxis label update on zoomOut
r265
Michal Klocek
Refactor scatter chart to fit the other classes...
r470 for (int i = 0; i < xySeries->count(); i++)
Michal Klocek
Refactor domain model...
r439 {
Michal Klocek
Refactor scatter chart to fit the other classes...
r470 qreal x = xySeries->x(i);
qreal y = xySeries->y(i);
minX = qMin(minX, x);
minY = qMin(minY, y);
maxX = qMax(maxX, x);
maxY = qMax(maxY, y);
Michal Klocek
Refactor domain model...
r439 }
break;
Michal Klocek
Refactors axis handling...
r223 }
Michal Klocek
Refactor domain model...
r439 case QSeries::SeriesTypeArea: {
Michal Klocek
Adds axis setRange implementation
r400
Michal Klocek
Refactor domain model...
r439 QAreaSeries* areaSeries = static_cast<QAreaSeries*>(series);
QLineSeries* upperSeries = areaSeries->upperSeries();
QLineSeries* lowerSeries = areaSeries->lowerSeries();
Michal Klocek
Refactors axis handling...
r223
Michal Klocek
Refactor domain model...
r439 for (int i = 0; i < upperSeries->count(); i++)
{
qreal x = upperSeries->x(i);
qreal y = upperSeries->y(i);
Michal Klocek
Adds back reimplemnted categories handling
r701 minX = qMin(minX, x);
minY = qMin(minY, y);
maxX = qMax(maxX, x);
maxY = qMax(maxY, y);
Michal Klocek
Refactor domain model...
r439 }
if(lowerSeries) {
for (int i = 0; i < lowerSeries->count(); i++)
{
qreal x = lowerSeries->x(i);
qreal y = lowerSeries->y(i);
Michal Klocek
Adds back reimplemnted categories handling
r701 minX = qMin(minX, x);
minY = qMin(minY, y);
maxX = qMax(maxX, x);
maxY = qMax(maxY, y);
Michal Klocek
Refactor domain model...
r439 }}
break;
}
case QSeries::SeriesTypeBar: {
Michal Klocek
Adds back reimplemnted categories handling
r701
Michal Klocek
Refactor domain model...
r439 QBarSeries* barSeries = static_cast<QBarSeries*>(series);
qreal x = barSeries->categoryCount();
qreal y = barSeries->max();
Michal Klocek
Adds back reimplemnted categories handling
r701 minX = qMin(minX, x);
minY = qMin(minY, y);
maxX = qMax(maxX, x);
maxY = qMax(maxY, y);
tickXCount = x+1;
setupCategories(barSeries);
Michal Klocek
Refactor domain model...
r439 break;
}
case QSeries::SeriesTypeStackedBar: {
Michal Klocek
Adds back reimplemnted categories handling
r701
Michal Klocek
Refactor domain model...
r439 QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);
qreal x = stackedBarSeries->categoryCount();
qreal y = stackedBarSeries->maxCategorySum();
Michal Klocek
Adds back reimplemnted categories handling
r701 minX = qMin(minX, x);
minY = qMin(minY, y);
maxX = qMax(maxX, x);
maxY = qMax(maxY, y);
tickXCount = x+1;
setupCategories(stackedBarSeries);
Michal Klocek
Refactor domain model...
r439 break;
}
case QSeries::SeriesTypePercentBar: {
Michal Klocek
Adds back reimplemnted categories handling
r701
Michal Klocek
Refactor domain model...
r439 QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);
qreal x = percentBarSeries->categoryCount();
Michal Klocek
Adds back reimplemnted categories handling
r701 minX = qMin(minX, x);
maxX = qMax(maxX, x);
minY = 0;
maxY = 100;
setupCategories(percentBarSeries);
Michal Klocek
Refactor domain model...
r439 break;
Marek Rosa
Marge spline
r418 }
Michal Klocek
Fix unit test
r411
Michal Klocek
Refactor domain model...
r439 case QSeries::SeriesTypePie: {
Jani Honkonen
We have so many stupid warnings that "treat warnings as errors" flag is needed...
r609 //QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
Michal Klocek
Refactor domain model...
r439 // TODO: domain stuff
break;
}
Michal Klocek
Fix unit test
r411
Michal Klocek
Refactors axis handling...
r223
Michal Klocek
Refactor domain model...
r439 default: {
qDebug()<<__FUNCTION__<<"type" << series->type()<<"not supported";
return;
Michal Klocek
Refactors axis handling...
r223 }
Michal Klocek
Refactor domain model...
r439
Michal Klocek
Refactored for MVP...
r139 }
Michal Klocek
Adds back reimplemnted categories handling
r701
domain->setRangeX(minX,maxX,tickXCount);
domain->setRangeY(minY,maxY,tickYCount);
}
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 }
Tero Ahola
Reserve ordering of chart series internally....
r825 int ChartDataSet::seriesIndex(QSeries *series) const
Tero Ahola
Fixed bug with changing theme when several series exist
r538 {
Tero Ahola
Reserve ordering of chart series internally....
r825 for (int i(0); i < m_seriesAxisList.count(); i++) {
QPair<QSeries *, QChartAxis *> pair = m_seriesAxisList.at(i);
if (pair.first == series)
return i;
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 {
Tero Ahola
Reserve ordering of chart series internally....
r825 if (series == 0)
return m_axisY;
return m_seriesAxisList.at(seriesIndex(series)).second;
Michal Klocek
Refactors axis handling...
r223 }
Michal Klocek
Refactor domain model...
r439 Domain* ChartDataSet::domain(QSeries* series) const
Michal Klocek
Refactors axis handling...
r223 {
Tero Ahola
Reserve ordering of chart series internally....
r825 QChartAxis* axis = m_seriesAxisList.at(seriesIndex(series)).second;
if (axis)
Michal Klocek
Refactor domain model...
r439 return m_axisDomainMap.value(axis);
Tero Ahola
Reserve ordering of chart series internally....
r825 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