##// END OF EJS Templates
Check that areaseries is actually in chart before trying to update....
Check that areaseries is actually in chart before trying to update. When a line series is used both as a series on chart and as an area series boundary, but not at the same time, animation can sometimes get confused as to what series to update if the area series is removed from the chart and the line series is added to the chart while a series animation is running. Task-number: QTRD-3445 Change-Id: Ia3d72d3ceba784b6e162b2c9b678acdc3e3ffcac Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>

File last commit:

r2776:bc1f6aa59d42
r2800:891ed0097501
Show More
declarativeareaseries.cpp
113 lines | 3.6 KiB | text/x-c | CppLexer
/ src / chartsqml2 / declarativeareaseries.cpp
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd
** All rights reserved.
** For any questions to The Qt Company, please use contact form at http://qt.io
**
** This file is part of the Qt Charts module.
**
** Licensees holding valid commercial license for Qt may use this file in
** accordance with the Qt License Agreement provided with the Software
** or, alternatively, in accordance with the terms contained in a written
** agreement between you and The Qt Company.
**
** If you have questions regarding the use of this file, please use
** contact form at http://qt.io
**
****************************************************************************/
#include "declarativeareaseries.h"
#include "declarativelineseries.h"
QT_CHARTS_BEGIN_NAMESPACE
DeclarativeAreaSeries::DeclarativeAreaSeries(QObject *parent) :
QAreaSeries(parent),
m_axes(new DeclarativeAxes(this))
{
connect(m_axes, SIGNAL(axisXChanged(QAbstractAxis*)), this, SIGNAL(axisXChanged(QAbstractAxis*)));
connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis*)), this, SIGNAL(axisYChanged(QAbstractAxis*)));
connect(m_axes, SIGNAL(axisXTopChanged(QAbstractAxis*)), this, SIGNAL(axisXTopChanged(QAbstractAxis*)));
connect(m_axes, SIGNAL(axisYRightChanged(QAbstractAxis*)), this, SIGNAL(axisYRightChanged(QAbstractAxis*)));
connect(m_axes, SIGNAL(axisXChanged(QAbstractAxis*)), this, SIGNAL(axisAngularChanged(QAbstractAxis*)));
connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis*)), this, SIGNAL(axisRadialChanged(QAbstractAxis*)));
connect(this, SIGNAL(brushChanged()), this, SLOT(handleBrushChanged()));
}
void DeclarativeAreaSeries::setUpperSeries(DeclarativeLineSeries *series)
{
QAreaSeries::setUpperSeries(series);
}
DeclarativeLineSeries *DeclarativeAreaSeries::upperSeries() const
{
return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::upperSeries());
}
void DeclarativeAreaSeries::setLowerSeries(DeclarativeLineSeries *series)
{
QAreaSeries::setLowerSeries(series);
}
DeclarativeLineSeries *DeclarativeAreaSeries::lowerSeries() const
{
return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::lowerSeries());
}
qreal DeclarativeAreaSeries::borderWidth() const
{
return pen().widthF();
}
void DeclarativeAreaSeries::setBorderWidth(qreal width)
{
if (width != pen().widthF()) {
QPen p = pen();
p.setWidthF(width);
setPen(p);
emit borderWidthChanged(width);
}
}
QString DeclarativeAreaSeries::brushFilename() const
{
return m_brushFilename;
}
void DeclarativeAreaSeries::setBrushFilename(const QString &brushFilename)
{
QImage brushImage(brushFilename);
if (QAreaSeries::brush().textureImage() != brushImage) {
QBrush brush = QAreaSeries::brush();
brush.setTextureImage(brushImage);
QAreaSeries::setBrush(brush);
m_brushFilename = brushFilename;
m_brushImage = brushImage;
emit brushFilenameChanged(brushFilename);
}
}
void DeclarativeAreaSeries::handleBrushChanged()
{
// If the texture image of the brush has changed along the brush
// the brush file name needs to be cleared.
if (!m_brushFilename.isEmpty() && QAreaSeries::brush().textureImage() != m_brushImage) {
m_brushFilename.clear();
emit brushFilenameChanged(QString(""));
}
}
void DeclarativeAreaSeries::setBrush(const QBrush &brush)
{
QAreaSeries::setBrush(brush);
emit brushChanged();
}
QBrush DeclarativeAreaSeries::brush() const
{
return QAreaSeries::brush();
}
#include "moc_declarativeareaseries.cpp"
QT_CHARTS_END_NAMESPACE