##// END OF EJS Templates
Merge remote-tracking branch 'origin/5.6' into 5.7...
Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: .qmake.conf README src/charts/qchartglobal.h Change-Id: I20497b20947f589f9f73239a09ba6ea013b3597a

File last commit:

r2854:46147b040d06
r2878:97bb01ce5d85 merge
Show More
chartcategoryaxisy.cpp
128 lines | 4.3 KiB | text/x-c | CppLexer
/ src / charts / axis / categoryaxis / chartcategoryaxisy.cpp
Miikka Heikkinen
Updated license...
r2854 /****************************************************************************
Marek Rosa
QIntervalsAxis working somewhat
r1701 **
Miikka Heikkinen
Updated license...
r2854 ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Marek Rosa
QIntervalsAxis working somewhat
r1701 **
Miikka Heikkinen
Updated license...
r2854 ** This file is part of the Qt Charts module of the Qt Toolkit.
Marek Rosa
QIntervalsAxis working somewhat
r1701 **
Miikka Heikkinen
Updated license...
r2854 ** $QT_BEGIN_LICENSE:GPL$
Titta Heikkala
Updated license headers...
r2845 ** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
Miikka Heikkinen
Updated license...
r2854 ** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 or (at your option) any later version
** approved by the KDE Free Qt Foundation. The licenses are as published by
** the Free Software Foundation and appearing in the file LICENSE.GPL3
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
Marek Rosa
QIntervalsAxis working somewhat
r1701 **
Titta Heikkala
Updated license headers...
r2845 ** $QT_END_LICENSE$
**
Miikka Heikkinen
Updated license...
r2854 ****************************************************************************/
Marek Rosa
QIntervalsAxis working somewhat
r1701
Titta Heikkala
Fix include syntax...
r2714 #include <private/chartcategoryaxisy_p.h>
#include <QtCharts/QCategoryAxis>
#include <QtCharts/QAbstractAxis>
#include <private/chartpresenter_p.h>
#include <private/abstractchartlayout_p.h>
#include <QtWidgets/QGraphicsLayout>
#include <QtCore/QtMath>
#include <QtCore/QDebug>
Michal Klocek
Refactor animator...
r1735
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_BEGIN_NAMESPACE
Marek Rosa
QIntervalsAxis working somewhat
r1701
Michal Klocek
Refactors internals...
r2273 ChartCategoryAxisY::ChartCategoryAxisY(QCategoryAxis *axis, QGraphicsItem* item)
: VerticalAxis(axis, item, true),
Jani Honkonen
src folder: another massive victory for coding style police
r2131 m_axis(axis)
Marek Rosa
QIntervalsAxis working somewhat
r1701 {
Miikka Heikkinen
Add Polar chart support...
r2483 QObject::connect(axis, SIGNAL(categoriesChanged()), this, SLOT(handleCategoriesChanged()));
Marek Rosa
QIntervalsAxis working somewhat
r1701 }
Marek Rosa
Renamed QCategoryAxis related files
r1817 ChartCategoryAxisY::~ChartCategoryAxisY()
Marek Rosa
QIntervalsAxis working somewhat
r1701 {
}
Marek Rosa
Renamed QCategoryAxis related files
r1817 QVector<qreal> ChartCategoryAxisY::calculateLayout() const
Marek Rosa
QIntervalsAxis working somewhat
r1701 {
Michal Klocek
Refactors axis updateGeometry handling...
r2111 int tickCount = m_axis->categoriesLabels().count() + 1;
Marek Rosa
QIntervalsAxis working somewhat
r1701 QVector<qreal> points;
Marek Rosa
Fixes and tests to Interval axis
r1708
if (tickCount < 2)
return points;
Jani Honkonen
src folder: another massive victory for coding style police
r2131 const QRectF &gridRect = gridGeometry();
Michal Klocek
Fixes categoryaxis sizeHints
r2136 qreal range = max() - min();
Marek Rosa
Fixed range handling in categoryAxis
r1846 if (range > 0) {
points.resize(tickCount);
Michal Klocek
Refactors axis updateGeometry handling...
r2111 qreal scale = gridRect.height() / range;
Jani Honkonen
src folder: another massive victory for coding style police
r2131 for (int i = 0; i < tickCount; ++i) {
Marek Rosa
Fixed range handling in categoryAxis
r1846 if (i < tickCount - 1) {
Miikka Heikkinen
Fix positioning errors with category ticks...
r2436 qreal y = -(m_axis->startValue(m_axis->categoriesLabels().at(i)) - min()) * scale + gridRect.bottom();
Marek Rosa
Fixed range handling in categoryAxis
r1846 points[i] = y;
} else {
Miikka Heikkinen
Fix positioning errors with category ticks...
r2436 qreal y = -(m_axis->endValue(m_axis->categoriesLabels().at(i - 1)) - min()) * scale + gridRect.bottom();
Marek Rosa
Fixed range handling in categoryAxis
r1846 points[i] = y;
}
Jani Honkonen
src folder: another massive victory for coding style police
r2131 }
Marek Rosa
Fixed range handling in categoryAxis
r1846 }
Marek Rosa
QIntervalsAxis working somewhat
r1701
return points;
}
Marek Rosa
Renamed QCategoryAxis related files
r1817 void ChartCategoryAxisY::updateGeometry()
Marek Rosa
QIntervalsAxis working somewhat
r1701 {
Titta Heikkala
Qt Charts project file structure change...
r2712 setLabels(m_axis->categoriesLabels() << QString());
Michal Klocek
Refactors axis updateGeometry handling...
r2111 VerticalAxis::updateGeometry();
Marek Rosa
QIntervalsAxis working somewhat
r1701 }
Jani Honkonen
src folder: another massive victory for coding style police
r2131 QSizeF ChartCategoryAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
Michal Klocek
Refactors layout...
r1965 {
Q_UNUSED(constraint)
QSizeF sh;
Michal Klocek
Refactors ChartAxis...
r2138 QSizeF base = VerticalAxis::sizeHint(which, constraint);
Michal Klocek
Fixes categoryaxis sizeHints
r2136 QStringList ticksList = m_axis->categoriesLabels();
Jani Honkonen
src folder: another massive victory for coding style police
r2131 qreal width = 0;
Miikka Heikkinen
Fix vanishing labels for first and last ticks....
r2443 qreal height = 0; // Height is irrelevant for Y axes with interval labels
Jani Honkonen
src folder: another massive victory for coding style police
r2131
switch (which) {
Miikka Heikkinen
Fix axis sizehints when labels are angled...
r2412 case Qt::MinimumSize: {
Titta Heikkala
Qt Charts project file structure change...
r2712 QRectF boundingRect = ChartPresenter::textBoundingRect(axis()->labelsFont(),
QStringLiteral("..."),
axis()->labelsAngle());
Miikka Heikkinen
Fix multiline axis label positioning....
r2534 width = boundingRect.width() + labelPadding() + base.width() + 1.0;
Jani Honkonen
src folder: another massive victory for coding style police
r2131 sh = QSizeF(width, height);
break;
Miikka Heikkinen
Fix axis sizehints when labels are angled...
r2412 }
Jani Honkonen
src folder: another massive victory for coding style police
r2131 case Qt::PreferredSize: {
Miikka Heikkinen
Fix multiline axis label positioning....
r2534 qreal labelWidth = 0.0;
Miikka Heikkinen
Fix axis sizehints when labels are angled...
r2412 foreach (const QString& s, ticksList) {
Miikka Heikkinen
Added HTML support for various text items...
r2539 QRectF rect = ChartPresenter::textBoundingRect(axis()->labelsFont(), s, axis()->labelsAngle());
Miikka Heikkinen
Fix axis sizehints when labels are angled...
r2412 labelWidth = qMax(rect.width(), labelWidth);
Michal Klocek
Refactors layout...
r1965 }
Miikka Heikkinen
Fix multiline axis label positioning....
r2534 width = labelWidth + labelPadding() + base.width() + 1.0;
Jani Honkonen
src folder: another massive victory for coding style police
r2131 sh = QSizeF(width, height);
break;
}
default:
break;
}
return sh;
Michal Klocek
Refactors layout...
r1965 }
Miikka Heikkinen
Add Polar chart support...
r2483 void ChartCategoryAxisY::handleCategoriesChanged()
{
QGraphicsLayoutItem::updateGeometry();
presenter()->layout()->invalidate();
}
#include "moc_chartcategoryaxisy_p.cpp"
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE