##// 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:

r2795:dab4dfead39d
r2800:891ed0097501
Show More
polarchartaxis.cpp
127 lines | 3.6 KiB | text/x-c | CppLexer
/****************************************************************************
**
** 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 <private/polarchartaxis_p.h>
#include <private/qabstractaxis_p.h>
#include <private/chartpresenter_p.h>
#include <QtCharts/QValueAxis>
QT_CHARTS_BEGIN_NAMESPACE
PolarChartAxis::PolarChartAxis(QAbstractAxis *axis, QGraphicsItem *item, bool intervalAxis)
: ChartAxisElement(axis, item, intervalAxis)
{
}
PolarChartAxis::~PolarChartAxis()
{
}
void PolarChartAxis::setGeometry(const QRectF &axis, const QRectF &grid)
{
Q_UNUSED(grid);
setAxisGeometry(axis);
if (isEmpty())
return;
QVector<qreal> layout = calculateLayout();
updateLayout(layout);
}
QRectF PolarChartAxis::gridGeometry() const
{
return QRectF();
}
void PolarChartAxis::updateLayout(QVector<qreal> &layout)
{
int diff = ChartAxisElement::layout().size() - layout.size();
if (animation()) {
switch (presenter()->state()) {
case ChartPresenter::ZoomInState:
case ChartPresenter::ZoomOutState:
case ChartPresenter::ScrollUpState:
case ChartPresenter::ScrollLeftState:
case ChartPresenter::ScrollDownState:
case ChartPresenter::ScrollRightState:
case ChartPresenter::ShowState:
animation()->setAnimationType(AxisAnimation::DefaultAnimation);
break;
}
// Update to "old" geometry before starting animation to avoid incorrectly sized
// axes lingering in wrong position compared to series plot before animation can kick in.
// Note that the position mismatch still exists even with this update, but it will be
// far less ugly.
updateGeometry();
}
if (diff > 0)
deleteItems(diff);
else if (diff < 0)
createItems(-diff);
updateMinorTickItems();
if (animation()) {
animation()->setValues(ChartAxisElement::layout(), layout);
presenter()->startAnimation(animation());
} else {
setLayout(layout);
updateGeometry();
}
}
bool PolarChartAxis::isEmpty()
{
return !axisGeometry().isValid() || qFuzzyIsNull(min() - max());
}
void PolarChartAxis::deleteItems(int count)
{
QList<QGraphicsItem *> gridLines = gridItems();
QList<QGraphicsItem *> labels = labelItems();
QList<QGraphicsItem *> shades = shadeItems();
QList<QGraphicsItem *> axis = arrowItems();
for (int i = 0; i < count; ++i) {
if (gridItems().size() == 1 || (((gridLines.size() + 1) % 2) && gridLines.size() > 0))
delete(shades.takeLast());
delete(gridLines.takeLast());
delete(labels.takeLast());
delete(axis.takeLast());
}
}
void PolarChartAxis::handleShadesBrushChanged(const QBrush &brush)
{
foreach (QGraphicsItem *item, shadeItems())
static_cast<QGraphicsPathItem *>(item)->setBrush(brush);
}
void PolarChartAxis::handleShadesPenChanged(const QPen &pen)
{
foreach (QGraphicsItem *item, shadeItems())
static_cast<QGraphicsPathItem *>(item)->setPen(pen);
}
#include "moc_polarchartaxis_p.cpp"
QT_CHARTS_END_NAMESPACE