##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Bugfix missing min max intialization when axis added to domain
Bugfix missing min max intialization when axis added to domain
Michal Klocek - - Load All Authors

File last commit:

r442:6c610328d6c5
r442:6c610328d6c5
Show More
chartdataset.cpp
291 lines | 8.4 KiB | text/x-c | CppLexer
/ src / chartdataset.cpp
History | Source | Raw |Copy content |Copy permalink
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
Michal Klocek
Refactor domain model...
 r439 QChartAxis* axis = m_seriesAxisMap.value(series);
Michal Klocek
Refactors axis handling...
 r223
Michal Klocek
Refactor domain model...
 r439 if(axis) {
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
Refactors axis handling...
 r223
Michal Klocek
Refactor domain model...
 r439 if(!domain) {
domain = new Domain();
Michal Klocek
Refactors axis handling...
 r223
Michal Klocek
Refactor domain model...
 r439 QObject::connect(axisY,SIGNAL(rangeChanged(qreal,qreal)),domain,SLOT(handleAxisRangeXChanged(qreal,qreal)));
QObject::connect(axisX(),SIGNAL(rangeChanged(qreal,qreal)),domain,SLOT(handleAxisRangeYChanged(qreal,qreal)));
Michal Klocek
Bugfix missing min max intialization when axis added to domain
 r442 //initialize
qDebug()<<axisX()->min()<<axisX()->max();
domain->handleAxisRangeYChanged(axisY->min(),axisY->max());
domain->handleAxisRangeXChanged(axisX()->min(),axisX()->max());
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
Refactor domain model...
 r439 if(!m_axisXInitialized){
emit axisAdded(axisX(),domain);
m_axisXInitialized=true;
}
Michal Klocek
Adds area chart...
 r421
Michal Klocek
Refactor domain model...
 r439 calculateDomain(series,domain);
Michal Klocek
Adds area chart...
 r421
Michal Klocek
Refactor domain model...
 r439 m_seriesAxisMap.insert(series,axisY);
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)
{
Tero Ahola
Integrated scatter again. Missing functionality....
 r158
Michal Klocek
Refactor domain model...
 r439 QChartAxis* axis = m_seriesAxisMap.value(series);
Marek Rosa
Spline working somewhat
 r401
Michal Klocek
Refactor domain model...
 r439 if(!axis){
qWarning()<<"Can not remove series. Series not found on the chart.";
Marek Rosa
Spline working somewhat
 r401 return;
}
Michal Klocek
Refactor domain model...
 r439 emit seriesRemoved(series);
m_seriesAxisMap.remove(series);
Michal Klocek
Refactored for MVP...
 r139
Michal Klocek
Refactor domain model...
 r439 if(series->parent()==this){
delete series;
series=0;
Michal Klocek
Refactored for MVP...
 r139 }
Michal Klocek
Refactor domain model...
 r439 QList<QChartAxis*> axes = m_seriesAxisMap.values();
Michal Klocek
Refactors axis handling...
 r223
Michal Klocek
Refactor domain model...
 r439 int i = axes.indexOf(axis);
Michal Klocek
Refactors axis handling...
 r223
Michal Klocek
Refactor domain model...
 r439 if(i==-1){
Domain* domain = m_axisDomainMap.take(axis);
emit axisRemoved(axis);
delete domain;
}
Michal Klocek
Refactors axis handling...
 r223
Michal Klocek
Refactor domain model...
 r439 if(m_seriesAxisMap.values().size()==0)
{
m_axisXInitialized=false;
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
Refactor domain model...
 r439 QList<QSeries*> series = m_seriesAxisMap.keys();
Michal Klocek
Refactors axis handling...
 r223
Michal Klocek
Refactor domain model...
 r439 foreach(QSeries* s , series) {
removeSeries(s);
Michal Klocek
Refactored for MVP...
 r139 }
Michal Klocek
Refactor domain model...
 r439 Q_ASSERT(m_seriesAxisMap.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
void ChartDataSet::calculateDomain(QSeries* series,Domain* domain) const
Michal Klocek
Refactored for MVP...
 r139 {
Michal Klocek
Refactor domain model...
 r439 switch(series->type())
{
case QSeries::SeriesTypeLine: {
Michal Klocek
Bugfix: check series count before changing domain
 r373
Michal Klocek
Refactor domain model...
 r439 QLineSeries* lineSeries = static_cast<QLineSeries*>(series);
Michal Klocek
Bugfix missing xaxis label update on zoomOut
 r265
Michal Klocek
Refactor domain model...
 r439 for (int i = 0; i < lineSeries->count(); i++)
{
qreal x = lineSeries->x(i);
qreal y = lineSeries->y(i);
domain->setMinX(qMin(domain->minX(),x));
domain->setMinY(qMin(domain->minY(),y));
domain->setMaxX(qMax(domain->maxX(),x));
domain->setMaxY(qMax(domain->maxY(),y));
}
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);
Michal Klocek
Refactors axis handling...
 r223
Michal Klocek
Refactor domain model...
 r439 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);
domain->setMinX(qMin(domain->minX(),x));
domain->setMinY(qMin(domain->minY(),y));
domain->setMaxX(qMax(domain->maxX(),x));
domain->setMaxY(qMax(domain->maxY(),y));
}
if(lowerSeries) {
for (int i = 0; i < lowerSeries->count(); i++)
{
qreal x = lowerSeries->x(i);
qreal y = lowerSeries->y(i);
domain->setMinX(qMin(domain->minX(),x));
domain->setMinY(qMin(domain->minY(),y));
domain->setMaxX(qMax(domain->maxX(),x));
domain->setMaxY(qMax(domain->maxY(),y));
}}
break;
}
case QSeries::SeriesTypeBar: {
qDebug() << "QChartSeries::SeriesTypeBar";
QBarSeries* barSeries = static_cast<QBarSeries*>(series);
qreal x = barSeries->categoryCount();
qreal y = barSeries->max();
domain->setMinX(qMin(domain->minX(),x));
domain->setMinY(qMin(domain->minY(),y));
domain->setMaxX(qMax(domain->maxX(),x));
domain->setMaxY(qMax(domain->maxY(),y));
break;
}
case QSeries::SeriesTypeStackedBar: {
qDebug() << "QChartSeries::SeriesTypeStackedBar";
QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);
qreal x = stackedBarSeries->categoryCount();
qreal y = stackedBarSeries->maxCategorySum();
domain->setMinX(qMin(domain->minX(),x));
domain->setMinY(qMin(domain->minY(),y));
domain->setMaxX(qMax(domain->maxX(),x));
domain->setMaxY(qMax(domain->maxY(),y));
break;
}
case QSeries::SeriesTypePercentBar: {
qDebug() << "QChartSeries::SeriesTypePercentBar";
QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);
qreal x = percentBarSeries->categoryCount();
domain->setMinX(qMin(domain->minX(),x));
domain->setMinY(0);
domain->setMaxX(qMax(domain->maxX(),x));
domain->setMaxY(100);
break;
Marek Rosa
Marge spline
 r418 }
Michal Klocek
Fix unit test
 r411
Michal Klocek
Refactor domain model...
 r439 case QSeries::SeriesTypePie: {
QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
// TODO: domain stuff
break;
}
Michal Klocek
Fix unit test
 r411
Michal Klocek
Refactor domain model...
 r439 case QSeries::SeriesTypeScatter: {
QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
Q_ASSERT(scatterSeries);
foreach (QPointF point, scatterSeries->data()) {
domain->setMinX(qMin(domain->minX(), point.x()));
domain->setMinY(qMax(domain->maxX(), point.x()));
domain->setMaxX(qMin(domain->minY(), point.y()));
domain->setMaxY(qMax(domain->maxY(), point.y()));
}
break;
}
Michal Klocek
Refactors axis handling...
 r223
Michal Klocek
Refactor domain model...
 r439 case QSeries::SeriesTypeSpline: {
QSplineSeries* splineSeries = static_cast<QSplineSeries*>(series);
Michal Klocek
Refactors axis handling...
 r223
Michal Klocek
Refactor domain model...
 r439 for (int i = 0; i < splineSeries->count(); i++)
{
qreal x = splineSeries->x(i);
qreal y = splineSeries->y(i);
domain->setMinX(qMin(domain->minX(),x));
domain->setMinY(qMin(domain->minY(),y));
domain->setMaxX(qMax(domain->maxX(),x));
domain->setMaxY(qMax(domain->maxY(),y));
}
break;
}
Michal Klocek
Refactors axis handling...
 r223
Michal Klocek
Refactor domain model...
 r439 default: {
qDebug()<<__FUNCTION__<<"type" << series->type()<<"not supported";
return;
break;
Michal Klocek
Refactors axis handling...
 r223 }
Michal Klocek
Refactor domain model...
 r439
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
Refactor domain model...
 r439 QMapIterator<QChartAxis*, Domain*> i( m_axisDomainMap);
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)
{
QMapIterator<QChartAxis*, Domain*> i( m_axisDomainMap);
while (i.hasNext()) {
i.next();
i.value()->zoomOut(rect,size);
}
Michal Klocek
Refactors axis handling...
 r223 }
Michal Klocek
Rename QChartSeries to QSeries
 r360 QChartAxis* ChartDataSet::axisY(QSeries* series) const
Michal Klocek
Refactors axis handling...
 r223 {
if(series == 0) return m_axisY;
Michal Klocek
Refactor domain model...
 r439 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
Refactor domain model...
 r439 QChartAxis* axis = m_seriesAxisMap.value(series);
if(axis){
return m_axisDomainMap.value(axis);
}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
Refactor domain model...
 r439 return m_axisDomainMap.value(axis);
Michal Klocek
Refactors axis handling...
 r223 }
Michal Klocek
Refactor domain model...
 r439 QChartAxis* ChartDataSet::axis(QSeries* series) const
Michal Klocek
Refactors axis handling...
 r223 {
Michal Klocek
Refactor domain model...
 r439 return m_seriesAxisMap.value(series);
Michal Klocek
Refactors qchart , adds line animation...
 r131 }
#include "moc_chartdataset_p.cpp"
QTCOMMERCIALCHART_END_NAMESPACE