##// END OF EJS Templates
Bugfix: axis visibily issues...
Bugfix: axis visibily issues * adds missing isTitleVisible * fixes axis->setVisible * invalidate layout when visibilty changed

File last commit:

r2288:a12d6a605fab
r2297:bf59b22cf3e9
Show More
chartpresenter.cpp
315 lines | 7.2 KiB | text/x-c | CppLexer
/ src / chartpresenter.cpp
Jani Honkonen
Add license headers
r794 /****************************************************************************
Michal Klocek
Fixes header guard style issues
r969 **
** 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$
**
****************************************************************************/
#include "chartpresenter_p.h"
Michal Klocek
Refactored for MVP...
r139 #include "qchart.h"
Michal Klocek
Refactors internals...
r2273 #include "chartitem_p.h"
Michal Klocek
Refactor qledgend handling...
r855 #include "qchart_p.h"
Michal Klocek
Refactors QAxis to QAbstractAxis...
r1541 #include "qabstractaxis.h"
Michal Klocek
Refactors core to support mulitpile axis and domains...
r1556 #include "qabstractaxis_p.h"
Michal Klocek
Refactors qchart , adds line animation...
r131 #include "chartdataset_p.h"
Michal Klocek
Refactors axis animation, line animations
r1241 #include "chartanimation_p.h"
Tero Ahola
Renamed QSeries to QAbstractSeries
r988 #include "qabstractseries_p.h"
Michal Klocek
Adds area chart...
r421 #include "qareaseries.h"
Michal Klocek
Changes QChartAxis -> QAxis
r1006 #include "chartaxis_p.h"
#include "chartbackground_p.h"
Michal Klocek
Refactors layout managment...
r1534 #include "chartlayout_p.h"
Michal Klocek
Refactors layout...
r1965 #include "charttitle_p.h"
Michal Klocek
Refactors axis animation, line animations
r1241 #include <QTimer>
Michal Klocek
Refactors qchart , adds line animation...
r131
QTCOMMERCIALCHART_BEGIN_NAMESPACE
Michal Klocek
Refactors internals...
r2273 ChartPresenter::ChartPresenter(QChart *chart)
Jani Honkonen
src folder: another massive victory for coding style police
r2131 : QObject(chart),
m_chart(chart),
m_options(QChart::NoAnimation),
m_state(ShowState),
m_layout(new ChartLayout(this)),
m_background(0),
m_title(0)
Michal Klocek
Refactors qchart , adds line animation...
r131 {
Michal Klocek
Refactors axis animation, line animations
r1241
Michal Klocek
Refactors qchart , adds line animation...
r131 }
ChartPresenter::~ChartPresenter()
{
Michal Klocek
Refactors internals...
r2273
Michal Klocek
Refactors qchart , adds line animation...
r131 }
Michal Klocek
Refactors internals...
r2273 void ChartPresenter::setGeometry(const QRectF rect)
Michal Klocek
Refactors qchart , adds line animation...
r131 {
Michal Klocek
Refactors internals...
r2273 if(m_rect != rect) {
m_rect=rect;
foreach (ChartItem *chart, m_chartItems){
chart->domain()->setSize(rect.size());
chart->setPos(rect.topLeft());
}
}
}
Michal Klocek
Refactors Domain and Axis...
r1698
Michal Klocek
Refactors internals...
r2273 QRectF ChartPresenter::geometry() const
{
return m_rect;
}
Michal Klocek
Refactors Domain and Axis...
r1698
Michal Klocek
Refactors internals...
r2273 void ChartPresenter::handleAxisAdded(QAbstractAxis *axis)
{
axis->d_ptr->initializeGraphics(rootItem());
axis->d_ptr->initializeAnimations(m_options);
ChartAxis *item = axis->d_ptr->axisItem();
item->setPresenter(this);
item->setThemeManager(m_chart->d_ptr->m_themeManager);
m_axisItems<<item;
m_axes<<axis;
Michal Klocek
Refactors layout:...
r2105 m_layout->invalidate();
Michal Klocek
Refactors axis handling...
r223 }
Jani Honkonen
src folder: another massive victory for coding style police
r2131 void ChartPresenter::handleAxisRemoved(QAbstractAxis *axis)
Michal Klocek
Refactors axis handling...
r223 {
Michal Klocek
Refactors internals...
r2273 ChartAxis *item = axis->d_ptr->m_item.take();
Michal Klocek
Refactor Visibly methods of axis...
r1729 item->hide();
item->disconnect();
sauimone
fixed bug in series deletion
r1562 item->deleteLater();
Michal Klocek
Refactors internals...
r2273 m_axisItems.removeAll(item);
m_axes.removeAll(axis);
Michal Klocek
Removes legacy code - selectVisibleAxis
r2154 m_layout->invalidate();
Michal Klocek
Refactors axis handling...
r223 }
Michal Klocek
Refactors internals...
r2273 void ChartPresenter::handleSeriesAdded(QAbstractSeries *series)
Michal Klocek
Refactors qchart , adds line animation...
r131 {
Michal Klocek
Refactors internals...
r2273 series->d_ptr->initializeGraphics(rootItem());
series->d_ptr->initializeAnimations(m_options);
ChartItem *chart = series->d_ptr->chartItem();
chart->setPresenter(this);
chart->setThemeManager(m_chart->d_ptr->m_themeManager);
chart->domain()->setSize(m_rect.size());
chart->setPos(m_rect.topLeft());
chart->handleDomainUpdated(); //this could be moved to intializeGraphics when animator is refactored
m_chartItems<<chart;
m_series<<series;
Michal Klocek
Refactors layout:...
r2105 m_layout->invalidate();
Michal Klocek
Refactors qchart , adds line animation...
r131 }
Jani Honkonen
src folder: another massive victory for coding style police
r2131 void ChartPresenter::handleSeriesRemoved(QAbstractSeries *series)
Michal Klocek
Refactored for MVP...
r139 {
Michal Klocek
Refactors internals...
r2273 ChartItem *chart = series->d_ptr->m_item.take();
chart->hide();
chart->disconnect();
chart->deleteLater();
m_chartItems.removeAll(chart);
m_series.removeAll(series);
m_layout->invalidate();
Michal Klocek
Adds missing ids to theme classes
r153 }
Michal Klocek
Adds animation settings handling
r298 void ChartPresenter::setAnimationOptions(QChart::AnimationOptions options)
{
Jani Honkonen
src folder: another massive victory for coding style police
r2131 if (m_options != options) {
m_options = options;
Michal Klocek
Animation refactor...
r530
Michal Klocek
Refactors internals...
r2273 foreach(QAbstractSeries* series, m_series){
series->d_ptr->initializeAnimations(m_options);
}
foreach(QAbstractAxis* axis, m_axes){
axis->d_ptr->initializeAnimations(m_options);
}
Jani Honkonen
src folder: another massive victory for coding style police
r2131 }
Michal Klocek
Adds scroll support...
r531 }
Michal Klocek
Refactors internals...
r2273 void ChartPresenter::setState(State state,QPointF point)
Michal Klocek
Refactor domain model...
r439 {
Michal Klocek
Refactors internals...
r2273 m_state=state;
m_statePoint=point;
Michal Klocek
Adds scroll support...
r531 }
Michal Klocek
Adds animation settings handling
r298 QChart::AnimationOptions ChartPresenter::animationOptions() const
{
return m_options;
}
Michal Klocek
Refactors layout managment...
r1534 void ChartPresenter::createBackgroundItem()
Michal Klocek
Refactor qledgend handling...
r855 {
Michal Klocek
Refactors layout...
r1965 if (!m_background) {
m_background = new ChartBackground(rootItem());
m_background->setPen(Qt::NoPen);
m_background->setZValue(ChartPresenter::BackgroundZValue);
Michal Klocek
Refactors layout managment...
r1534 }
}
Michal Klocek
Refactor qledgend handling...
r855
Michal Klocek
Refactors layout managment...
r1534 void ChartPresenter::createTitleItem()
{
Michal Klocek
Refactors layout...
r1965 if (!m_title) {
m_title = new ChartTitle(rootItem());
m_title->setZValue(ChartPresenter::BackgroundZValue);
Michal Klocek
Refactors layout managment...
r1534 }
}
Tero Ahola
Added property definitions to QChart
r1524
Michal Klocek
Refactor qledgend handling...
r855
Michal Klocek
Refactors layout managment...
r1534 void ChartPresenter::handleAnimationFinished()
{
Jani Honkonen
src folder: another massive victory for coding style police
r2131 m_animations.removeAll(qobject_cast<ChartAnimation *>(sender()));
if (m_animations.empty())
emit animationsFinished();
Michal Klocek
Refactors layout managment...
r1534 }
Michal Klocek
Refactor qledgend handling...
r855
Jani Honkonen
src folder: another massive victory for coding style police
r2131 void ChartPresenter::startAnimation(ChartAnimation *animation)
Michal Klocek
Refactors layout managment...
r1534 {
Michal Klocek
Refactors layout:...
r2105 if (animation->state() != QAbstractAnimation::Stopped) animation->stop();
Jani Honkonen
src folder: another massive victory for coding style police
r2131 QObject::connect(animation, SIGNAL(finished()), this, SLOT(handleAnimationFinished()), Qt::UniqueConnection);
if (!m_animations.isEmpty())
Michal Klocek
Refactors layout managment...
r1534 m_animations.append(animation);
QTimer::singleShot(0, animation, SLOT(start()));
}
Michal Klocek
Refactor qledgend handling...
r855
Jani Honkonen
src folder: another massive victory for coding style police
r2131 void ChartPresenter::setBackgroundBrush(const QBrush &brush)
Michal Klocek
Refactors layout managment...
r1534 {
createBackgroundItem();
Michal Klocek
Refactors layout...
r1965 m_background->setBrush(brush);
Michal Klocek
Refactors layout managment...
r1534 m_layout->invalidate();
}
Michal Klocek
Refactor qledgend handling...
r855
Michal Klocek
Refactors layout managment...
r1534 QBrush ChartPresenter::backgroundBrush() const
{
Jani Honkonen
src folder: another massive victory for coding style police
r2131 if (!m_background)
return QBrush();
Michal Klocek
Refactors layout...
r1965 return m_background->brush();
Michal Klocek
Refactors layout managment...
r1534 }
Michal Klocek
Refactor qledgend handling...
r855
Jani Honkonen
src folder: another massive victory for coding style police
r2131 void ChartPresenter::setBackgroundPen(const QPen &pen)
Michal Klocek
Refactors layout managment...
r1534 {
createBackgroundItem();
Michal Klocek
Refactors layout...
r1965 m_background->setPen(pen);
Michal Klocek
Refactors layout managment...
r1534 m_layout->invalidate();
}
Michal Klocek
Refactor qledgend handling...
r855
Michal Klocek
Refactors layout managment...
r1534 QPen ChartPresenter::backgroundPen() const
{
Jani Honkonen
src folder: another massive victory for coding style police
r2131 if (!m_background)
return QPen();
Michal Klocek
Refactors layout...
r1965 return m_background->pen();
Michal Klocek
Refactors layout managment...
r1534 }
Michal Klocek
Add minimum size back to chartview and qchart
r913
Jani Honkonen
src folder: another massive victory for coding style police
r2131 void ChartPresenter::setTitle(const QString &title)
Michal Klocek
Refactors layout managment...
r1534 {
createTitleItem();
Michal Klocek
Refactors layout...
r1965 m_title->setText(title);
Michal Klocek
Refactors layout managment...
r1534 m_layout->invalidate();
}
Michal Klocek
Add minimum size back to chartview and qchart
r913
Michal Klocek
Refactors layout managment...
r1534 QString ChartPresenter::title() const
{
Jani Honkonen
src folder: another massive victory for coding style police
r2131 if (!m_title)
return QString();
Michal Klocek
Refactors layout...
r1965 return m_title->text();
Michal Klocek
Refactors layout managment...
r1534 }
Michal Klocek
Refactor qledgend handling...
r855
Jani Honkonen
src folder: another massive victory for coding style police
r2131 void ChartPresenter::setTitleFont(const QFont &font)
Michal Klocek
Refactors layout managment...
r1534 {
createTitleItem();
Michal Klocek
Refactors layout...
r1965 m_title->setFont(font);
Michal Klocek
Refactors layout managment...
r1534 m_layout->invalidate();
}
Michal Klocek
Refactor qledgend handling...
r855
Michal Klocek
Refactors layout managment...
r1534 QFont ChartPresenter::titleFont() const
{
Jani Honkonen
src folder: another massive victory for coding style police
r2131 if (!m_title)
return QFont();
Michal Klocek
Refactors layout...
r1965 return m_title->font();
Michal Klocek
Refactors layout managment...
r1534 }
Michal Klocek
Add minimum size back to chartview and qchart
r913
Michal Klocek
Refactors layout managment...
r1534 void ChartPresenter::setTitleBrush(const QBrush &brush)
{
createTitleItem();
Michal Klocek
Refactors layout...
r1965 m_title->setBrush(brush);
Michal Klocek
Refactors layout managment...
r1534 m_layout->invalidate();
}
Michal Klocek
Bugfixes for unnesery geometry changes
r869
Michal Klocek
Refactors layout managment...
r1534 QBrush ChartPresenter::titleBrush() const
{
Jani Honkonen
src folder: another massive victory for coding style police
r2131 if (!m_title)
return QBrush();
Michal Klocek
Refactors layout...
r1965 return m_title->brush();
Michal Klocek
Refactors layout managment...
r1534 }
void ChartPresenter::setBackgroundVisible(bool visible)
{
createBackgroundItem();
Michal Klocek
Refactors layout...
r1965 m_background->setVisible(visible);
Michal Klocek
Refactors layout managment...
r1534 }
Michal Klocek
Refactor , move dataset legend presentr connections to one place
r871
Michal Klocek
Refactor qledgend handling...
r855
Michal Klocek
Refactors layout managment...
r1534 bool ChartPresenter::isBackgroundVisible() const
{
Jani Honkonen
src folder: another massive victory for coding style police
r2131 if (!m_background)
return false;
Michal Klocek
Refactors layout...
r1965 return m_background->isVisible();
Michal Klocek
Refactor qledgend handling...
r855 }
Michal Klocek
Refactors layout managment...
r1534 void ChartPresenter::setBackgroundDropShadowEnabled(bool enabled)
Michal Klocek
Refactor qledgend handling...
r855 {
Michal Klocek
Refactors layout managment...
r1534 createBackgroundItem();
Michal Klocek
Refactors layout...
r1965 m_background->setDropShadowEnabled(enabled);
Michal Klocek
Refactor qledgend handling...
r855 }
Michal Klocek
Refactors layout managment...
r1534 bool ChartPresenter::isBackgroundDropShadowEnabled() const
Michal Klocek
Refactor qledgend handling...
r855 {
Jani Honkonen
src folder: another massive victory for coding style police
r2131 if (!m_background)
return false;
Michal Klocek
Refactors layout...
r1965 return m_background->isDropShadowEnabled();
Michal Klocek
Refactor qledgend handling...
r855 }
Michal Klocek
Refactor themes...
r143
Michal Klocek
Refactors layout managment...
r1534
Jani Honkonen
src folder: another massive victory for coding style police
r2131 ChartLayout *ChartPresenter::layout()
Michal Klocek
Refactors axis animation, line animations
r1241 {
Michal Klocek
Refactors layout managment...
r1534 return m_layout;
Michal Klocek
Refactors axis animation, line animations
r1241 }
Jani Honkonen
src folder: another massive victory for coding style police
r2131 QLegend *ChartPresenter::legend()
Michal Klocek
Refactors layout managment...
r1534 {
return m_chart->legend();
}
Michal Klocek
Refactors layout...
r1965 void ChartPresenter::setVisible(bool visible)
{
m_chart->setVisible(visible);
}
Jani Honkonen
src folder: another massive victory for coding style police
r2131 ChartBackground *ChartPresenter::backgroundElement()
Michal Klocek
Refactors layout...
r1965 {
return m_background;
}
Jani Honkonen
src folder: another massive victory for coding style police
r2131 QList<ChartAxis *> ChartPresenter::axisItems() const
Michal Klocek
Refactors layout managment...
r1534 {
Michal Klocek
Refactors internals...
r2273 return m_axisItems;
Michal Klocek
Refactors layout managment...
r1534 }
Michal Klocek
Refactors internals...
r2273 QList<ChartItem *> ChartPresenter::chartItems() const
Michal Klocek
Refactors layout:...
r2105 {
Michal Klocek
Refactors internals...
r2273 return m_chartItems;
Michal Klocek
Refactors layout:...
r2105 }
Jani Honkonen
src folder: another massive victory for coding style police
r2131 ChartTitle *ChartPresenter::titleElement()
Michal Klocek
Refactors layout managment...
r1534 {
Michal Klocek
Refactors layout...
r1965 return m_title;
Michal Klocek
Refactors axis animation, line animations
r1241 }
Michal Klocek
Refactors qchart , adds line animation...
r131 #include "moc_chartpresenter_p.cpp"
QTCOMMERCIALCHART_END_NAMESPACE