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

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

Added few properties to QAbstractAxis. Some are still missing. Its needs to be decided how the Brush and Pen should be supported
Added few properties to QAbstractAxis. Some are still missing. Its needs to be decided how the Brush and Pen should be supported
Jani Honkonen - - Load All Authors

File last commit:

r2104:f8a933676fbd
r2203:edb022f7374a
Show More
xychart.cpp
227 lines | 6.1 KiB | text/x-c | CppLexer
/ src / xychart / xychart.cpp
History | Source | Raw |Copy content |Copy permalink
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"
Michal Klocek
Refactors Domain and Axis...
 r1698 #include "domain_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
//TODO: optimize : remove points which are not visible
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 XYChart::XYChart(QXYSeries *series, ChartPresenter *presenter)
: ChartElement(presenter),
m_minX(0),
m_maxX(0),
m_minY(0),
m_maxY(0),
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)));
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;
}
Michal Klocek
Refactor xychartitem -> xychart
 r1218 void XYChart::setClipRect(const QRectF &rect)
Michal Klocek
Refactors animation handling for xyseries
 r1217 {
m_clipRect = rect;
}
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 }
Michal Klocek
Refactor xychartitem -> xychart
 r1218 QPointF XYChart::calculateGeometryPoint(const QPointF &point) const
Michal Klocek
Add missing files from previous commit
 r466 {
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 const qreal deltaX = m_size.width() / (m_maxX - m_minX);
const qreal deltaY = m_size.height() / (m_maxY - m_minY);
qreal x = (point.x() - m_minX) * deltaX;
qreal y = (point.y() - m_minY) * -deltaY + m_size.height();
return QPointF(x, y);
Michal Klocek
Add missing files from previous commit
 r466 }
Michal Klocek
Refactor xychartitem -> xychart
 r1218 QPointF XYChart::calculateGeometryPoint(int index) const
Michal Klocek
Add missing files from previous commit
 r466 {
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 const qreal deltaX = m_size.width() / (m_maxX - m_minX);
const qreal deltaY = m_size.height() / (m_maxY - m_minY);
Michal Klocek
Fixes and improvments to series API...
 r1057 const QList<QPointF>& vector = m_series->points();
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 qreal x = (vector[index].x() - m_minX) * deltaX;
qreal y = (vector[index].y() - m_minY) * -deltaY + m_size.height();
return QPointF(x, y);
Michal Klocek
Add missing files from previous commit
 r466 }
Michal Klocek
Refactor xychartitem -> xychart
 r1218 QVector<QPointF> XYChart::calculateGeometryPoints() const
Michal Klocek
Add missing files from previous commit
 r466 {
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 const qreal deltaX = m_size.width() / (m_maxX - m_minX);
const qreal deltaY = m_size.height() / (m_maxY - m_minY);
Michal Klocek
Add missing files from previous commit
 r466
Michal Klocek
Fixes and improvments to series API...
 r1057 QVector<QPointF> result;
result.resize(m_series->count());
const QList<QPointF>& vector = m_series->points();
Michal Klocek
Add missing files from previous commit
 r466 for (int i = 0; i < m_series->count(); ++i) {
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 qreal x = (vector[i].x() - m_minX) * deltaX;
qreal y = (vector[i].y() - m_minY) * -deltaY + m_size.height();
Michal Klocek
Fixes and improvments to series API...
 r1057 result[i].setX(x);
result[i].setY(y);
Michal Klocek
Add missing files from previous commit
 r466 }
Michal Klocek
Fixes and improvments to series API...
 r1057 return result;
Michal Klocek
Add missing files from previous commit
 r466 }
Michal Klocek
Refactor xychartitem -> xychart
 r1218 QPointF XYChart::calculateDomainPoint(const QPointF &point) const
Michal Klocek
Adds clicked(Point) to lineSeries, changes visible points handling
 r544 {
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 const qreal deltaX = m_size.width() / (m_maxX - m_minX);
const qreal deltaY = m_size.height() / (m_maxY - m_minY);
qreal x = point.x() / deltaX + m_minX;
qreal y = (point.y() - m_size.height()) / (-deltaY) + m_minY;
return QPointF(x, y);
Michal Klocek
Adds clicked(Point) to lineSeries, changes visible points handling
 r544 }
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) {
points = calculateGeometryPoints();
} else {
points = m_points;
QPointF point = calculateGeometryPoint(index);
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) {
points = calculateGeometryPoints();
} 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) {
points = calculateGeometryPoints();
} else {
QPointF point = calculateGeometryPoint(index);
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
QVector<QPointF> points = calculateGeometryPoints();
updateChart(m_points, points, -1);
}
Michal Klocek
Refactors Domain and Axis...
 r1698 void XYChart::handleDomainUpdated()
Michal Klocek
Add missing files from previous commit
 r466 {
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 m_minX = domain()->minX();
m_maxX = domain()->maxX();
m_minY = domain()->minY();
m_maxY = domain()->maxY();
sauimone
minor code review issues. indent, spaces, brackets etc.
 r743 if (isEmpty()) return;
Michal Klocek
Refactors axis animation, line animations
 r1241
Michal Klocek
Add missing files from previous commit
 r466 QVector<QPointF> points = calculateGeometryPoints();
Michal Klocek
Refactors animation handling for xyseries
 r1217
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 void XYChart::handleGeometryChanged(const QRectF &rect)
Michal Klocek
Add missing files from previous commit
 r466 {
Marek Rosa
XYSeries model with limits working.
 r833 Q_ASSERT(rect.isValid());
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 m_size = rect.size();
m_clipRect = rect.translated(-rect.topLeft());
m_origin = rect.topLeft();
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 axis animation, line animations
 r1241
Marek Rosa
XYSeries model with limits working.
 r833 QVector<QPointF> points = calculateGeometryPoints();
Michal Klocek
Refactors axis animation, line animations
 r1241
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
Bugfixes for spline vector allocation issues
 r1082 return !m_clipRect.isValid() || qFuzzyIsNull(m_maxX - m_minX) || qFuzzyIsNull(m_maxY - m_minY) || 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