##// END OF EJS Templates
Merge remote-tracking branch 'origin/5.7' into dev...
Merge remote-tracking branch 'origin/5.7' into dev Change-Id: I3f2ec8fb552bbed786cb0f7f5a0433d2d15f1931

File last commit:

r2878:97bb01ce5d85 merge
r2879:d27b6b26880d merge
Show More
qcategoryaxis.h
91 lines | 3.0 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
Jani Honkonen
Fix Krazy issues
r1935 #ifndef QCATEGORYAXIS_H
#define QCATEGORYAXIS_H
Michal Klocek
Adds new API classes...
r1540
Titta Heikkala
Fix include syntax...
r2714 #include <QtCharts/QAbstractAxis>
#include <QtCharts/QValueAxis>
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
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 class QCategoryAxisPrivate;
Michal Klocek
Adds new API classes...
r1540
Titta Heikkala
Qt Charts project file structure change...
r2712 class QT_CHARTS_EXPORT QCategoryAxis : public QValueAxis
Michal Klocek
Adds new API classes...
r1540 {
Q_OBJECT
Marek Rosa
Some axes docs update
r1834 Q_PROPERTY(qreal startValue READ startValue WRITE setStartValue)
Tero Ahola
Added missing property definitions to QCategoryAxis
r2244 Q_PROPERTY(int count READ count)
Q_PROPERTY(QStringList categoriesLabels READ categoriesLabels)
Titta Heikkala
Added possibility to set labels position for QCategoryAxis...
r2780 Q_PROPERTY(AxisLabelsPosition labelsPosition READ labelsPosition WRITE setLabelsPosition NOTIFY labelsPositionChanged)
Q_ENUMS(AxisLabelsPosition)
Michal Klocek
Adds new API classes...
r1540
public:
Titta Heikkala
Added possibility to set labels position for QCategoryAxis...
r2780
enum AxisLabelsPosition {
AxisLabelsPositionCenter = 0x0,
AxisLabelsPositionOnValue = 0x1
};
Marc Mutz
Make public headers compile with -Wzero-as-null-pointer-constant...
r2871 explicit QCategoryAxis(QObject *parent = Q_NULLPTR);
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 ~QCategoryAxis();
Michal Klocek
Adds new API classes...
r1540
protected:
Marc Mutz
Make public headers compile with -Wzero-as-null-pointer-constant...
r2871 QCategoryAxis(QCategoryAxisPrivate &d, QObject *parent = Q_NULLPTR);
Michal Klocek
Adds new API classes...
r1540
public:
AxisType type() const;
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613
Jani Honkonen
more coding style fixes for src-folder...
r2104 void append(const QString &label, qreal categoryEndValue);
void remove(const QString &label);
void replaceLabel(const QString &oldLabel, const QString &newLabel);
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613
Jani Honkonen
more coding style fixes for src-folder...
r2104 qreal startValue(const QString &categoryLabel = QString()) const;
Marek Rosa
QCategoryAxis renamed some methods names according to review
r1829 void setStartValue(qreal min);
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613
Jani Honkonen
more coding style fixes for src-folder...
r2104 qreal endValue(const QString &categoryLabel) const;
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613
Marek Rosa
QCategoryAxis renamed some methods names according to review
r1829 QStringList categoriesLabels();
Michal Klocek
Refactors QAxis to QAbstractAxis...
r1541 int count() const;
sauimone
QAbstractAxis: variants strike back.
r1578
Titta Heikkala
Added possibility to set labels position for QCategoryAxis...
r2780 QCategoryAxis::AxisLabelsPosition labelsPosition() const;
void setLabelsPosition(QCategoryAxis::AxisLabelsPosition position);
Miikka Heikkinen
Add Polar chart support...
r2483 Q_SIGNALS:
void categoriesChanged();
Titta Heikkala
Added possibility to set labels position for QCategoryAxis...
r2780 void labelsPositionChanged(QCategoryAxis::AxisLabelsPosition position);
Miikka Heikkinen
Add Polar chart support...
r2483
Michal Klocek
Adds new API classes...
r1540 private:
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 Q_DECLARE_PRIVATE(QCategoryAxis)
Q_DISABLE_COPY(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
Jani Honkonen
Fix Krazy issues
r1935 #endif // QCATEGORYAXIS_H