##// 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
qbarcategoryaxis.h
90 lines | 3.1 KiB | text/x-c | CLexer
Miikka Heikkinen
Updated license...
r2854 /****************************************************************************
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613 **
Miikka Heikkinen
Updated license...
r2854 ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613 **
Miikka Heikkinen
Updated license...
r2854 ** This file is part of the Qt Charts module of the Qt Toolkit.
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613 **
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
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613 **
Titta Heikkala
Updated license headers...
r2845 ** $QT_END_LICENSE$
**
Miikka Heikkinen
Updated license...
r2854 ****************************************************************************/
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613
Jani Honkonen
Fix Krazy issues
r1935 #ifndef QBARCATEGORYAXIS_H
#define QBARCATEGORYAXIS_H
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613
Titta Heikkala
Fix include syntax...
r2714 #include <QtCharts/QAbstractAxis>
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_BEGIN_NAMESPACE
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613
Marek Rosa
QBarCategoriesAxis renamed to QBarCategoryAxis
r1808 class QBarCategoryAxisPrivate;
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613
Titta Heikkala
Qt Charts project file structure change...
r2712 class QT_CHARTS_EXPORT QBarCategoryAxis : public QAbstractAxis
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613 {
Q_OBJECT
Q_PROPERTY(QStringList categories READ categories WRITE setCategories NOTIFY categoriesChanged)
Q_PROPERTY(QString min READ min WRITE setMin NOTIFY minChanged)
Q_PROPERTY(QString max READ max WRITE setMax NOTIFY maxChanged)
Tero Ahola
Added missing count property to QBarCategoryAxis
r2249 Q_PROPERTY(int count READ count NOTIFY countChanged)
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613
public:
Marc Mutz
Make public headers compile with -Wzero-as-null-pointer-constant...
r2871 explicit QBarCategoryAxis(QObject *parent = Q_NULLPTR);
Marek Rosa
QBarCategoriesAxis renamed to QBarCategoryAxis
r1808 ~QBarCategoryAxis();
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613
protected:
Marc Mutz
Make public headers compile with -Wzero-as-null-pointer-constant...
r2871 QBarCategoryAxis(QBarCategoryAxisPrivate &d, QObject *parent = Q_NULLPTR);
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613
public:
AxisType type() const;
void append(const QStringList &categories);
void append(const QString &category);
void remove(const QString &category);
void insert(int index, const QString &category);
Marek Rosa
Added posibility to replace category in QBarCategoriesAxis
r1774 void replace(const QString &oldCategory, const QString &newCategory);
Titta Heikkala
Add invokable clear() for QML bar category axis...
r2691 Q_INVOKABLE void clear();
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613 void setCategories(const QStringList &categories);
QStringList categories();
int count() const;
QString at(int index) const;
//range handling
Jani Honkonen
more coding style fixes for src-folder...
r2104 void setMin(const QString &minCategory);
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613 QString min() const;
Jani Honkonen
more coding style fixes for src-folder...
r2104 void setMax(const QString &maxCategory);
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613 QString max() const;
Jani Honkonen
more coding style fixes for src-folder...
r2104 void setRange(const QString &minCategory, const QString &maxCategory);
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613
Q_SIGNALS:
void categoriesChanged();
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 void minChanged(const QString &min);
void maxChanged(const QString &max);
void rangeChanged(const QString &min, const QString &max);
Tero Ahola
Added missing count property to QBarCategoryAxis
r2249 void countChanged();
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613
private:
Marek Rosa
QBarCategoriesAxis renamed to QBarCategoryAxis
r1808 Q_DECLARE_PRIVATE(QBarCategoryAxis)
Q_DISABLE_COPY(QBarCategoryAxis)
Marek Rosa
Renamed barcategory grephics item class which has been previously ommited
r1918 friend class ChartBarCategoryAxisX;
friend class ChartBarCategoryAxisY;
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613 };
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613
Jani Honkonen
Fix Krazy issues
r1935 #endif // QBARCATEGORYAXIS_H