##// 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
qcategoryaxis_p.h
72 lines | 2.2 KiB | text/x-c | CLexer
Miikka Heikkinen
Updated license...
r2854 /****************************************************************************
Michal Klocek
Adds new API classes...
r1540 **
Miikka Heikkinen
Updated license...
r2854 ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Michal Klocek
Adds new API classes...
r1540 **
Miikka Heikkinen
Updated license...
r2854 ** This file is part of the Qt Charts module of the Qt Toolkit.
Michal Klocek
Adds new API classes...
r1540 **
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.
Michal Klocek
Adds new API classes...
r1540 **
Titta Heikkala
Updated license headers...
r2845 ** $QT_END_LICENSE$
**
Miikka Heikkinen
Updated license...
r2854 ****************************************************************************/
Michal Klocek
Adds new API classes...
r1540
// W A R N I N G
// -------------
//
Titta Heikkala
Updated private header warning...
r2807 // This file is not part of the Qt Chart API. It exists purely as an
Michal Klocek
Adds new API classes...
r1540 // implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 #ifndef QCATEGORYAXIS_P_H
#define QCATEGORYAXIS_P_H
Michal Klocek
Adds new API classes...
r1540
Titta Heikkala
Fix include syntax...
r2714 #include <QtCharts/QCategoryAxis>
#include <private/qvalueaxis_p.h>
Michal Klocek
Adds new API classes...
r1540
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_BEGIN_NAMESPACE
Michal Klocek
Adds new API classes...
r1540
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613 typedef QPair<qreal, qreal> Range;
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 class QCategoryAxisPrivate : public QValueAxisPrivate
Michal Klocek
Adds new API classes...
r1540 {
Q_OBJECT
public:
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 QCategoryAxisPrivate(QCategoryAxis *q);
~QCategoryAxisPrivate();
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613
Michal Klocek
Refactors internals...
r2273 void initializeGraphics(QGraphicsItem* parent);
Michal Klocek
Refactors setMin setMax setRange to be pure viritual on private implementation
r1544 int ticksCount() const;
Michal Klocek
Adds new API classes...
r1540 private:
Marek Rosa
QCategoryAxis renamed some methods names according to review
r1829 QMap<QString , Range> m_categoriesMap;
QStringList m_categories;
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613 qreal m_categoryMinimum;
Titta Heikkala
Added possibility to set labels position for QCategoryAxis...
r2780 QCategoryAxis::AxisLabelsPosition m_labelsPosition;
Michal Klocek
Adds new API classes...
r1540
private:
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 Q_DECLARE_PUBLIC(QCategoryAxis)
Michal Klocek
Adds new API classes...
r1540 };
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE
Michal Klocek
Adds new API classes...
r1540
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 #endif // QCATEGORYAXIS_P_H