##// END OF EJS Templates
Fix point label drawing for XYSeries...
Fix point label drawing for XYSeries Reverting change 810e912b2c05d5f4305b0f1e56be57e765a30479. m_points is used for the point label because that has the series point information. The points variable that is passed to the function is used for positioning the label as it has the coordinates. Change-Id: Iad48660d245c06b736c14161e5c86a4746df2b28 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

File last commit:

r2776:bc1f6aa59d42
r2779:ce2af37ac88e
Show More
polarchartcategoryaxisradial.cpp
77 lines | 2.4 KiB | text/x-c | CppLexer
/ src / charts / axis / categoryaxis / polarchartcategoryaxisradial.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/polarchartcategoryaxisradial_p.h>
#include <private/chartpresenter_p.h>
#include <private/abstractchartlayout_p.h>
#include <QtCharts/QCategoryAxis>
#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
PolarChartCategoryAxisRadial::PolarChartCategoryAxisRadial(QCategoryAxis *axis, QGraphicsItem *item)
: PolarChartAxisRadial(axis, item, true)
{
QObject::connect(axis, SIGNAL(categoriesChanged()), this, SLOT(handleCategoriesChanged()));
}
PolarChartCategoryAxisRadial::~PolarChartCategoryAxisRadial()
{
}
QVector<qreal> PolarChartCategoryAxisRadial::calculateLayout() const
{
QCategoryAxis *catAxis = static_cast<QCategoryAxis *>(axis());
int tickCount = catAxis->categoriesLabels().count() + 1;
QVector<qreal> points;
if (tickCount < 2)
return points;
qreal range = max() - min();
if (range > 0) {
points.resize(tickCount);
qreal scale = (axisGeometry().width() / 2) / range;
qreal angle;
for (int i = 0; i < tickCount; ++i) {
if (i < tickCount - 1)
angle = (catAxis->startValue(catAxis->categoriesLabels().at(i)) - min()) * scale;
else
angle = (catAxis->endValue(catAxis->categoriesLabels().at(i - 1)) - min()) * scale;
points[i] = angle;
}
}
return points;
}
void PolarChartCategoryAxisRadial::createAxisLabels(const QVector<qreal> &layout)
{
Q_UNUSED(layout);
Titta Heikkala
Qt Charts project file structure change...
r2712 setLabels(static_cast<QCategoryAxis *>(axis())->categoriesLabels() << QString());
Miikka Heikkinen
Add Polar chart support...
r2483 }
void PolarChartCategoryAxisRadial::handleCategoriesChanged()
{
QGraphicsLayoutItem::updateGeometry();
presenter()->layout()->invalidate();
}
#include "moc_polarchartcategoryaxisradial_p.cpp"
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE