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

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

Refactor domain model...
Refactor domain model * rewrites doman hadnling to support better mulitaxis * rewrites zoom in zoom out handling * makes domain a qobject * adds domain unit test * updates chartdataset unit test * renames signlas and slots for domain handling
Michal Klocek - - Load All Authors

File last commit:

r439:86afa1b4ff5f
r439:86afa1b4ff5f
Show More
chartpresenter.cpp
364 lines | 12.2 KiB | text/x-c | CppLexer
/ src / chartpresenter.cpp
History | Source | Raw |Copy content |Copy permalink
Michal Klocek
Refactored for MVP...
 r139 #include "qchart.h"
Michal Klocek
Adds refactored axis to presenter
 r140 #include "qchartaxis.h"
Michal Klocek
Refactors qchart , adds line animation...
 r131 #include "chartpresenter_p.h"
#include "chartdataset_p.h"
Michal Klocek
Refactor themes...
 r143 #include "charttheme_p.h"
Michal Klocek
Refactored for MVP...
 r139 //series
sauimone
Naming convention change for barcharts. QBarChartSeries is now QBarSeries etc.
 r338 #include "qbarseries.h"
#include "qstackedbarseries.h"
#include "qpercentbarseries.h"
Michal Klocek
Rename QLineChartSeries to QLineSeries
 r349 #include "qlineseries.h"
Michal Klocek
Adds area chart...
 r421 #include "qareaseries.h"
Jani Honkonen
Pie chart refactoring
 r142 #include "qpieseries.h"
Tero Ahola
Integrated scatter again. Missing functionality....
 r158 #include "qscatterseries.h"
Marek Rosa
Spline initial
 r295 #include "qsplineseries.h"
Michal Klocek
Refactored for MVP...
 r139 //items
Michal Klocek
Adds refactored axis to presenter
 r140 #include "axisitem_p.h"
Michal Klocek
Adds animation settings handling
 r298 #include "axisanimationitem_p.h"
Michal Klocek
Adds area chart...
 r421 #include "areachartitem_p.h"
sauimone
added _p to private class headers
 r381 #include "barpresenter_p.h"
#include "stackedbarpresenter_p.h"
#include "percentbarpresenter_p.h"
Michal Klocek
Fix previous broken commit
 r145 #include "linechartitem_p.h"
Michal Klocek
Refactors qchart , adds line animation...
 r131 #include "linechartanimationitem_p.h"
Jani Honkonen
Add _p to pie internal headers
 r353 #include "piepresenter_p.h"
Tero Ahola
Moved scatter impl into a subfolder
 r194 #include "scatterpresenter_p.h"
Marek Rosa
Spline initial
 r295 #include "splinepresenter_p.h"
Michal Klocek
Refactors qchart , adds line animation...
 r131
QTCOMMERCIALCHART_BEGIN_NAMESPACE
ChartPresenter::ChartPresenter(QChart* chart,ChartDataSet* dataset):QObject(chart),
Marek Rosa
Spline working somewhat
 r401 m_chart(chart),
m_dataset(dataset),
m_chartTheme(0),
Michal Klocek
Refactor domain model...
 r439 m_zoomIndex(0),
Marek Rosa
Spline working somewhat
 r401 m_marginSize(0),
Marek Rosa
Marge spline
 r418 m_rect(QRectF(QPoint(0,0),m_chart->size())),
Michal Klocek
Refactor domain model...
 r439 m_options(QChart::NoAnimation)
Michal Klocek
Refactors qchart , adds line animation...
 r131 {
Marek Rosa
Spline working somewhat
 r401 createConnections();
Michal Klocek
Adds missing ids to theme classes
 r153 setChartTheme(QChart::ChartThemeDefault);
Michal Klocek
Refactors qchart , adds line animation...
 r131 }
ChartPresenter::~ChartPresenter()
{
}
Michal Klocek
Adds refactored axis to presenter
 r140 void ChartPresenter::createConnections()
Michal Klocek
Refactors qchart , adds line animation...
 r131 {
QObject::connect(m_chart,SIGNAL(geometryChanged()),this,SLOT(handleGeometryChanged()));
Michal Klocek
Refactor domain model...
 r439 QObject::connect(m_dataset,SIGNAL(seriesAdded(QSeries*,Domain*)),this,SLOT(handleSeriesAdded(QSeries*,Domain*)));
Michal Klocek
Rename QChartSeries to QSeries
 r360 QObject::connect(m_dataset,SIGNAL(seriesRemoved(QSeries*)),this,SLOT(handleSeriesRemoved(QSeries*)));
Michal Klocek
Refactor domain model...
 r439 QObject::connect(m_dataset,SIGNAL(axisAdded(QChartAxis*,Domain*)),this,SLOT(handleAxisAdded(QChartAxis*,Domain*)));
Michal Klocek
Refactors axis handling...
 r223 QObject::connect(m_dataset,SIGNAL(axisRemoved(QChartAxis*)),this,SLOT(handleAxisRemoved(QChartAxis*)));
}
QRectF ChartPresenter::geometry() const
{
return m_rect;
Michal Klocek
Refactors qchart , adds line animation...
 r131 }
void ChartPresenter::handleGeometryChanged()
{
Michal Klocek
Refactor domain model...
 r439 QRectF rect(QPoint(0,0),m_chart->size());
rect.adjust(m_marginSize,m_marginSize, -m_marginSize, -m_marginSize);
//rewrite zoom stack
for(int i=0;i<m_zoomStack.count();i++){
QRectF r = m_zoomStack[i];
qreal w = rect.width()/m_rect.width();
qreal h = rect.height()/m_rect.height();
QPointF tl = r.topLeft();
tl.setX(tl.x()*w);
tl.setY(tl.y()*h);
QPointF br = r.bottomRight();
br.setX(br.x()*w);
br.setY(br.y()*h);
r.setTopLeft(tl);
r.setBottomRight(br);
m_zoomStack[i]=r;
}
m_rect = rect;
Michal Klocek
Fix test application to have valid window size
 r147 Q_ASSERT(m_rect.isValid());
Michal Klocek
Refactored for MVP...
 r139 emit geometryChanged(m_rect);
}
Michal Klocek
Refactors qchart , adds line animation...
 r131
Michal Klocek
Refactored for MVP...
 r139 int ChartPresenter::margin() const
{
return m_marginSize;
}
Michal Klocek
Refactors qchart , adds line animation...
 r131
Michal Klocek
Refactored for MVP...
 r139 void ChartPresenter::setMargin(int margin)
{
m_marginSize = margin;
Michal Klocek
Refactors qchart , adds line animation...
 r131 }
Michal Klocek
Refactor domain model...
 r439 void ChartPresenter::handleAxisAdded(QChartAxis* axis,Domain* domain)
Michal Klocek
Refactors axis handling...
 r223 {
Michal Klocek
Adds animation settings handling
 r298
Michal Klocek
Refactors axis handling...
 r223 AxisItem* item ;
Michal Klocek
Adds animation settings handling
 r298 if(!m_options.testFlag(QChart::GridAxisAnimations))
{
Michal Klocek
Refactor domain model...
 r439 item = new AxisItem(axis,axis==m_dataset->axisX()?AxisItem::X_AXIS : AxisItem::Y_AXIS,m_chart);
Michal Klocek
Refactors axis handling...
 r223 }else{
Michal Klocek
Refactor domain model...
 r439 item = new AxisAnimationItem(axis,axis==m_dataset->axisX()?AxisItem::X_AXIS : AxisItem::Y_AXIS,m_chart);
}
if(axis==m_dataset->axisX()){
QObject::connect(domain,SIGNAL(rangeXChanged(qreal,qreal)),item,SLOT(handleRangeChanged(qreal,qreal)));
//initialize
item->handleRangeChanged(domain->minX(),domain->maxX());
}
else{
QObject::connect(domain,SIGNAL(rangeYChanged(qreal,qreal)),item,SLOT(handleRangeChanged(qreal,qreal)));
//initialize
item->handleRangeChanged(domain->minY(),domain->maxY());
Michal Klocek
Refactors axis handling...
 r223 }
Michal Klocek
Adds animation settings handling
 r298
Michal Klocek
Refactors axis handling...
 r223 QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
Michal Klocek
Refactor domain model...
 r439 //initialize
Michal Klocek
Bugfix no geometry call when axis removed and added again
 r259 item->handleGeometryChanged(m_rect);
Michal Klocek
Refactors axis handling...
 r223 m_chartTheme->decorate(axis,item);
m_axisItems.insert(axis,item);
}
void ChartPresenter::handleAxisRemoved(QChartAxis* axis)
{
AxisItem* item = m_axisItems.take(axis);
Q_ASSERT(item);
delete item;
}
Michal Klocek
Refactor domain model...
 r439 void ChartPresenter::handleSeriesAdded(QSeries* series,Domain* domain)
Michal Klocek
Refactors qchart , adds line animation...
 r131 {
switch(series->type())
{
Marek Rosa
Marge spline
 r418 case QSeries::SeriesTypeLine: {
Marek Rosa
Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts...
 r426
Marek Rosa
Marge spline
 r418 QLineSeries* lineSeries = static_cast<QLineSeries*>(series);
LineChartItem* item;
if(m_options.testFlag(QChart::SeriesAnimations)){
Michal Klocek
Refactor domain model...
 r439 item = new LineChartAnimationItem(lineSeries,m_chart);
Marek Rosa
Marge spline
 r418 }else{
Michal Klocek
Refactor domain model...
 r439 item = new LineChartItem(lineSeries,m_chart);
Michal Klocek
Refactored for MVP...
 r139 }
Michal Klocek
Refactor domain model...
 r439 QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),item,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
//initialize
item->handleDomainChanged(domain->minX(),domain->maxX(),domain->minY(),domain->maxY());
if(m_rect.isValid()) item->handleGeometryChanged(m_rect);
//decorate
Marek Rosa
Spline working somewhat
 r401 m_chartTheme->decorate(item,lineSeries,m_chartItems.count());
m_chartItems.insert(series,item);
Marek Rosa
Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts...
 r426 break;
}
Michal Klocek
Adds area chart...
 r421
Marek Rosa
Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts...
 r426 case QSeries::SeriesTypeArea: {
Michal Klocek
Refactored for MVP...
 r139
Marek Rosa
Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts...
 r426 QAreaSeries* areaSeries = static_cast<QAreaSeries*>(series);
AreaChartItem* item;
if(m_options.testFlag(QChart::SeriesAnimations)) {
Michal Klocek
Refactor domain model...
 r439 item = new AreaChartItem(areaSeries,m_chart);
Marek Rosa
Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts...
 r426 }
else {
Michal Klocek
Refactor domain model...
 r439 item = new AreaChartItem(areaSeries,m_chart);
Michal Klocek
Refactors qchart , adds line animation...
 r131 }
Michal Klocek
Refactor domain model...
 r439 QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),item,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
//initialize
item->handleDomainChanged(domain->minX(),domain->maxX(),domain->minY(),domain->maxY());
if(m_rect.isValid()) item->handleGeometryChanged(m_rect);
//decorate
Marek Rosa
Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts...
 r426 m_chartTheme->decorate(item,areaSeries,m_chartItems.count());
m_chartItems.insert(series,item);
Marek Rosa
Spline working somewhat
 r401 break;
}
Michal Klocek
Refactored for MVP...
 r139
Marek Rosa
Marge spline
 r418 case QSeries::SeriesTypeBar: {
QBarSeries* barSeries = static_cast<QBarSeries*>(series);
Marek Rosa
Spline working somewhat
 r401 BarPresenter* item = new BarPresenter(barSeries,m_chart);
m_chartTheme->decorate(item,barSeries,m_chartItems.count());
QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
Marek Rosa
Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts...
 r427 // QObject::connect(barSeries,SIGNAL(changed(int)),item,SLOT(handleModelChanged(int)));
Marek Rosa
Spline working somewhat
 r401 m_chartItems.insert(series,item);
// m_axisXItem->setVisible(false);
Marek Rosa
Marge spline
 r418 if(m_rect.isValid()) item->handleGeometryChanged(m_rect);
Marek Rosa
Spline working somewhat
 r401 break;
}
Michal Klocek
Refactors qchart , adds line animation...
 r131
Marek Rosa
Marge spline
 r418 case QSeries::SeriesTypeStackedBar: {
Michal Klocek
Refactored for MVP...
 r139
Marek Rosa
Marge spline
 r418 QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);
Marek Rosa
Spline working somewhat
 r401 StackedBarPresenter* item = new StackedBarPresenter(stackedBarSeries,m_chart);
m_chartTheme->decorate(item,stackedBarSeries,m_chartItems.count());
QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
Marek Rosa
Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts...
 r427 // QObject::connect(stackedBarSeries,SIGNAL(changed(int)),item,SLOT(handleModelChanged(int)));
Marek Rosa
Spline working somewhat
 r401 m_chartItems.insert(series,item);
Marek Rosa
Marge spline
 r418 if(m_rect.isValid()) item->handleGeometryChanged(m_rect);
Marek Rosa
Spline working somewhat
 r401 break;
}
Michal Klocek
Refactored for MVP...
 r139
Marek Rosa
Marge spline
 r418 case QSeries::SeriesTypePercentBar: {
Michal Klocek
Refactored for MVP...
 r139
Marek Rosa
Marge spline
 r418 QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);
Marek Rosa
Spline working somewhat
 r401 PercentBarPresenter* item = new PercentBarPresenter(percentBarSeries,m_chart);
m_chartTheme->decorate(item,percentBarSeries ,m_chartItems.count());
QObject::connect(this,SIGNAL(geometryChanged(const QRectF&)),item,SLOT(handleGeometryChanged(const QRectF&)));
Marek Rosa
Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts...
 r427 // QObject::connect(percentBarSeries,SIGNAL(changed(int)),item,SLOT(handleModelChanged(int)));
Marek Rosa
Spline working somewhat
 r401 m_chartItems.insert(series,item);
Marek Rosa
Marge spline
 r418 if(m_rect.isValid()) item->handleGeometryChanged(m_rect);
Marek Rosa
Spline working somewhat
 r401 break;
}
Marek Rosa
Marge spline
 r418 case QSeries::SeriesTypeScatter: {
Marek Rosa
Spline working somewhat
 r401 QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
ScatterPresenter *scatterPresenter = new ScatterPresenter(scatterSeries, m_chart);
Marek Rosa
Marge spline
 r418 QObject::connect(scatterPresenter, SIGNAL(clicked(QPointF)),
scatterSeries, SIGNAL(clicked(QPointF)));
Marek Rosa
Spline working somewhat
 r401 QObject::connect(this, SIGNAL(geometryChanged(const QRectF&)),
scatterPresenter, SLOT(handleGeometryChanged(const QRectF&)));
m_chartTheme->decorate(scatterPresenter, scatterSeries, m_chartItems.count());
m_chartItems.insert(scatterSeries, scatterPresenter);
Marek Rosa
Marge spline
 r418 if(m_rect.isValid()) scatterPresenter->handleGeometryChanged(m_rect);
Marek Rosa
Spline working somewhat
 r401 break;
}
Marek Rosa
Marge spline
 r418 case QSeries::SeriesTypePie: {
Marek Rosa
Spline working somewhat
 r401 QPieSeries *s = qobject_cast<QPieSeries *>(series);
PiePresenter* pie = new PiePresenter(m_chart, s);
m_chartTheme->decorate(pie, s, m_chartItems.count());
QObject::connect(this, SIGNAL(geometryChanged(const QRectF&)), pie, SLOT(handleGeometryChanged(const QRectF&)));
Marek Rosa
Marge spline
 r418
// Hide all from background when there is only piechart
// TODO: refactor this ugly code... should be one setting for this
if (m_chartItems.count() == 0) {
m_chart->axisX()->setAxisVisible(false);
m_chart->axisY()->setAxisVisible(false);
m_chart->axisX()->setGridVisible(false);
m_chart->axisY()->setGridVisible(false);
m_chart->axisX()->setLabelsVisible(false);
m_chart->axisY()->setLabelsVisible(false);
m_chart->axisX()->setShadesVisible(false);
m_chart->axisY()->setShadesVisible(false);
m_chart->setChartBackgroundBrush(Qt::transparent);
Michal Klocek
Refactors qchart , adds line animation...
 r131 }
Marek Rosa
Marge spline
 r418
Marek Rosa
Spline working somewhat
 r401 m_chartItems.insert(series, pie);
Marek Rosa
Marge spline
 r418 pie->handleGeometryChanged(m_rect);
Marek Rosa
Spline working somewhat
 r401 break;
}
Marek Rosa
Merge branch 'master' of https://git.it.local/repos/QtCommercialDevel-13049/charts...
 r427
Marek Rosa
Spline with problems
 r419 case QSeries::SeriesTypeSpline: {
Marek Rosa
Spline initial
 r295 QSplineSeries* splineSeries = qobject_cast<QSplineSeries*>(series);
Marek Rosa
Spline working somewhat
 r401 SplinePresenter* splinePresenter = new SplinePresenter(splineSeries, m_chart);
QObject::connect(this, SIGNAL(geometryChanged(const QRectF&)), splinePresenter, SLOT(handleGeometryChanged(const QRectF&)));
m_chartTheme->decorate(splinePresenter, splineSeries, m_chartItems.count());
m_chartItems.insert(splineSeries, splinePresenter);
break;
}
default: {
qDebug()<< "Series type" << series->type() << "not implemented.";
Marek Rosa
Spline initial
 r295 break;
}
Michal Klocek
Refactors qchart , adds line animation...
 r131 }
Michal Klocek
Refactor domain model...
 r439
zoomReset();
Michal Klocek
Refactors qchart , adds line animation...
 r131 }
Michal Klocek
Rename QChartSeries to QSeries
 r360 void ChartPresenter::handleSeriesRemoved(QSeries* series)
Michal Klocek
Refactored for MVP...
 r139 {
Marek Rosa
Spline working somewhat
 r401 ChartItem* item = m_chartItems.take(series);
delete item;
Michal Klocek
Refactored for MVP...
 r139 }
Michal Klocek
Refactors qchart , adds line animation...
 r131
Michal Klocek
Adds missing ids to theme classes
 r153 void ChartPresenter::setChartTheme(QChart::ChartTheme theme)
Michal Klocek
Refactor themes...
 r143 {
delete m_chartTheme;
m_chartTheme = ChartTheme::createTheme(theme);
m_chartTheme->decorate(m_chart);
Michal Klocek
Rename QChartSeries to QSeries
 r360 QMapIterator<QSeries*,ChartItem*> i(m_chartItems);
Michal Klocek
Refactor themes...
 r143
int index=0;
while (i.hasNext()) {
i.next();
m_chartTheme->decorate(i.value(),i.key(),index);
Tero Ahola
Fixed bug in setting chart theme...
 r312 index++;
Michal Klocek
Refactor themes...
 r143 }
Michal Klocek
Refactors axis handling...
 r223 QMapIterator<QChartAxis*,AxisItem*> j(m_axisItems);
while (j.hasNext()) {
Marek Rosa
Spline working somewhat
 r401 j.next();
m_chartTheme->decorate(j.key(),j.value());
Michal Klocek
Refactors axis handling...
 r223 }
Michal Klocek
Adds more axis handling...
 r176 }
Michal Klocek
Adds missing ids to theme classes
 r153 QChart::ChartTheme ChartPresenter::chartTheme()
Michal Klocek
Refactor themes...
 r143 {
Michal Klocek
Adds missing ids to theme classes
 r153 return m_chartTheme->id();
}
Michal Klocek
Adds animation settings handling
 r298 void ChartPresenter::setAnimationOptions(QChart::AnimationOptions options)
{
if(m_options!=options) {
m_options=options;
//recreate elements
QList<QChartAxis*> axisList = m_axisItems.uniqueKeys();
Michal Klocek
Rename QChartSeries to QSeries
 r360 QList<QSeries*> seriesList = m_chartItems.uniqueKeys();
Michal Klocek
Adds animation settings handling
 r298
foreach(QChartAxis* axis, axisList) {
handleAxisRemoved(axis);
Michal Klocek
Refactor domain model...
 r439 handleAxisAdded(axis,m_dataset->domain(axis));
Michal Klocek
Adds animation settings handling
 r298 }
Michal Klocek
Rename QChartSeries to QSeries
 r360 foreach(QSeries* series, seriesList) {
Michal Klocek
Adds animation settings handling
 r298 handleSeriesRemoved(series);
Michal Klocek
Refactor domain model...
 r439 handleSeriesAdded(series,m_dataset->domain(series));
Michal Klocek
Adds animation settings handling
 r298 }
}
}
Michal Klocek
Refactor domain model...
 r439 void ChartPresenter::zoomIn()
{
QRectF rect = geometry();
rect.setWidth(rect.width()/2);
rect.setHeight(rect.height()/2);
rect.moveCenter(geometry().center());
zoomIn(rect);
}
void ChartPresenter::zoomIn(const QRectF& rect)
{
QRectF r = rect.normalized();
r.translate(-m_marginSize, -m_marginSize);
m_dataset->zoomInDomain(r,geometry().size());
m_zoomStack<<r;
m_zoomIndex++;
}
void ChartPresenter::zoomOut()
{
if(m_zoomIndex==0) return;
m_dataset->zoomOutDomain(m_zoomStack[m_zoomIndex-1],geometry().size());
m_zoomIndex--;
m_zoomStack.resize(m_zoomIndex);
}
void ChartPresenter::zoomReset()
{
m_zoomIndex=0;
m_zoomStack.resize(m_zoomIndex);
}
Michal Klocek
Adds animation settings handling
 r298 QChart::AnimationOptions ChartPresenter::animationOptions() const
{
return m_options;
}
Michal Klocek
Refactor themes...
 r143
Michal Klocek
Refactors qchart , adds line animation...
 r131 #include "moc_chartpresenter_p.cpp"
QTCOMMERCIALCHART_END_NAMESPACE