##// 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
polarchartlayout.cpp
80 lines | 2.7 KiB | text/x-c | CppLexer
/ src / charts / layout / polarchartlayout.cpp
Miikka Heikkinen
Add Polar chart support...
r2483 /****************************************************************************
**
Titta Heikkala
Copyright header changes...
r2776 ** Copyright (C) 2015 The Qt Company Ltd
Miikka Heikkinen
Add Polar chart support...
r2483 ** All rights reserved.
Titta Heikkala
Copyright header changes...
r2776 ** For any questions to The Qt Company, please use contact form at http://qt.io
Miikka Heikkinen
Add Polar chart support...
r2483 **
Titta Heikkala
Updated license headers...
r2740 ** This file is part of the Qt Charts module.
Miikka Heikkinen
Add Polar chart support...
r2483 **
Titta Heikkala
Updated license headers...
r2740 ** 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
Titta Heikkala
Copyright header changes...
r2776 ** agreement between you and The Qt Company.
Miikka Heikkinen
Add Polar chart support...
r2483 **
** If you have questions regarding the use of this file, please use
Titta Heikkala
Updated license headers...
r2740 ** contact form at http://qt.io
Miikka Heikkinen
Add Polar chart support...
r2483 **
****************************************************************************/
Titta Heikkala
Fix include syntax...
r2714 #include <private/polarchartlayout_p.h>
#include <private/chartpresenter_p.h>
#include <private/polarchartaxis_p.h>
#include <QtCore/QDebug>
Miikka Heikkinen
Add Polar chart support...
r2483
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_BEGIN_NAMESPACE
Miikka Heikkinen
Add Polar chart support...
r2483
static const qreal golden_ratio = 0.4;
PolarChartLayout::PolarChartLayout(ChartPresenter *presenter)
: AbstractChartLayout(presenter)
{
}
PolarChartLayout::~PolarChartLayout()
{
}
QRectF PolarChartLayout::calculateAxisGeometry(const QRectF &geometry, const QList<ChartAxisElement *> &axes) const
{
// How to handle multiple angular/radial axes?
qreal axisRadius = geometry.height() / 2.0;
if (geometry.width() < geometry.height())
axisRadius = geometry.width() / 2.0;
int titleHeight = 0;
foreach (ChartAxisElement *chartAxis, axes) {
if (!chartAxis->isVisible())
continue;
PolarChartAxis *polarChartAxis = static_cast<PolarChartAxis *>(chartAxis);
qreal radius = polarChartAxis->preferredAxisRadius(geometry.size());
if (radius < axisRadius)
axisRadius = radius;
if (chartAxis->axis()->orientation() == Qt::Horizontal
&& chartAxis->axis()->isTitleVisible()
&& !chartAxis->axis()->titleText().isEmpty()) {
// If axis has angular title, adjust geometry down by the space title takes
Miikka Heikkinen
Added HTML support for various text items...
r2539 QRectF dummyRect = ChartPresenter::textBoundingRect(chartAxis->axis()->titleFont(), chartAxis->axis()->titleText());
Miikka Heikkinen
Fix multi-line axis titles....
r2530 titleHeight = (dummyRect.height() / 2.0) + chartAxis->titlePadding();
Miikka Heikkinen
Add Polar chart support...
r2483 }
}
QRectF axisRect;
axisRect.setSize(QSizeF(axisRadius * 2.0, axisRadius * 2.0));
axisRect.moveCenter(geometry.center());
axisRect.adjust(0, titleHeight, 0, titleHeight);
foreach (ChartAxisElement *chartAxis, axes)
chartAxis->setGeometry(axisRect, QRectF());
return axisRect;
}
QRectF PolarChartLayout::calculateAxisMinimum(const QRectF &minimum, const QList<ChartAxisElement *> &axes) const
{
Q_UNUSED(axes);
return minimum;
}
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE