##// END OF EJS Templates
Updated version number and README for 1.2.1
Updated version number and README for 1.2.1

File last commit:

r2407:d108889b4c99
r2426:dc3d4ff0038e
Show More
xychart.cpp
162 lines | 4.3 KiB | text/x-c | CppLexer
Jani Honkonen
Add license headers
r794 /****************************************************************************
Michal Klocek
Refactors animation handling for xyseries
r1217 **
** 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$
**
****************************************************************************/
Jani Honkonen
Add license headers
r794
Michal Klocek
Refactor xychartitem -> xychart
r1218 #include "xychart_p.h"
Michal Klocek
Add missing files from previous commit
r466 #include "qxyseries.h"
Michal Klocek
Adds big fat pimpl to series classes...
r938 #include "qxyseries_p.h"
Michal Klocek
Add missing files from previous commit
r466 #include "chartpresenter_p.h"
Marek Rosa
Domains added
r2275 #include "abstractdomain_p.h"
Michal Klocek
Refactor animator...
r1735 #include "qxymodelmapper.h"
Michal Klocek
Add missing files from previous commit
r466 #include <QPainter>
Marek Rosa
QXYSeries: support for removing data from model when using custom mapping
r1055 #include <QAbstractItemModel>
Michal Klocek
Refactor animator...
r1735
Michal Klocek
Add missing files from previous commit
r466
QTCOMMERCIALCHART_BEGIN_NAMESPACE
Michal Klocek
Revert "TODOs removed from code. Undo me after release"...
r2407 //TODO: optimize : remove points which are not visible
Michal Klocek
Refactors internals...
r2273 XYChart::XYChart(QXYSeries *series,QGraphicsItem* item):
ChartItem(series->d_func(),item),
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 m_series(series),
m_animation(0),
m_dirty(true)
Michal Klocek
Refactors animation handling for xyseries
r1217 {
Tero Ahola
Minor: extra colons, commented out code
r1782 QObject::connect(series, SIGNAL(pointReplaced(int)), this, SLOT(handlePointReplaced(int)));
Tero Ahola
Added a new QXYSeries::replace override for performance reasons....
r1783 QObject::connect(series, SIGNAL(pointsReplaced()), this, SLOT(handlePointsReplaced()));
Tero Ahola
Minor: extra colons, commented out code
r1782 QObject::connect(series, SIGNAL(pointAdded(int)), this, SLOT(handlePointAdded(int)));
QObject::connect(series, SIGNAL(pointRemoved(int)), this, SLOT(handlePointRemoved(int)));
QObject::connect(this, SIGNAL(clicked(QPointF)), series, SIGNAL(clicked(QPointF)));
Marek Rosa
Added hovered signal to QLineSeries. Updated callout example
r2255 QObject::connect(this, SIGNAL(hovered(QPointF,bool)), series, SIGNAL(hovered(QPointF,bool)));
Michal Klocek
Refactors animation handling for xyseries
r1217 }
Michal Klocek
Refactors axis animation, line animations
r1241 void XYChart::setGeometryPoints(const QVector<QPointF>& points)
Michal Klocek
Refactors animation handling for xyseries
r1217 {
m_points = points;
}
Jani Honkonen
more coding style fixes for src-folder...
r2104 void XYChart::setAnimation(XYAnimation *animation)
Michal Klocek
Add missing files from previous commit
r466 {
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 m_animation = animation;
Michal Klocek
Add missing files from previous commit
r466 }
Michal Klocek
Refactors axis animation, line animations
r1241 void XYChart::setDirty(bool dirty)
{
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 m_dirty = dirty;
Michal Klocek
Refactors axis animation, line animations
r1241 }
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 void XYChart::updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index)
Michal Klocek
Add missing files from previous commit
r466 {
Michal Klocek
adds QLineAnimation fixes
r1271
Michal Klocek
Refactors animation handling for xyseries
r1217 if (m_animation) {
Michal Klocek
adds QLineAnimation fixes
r1271 m_animation->setup(oldPoints, newPoints, index);
Tero Ahola
Minor: extra colons, commented out code
r1782 m_points = newPoints;
Michal Klocek
Refactors axis animation, line animations
r1241 setDirty(false);
presenter()->startAnimation(m_animation);
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 } else {
Tero Ahola
Minor: extra colons, commented out code
r1782 m_points = newPoints;
Michal Klocek
Refactors animation handling for xyseries
r1217 updateGeometry();
Michal Klocek
Animation refactor...
r530 }
Michal Klocek
Add missing files from previous commit
r466 }
//handlers
Michal Klocek
Refactor xychartitem -> xychart
r1218 void XYChart::handlePointAdded(int index)
Michal Klocek
Add missing files from previous commit
r466 {
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 Q_ASSERT(index < m_series->count());
Q_ASSERT(index >= 0);
Michal Klocek
Refactors animation handling for xyseries
r1217
Michal Klocek
Refactors axis animation, line animations
r1241 QVector<QPointF> points;
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 if (m_dirty) {
Michal Klocek
Refactors internals...
r2273 points = domain()->calculateGeometryPoints(m_series->points());
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 } else {
points = m_points;
Marek Rosa
Negative values with log axis handled
r2356 QPointF point = domain()->calculateGeometryPoint(m_series->points()[index], m_validData);
if (!m_validData) {
m_points.clear();
return;
}
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 points.insert(index, point);
}
Michal Klocek
Refactors axis animation, line animations
r1241
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 updateChart(m_points, points, index);
Michal Klocek
Add missing files from previous commit
r466 }
Marek Rosa
QXYSeries: support for adding data to model when using custom mapping
r1054
Michal Klocek
Refactor xychartitem -> xychart
r1218 void XYChart::handlePointRemoved(int index)
Michal Klocek
Adds big fat pimpl to series classes...
r938 {
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 Q_ASSERT(index <= m_series->count());
Q_ASSERT(index >= 0);
Michal Klocek
Refactors animation handling for xyseries
r1217
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 QVector<QPointF> points;
Michal Klocek
Refactors animation handling for xyseries
r1217
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 if (m_dirty) {
Michal Klocek
Refactors internals...
r2273 points = domain()->calculateGeometryPoints(m_series->points());
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 } else {
points = m_points;
points.remove(index);
}
Michal Klocek
Refactors axis animation, line animations
r1241
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 updateChart(m_points, points, index);
Michal Klocek
Add missing files from previous commit
r466 }
Michal Klocek
Refactor xychartitem -> xychart
r1218 void XYChart::handlePointReplaced(int index)
Michal Klocek
Add missing files from previous commit
r466 {
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 Q_ASSERT(index < m_series->count());
Q_ASSERT(index >= 0);
Michal Klocek
Refactors animation handling for xyseries
r1217
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 QVector<QPointF> points;
Michal Klocek
Refactors animation handling for xyseries
r1217
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 if (m_dirty) {
Michal Klocek
Refactors internals...
r2273 points = domain()->calculateGeometryPoints(m_series->points());
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 } else {
Marek Rosa
Negative values with log axis handled
r2356 QPointF point = domain()->calculateGeometryPoint(m_series->points()[index], m_validData);
if (!m_validData) {
m_points.clear();
return;
}
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 points = m_points;
points.replace(index, point);
}
Michal Klocek
Refactors axis animation, line animations
r1241
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 updateChart(m_points, points, index);
Michal Klocek
Add missing files from previous commit
r466 }
Tero Ahola
Added a new QXYSeries::replace override for performance reasons....
r1783 void XYChart::handlePointsReplaced()
{
// All the points were replaced -> recalculate
Michal Klocek
Refactors internals...
r2273 QVector<QPointF> points = domain()->calculateGeometryPoints(m_series->points());
Tero Ahola
Added a new QXYSeries::replace override for performance reasons....
r1783 updateChart(m_points, points, -1);
}
Michal Klocek
Refactors Domain and Axis...
r1698 void XYChart::handleDomainUpdated()
Michal Klocek
Add missing files from previous commit
r466 {
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 if (isEmpty()) return;
Michal Klocek
Refactors internals...
r2273 QVector<QPointF> points = domain()->calculateGeometryPoints(m_series->points());
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 updateChart(m_points, points);
Michal Klocek
Add missing files from previous commit
r466 }
Michal Klocek
Refactor xychartitem -> xychart
r1218 bool XYChart::isEmpty()
Michal Klocek
Add missing files from previous commit
r466 {
Michal Klocek
Refactors internals...
r2273 return domain()->isEmpty() || m_series->points().isEmpty();
Michal Klocek
Add missing files from previous commit
r466 }
Michal Klocek
Refactor xychartitem -> xychart
r1218 #include "moc_xychart_p.cpp"
Michal Klocek
Add missing files from previous commit
r466
QTCOMMERCIALCHART_END_NAMESPACE