##// END OF EJS Templates
Fix crash when adding/removing points during animation...
Fix crash when adding/removing points during animation Adding/removing points during the animation of the previous add/remove operation resulted in a mismatch between visible point count and the actual point count, leading to crashes in code that assumed both to be the same. Added necessary safeguards and improved autotests to detect these cases. Task-number: QTRD-1984 Change-Id: I544d10a69e760a40d4c90a4f02de61d4d1bb974f Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

File last commit:

r2489:c4f9629c130d
r2489:c4f9629c130d
Show More
xychart.cpp
191 lines | 5.5 KiB | text/x-c | CppLexer
/****************************************************************************
**
** Copyright (C) 2013 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 "xychart_p.h"
#include "qxyseries.h"
#include "qxyseries_p.h"
#include "chartpresenter_p.h"
#include "abstractdomain_p.h"
#include "qxymodelmapper.h"
#include "qabstractaxis_p.h"
#include <QPainter>
#include <QAbstractItemModel>
QTCOMMERCIALCHART_BEGIN_NAMESPACE
//TODO: optimize : remove points which are not visible
XYChart::XYChart(QXYSeries *series, QGraphicsItem *item):
ChartItem(series->d_func(),item),
m_series(series),
m_animation(0),
m_dirty(true)
{
QObject::connect(series, SIGNAL(pointReplaced(int)), this, SLOT(handlePointReplaced(int)));
QObject::connect(series, SIGNAL(pointsReplaced()), this, SLOT(handlePointsReplaced()));
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)));
QObject::connect(this, SIGNAL(hovered(QPointF,bool)), series, SIGNAL(hovered(QPointF,bool)));
}
void XYChart::setGeometryPoints(const QVector<QPointF> &points)
{
m_points = points;
}
void XYChart::setAnimation(XYAnimation *animation)
{
m_animation = animation;
}
void XYChart::setDirty(bool dirty)
{
m_dirty = dirty;
}
// Returns a vector with same size as geometryPoints vector, indicating
// the off grid status of points.
QVector<bool> XYChart::offGridStatusVector()
{
qreal minX = domain()->minX();
qreal maxX = domain()->maxX();
qreal minY = domain()->minY();
qreal maxY = domain()->maxY();
QVector<bool> returnVector;
returnVector.resize(m_points.size());
// During remove/append animation series may have different number of points,
// so ensure we don't go over the index. No need to check for zero points, this
// will not be called in such a situation.
const int seriesLastIndex = m_series->count() - 1;
for (int i = 0; i < m_points.size(); i++) {
const QPointF &seriesPoint = m_series->pointAt(qMin(seriesLastIndex, i));
if (seriesPoint.x() < minX
|| seriesPoint.x() > maxX
|| seriesPoint.y() < minY
|| seriesPoint.y() > maxY) {
returnVector[i] = true;
} else {
returnVector[i] = false;
}
}
return returnVector;
}
void XYChart::updateChart(QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, int index)
{
if (m_animation) {
m_animation->setup(oldPoints, newPoints, index);
m_points = newPoints;
setDirty(false);
presenter()->startAnimation(m_animation);
} else {
m_points = newPoints;
updateGeometry();
}
}
//handlers
void XYChart::handlePointAdded(int index)
{
Q_ASSERT(index < m_series->count());
Q_ASSERT(index >= 0);
QVector<QPointF> points;
if (m_dirty || m_points.isEmpty()) {
points = domain()->calculateGeometryPoints(m_series->points());
} else {
points = m_points;
QPointF point = domain()->calculateGeometryPoint(m_series->points()[index], m_validData);
if (!m_validData)
m_points.clear();
else
points.insert(index, point);
}
updateChart(m_points, points, index);
}
void XYChart::handlePointRemoved(int index)
{
Q_ASSERT(index <= m_series->count());
Q_ASSERT(index >= 0);
QVector<QPointF> points;
if (m_dirty || m_points.isEmpty()) {
points = domain()->calculateGeometryPoints(m_series->points());
} else {
points = m_points;
points.remove(index);
}
updateChart(m_points, points, index);
}
void XYChart::handlePointReplaced(int index)
{
Q_ASSERT(index < m_series->count());
Q_ASSERT(index >= 0);
QVector<QPointF> points;
if (m_dirty || m_points.isEmpty()) {
points = domain()->calculateGeometryPoints(m_series->points());
} else {
QPointF point = domain()->calculateGeometryPoint(m_series->points()[index], m_validData);
if (!m_validData)
m_points.clear();
points = m_points;
if (m_validData)
points.replace(index, point);
}
updateChart(m_points, points, index);
}
void XYChart::handlePointsReplaced()
{
// All the points were replaced -> recalculate
QVector<QPointF> points = domain()->calculateGeometryPoints(m_series->points());
updateChart(m_points, points, -1);
}
void XYChart::handleDomainUpdated()
{
if (isEmpty()) return;
QVector<QPointF> points = domain()->calculateGeometryPoints(m_series->points());
updateChart(m_points, points);
}
bool XYChart::isEmpty()
{
return domain()->isEmpty() || m_series->points().isEmpty();
}
#include "moc_xychart_p.cpp"
QTCOMMERCIALCHART_END_NAMESPACE