##// 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: src/charts/charts.pro src/charts/qchartglobal.h src/chartsqml2/chartsqml2.pro tests/auto/chartdataset/tst_chartdataset.cpp tests/auto/domain/tst_domain.cpp Change-Id: I9bfc63f6e93f9a3b86e53aca218dd3a48bb2ffc1

File last commit:

r2878:97bb01ce5d85 merge
r2898:03a6177a3223 merge master
Show More
qpolarchart.h
69 lines | 2.3 KiB | text/x-c | CLexer
Miikka Heikkinen
Updated license...
r2854 /****************************************************************************
Miikka Heikkinen
Add Polar chart support...
r2483 **
Miikka Heikkinen
Updated license...
r2854 ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Miikka Heikkinen
Add Polar chart support...
r2483 **
Miikka Heikkinen
Updated license...
r2854 ** This file is part of the Qt Charts module of the Qt Toolkit.
Miikka Heikkinen
Add Polar chart support...
r2483 **
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.
Miikka Heikkinen
Add Polar chart support...
r2483 **
Titta Heikkala
Updated license headers...
r2845 ** $QT_END_LICENSE$
**
Miikka Heikkinen
Updated license...
r2854 ****************************************************************************/
Miikka Heikkinen
Add Polar chart support...
r2483
#ifndef QPOLARCHART_H
#define QPOLARCHART_H
Titta Heikkala
Fix include syntax...
r2714 #include <QtCharts/QChart>
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
class QAbstractSeries;
class QAbstractAxis;
Titta Heikkala
Qt Charts project file structure change...
r2712 class QT_CHARTS_EXPORT QPolarChart : public QChart
Miikka Heikkinen
Add Polar chart support...
r2483 {
Q_OBJECT
Q_ENUMS(PolarOrientation)
Q_FLAGS(PolarOrientations)
public:
enum PolarOrientation {
PolarOrientationRadial = 0x1,
PolarOrientationAngular = 0x2
};
Q_DECLARE_FLAGS(PolarOrientations, PolarOrientation)
public:
Marc Mutz
Make public headers compile with -Wzero-as-null-pointer-constant...
r2871 explicit QPolarChart(QGraphicsItem *parent = Q_NULLPTR, Qt::WindowFlags wFlags = Qt::WindowFlags());
Miikka Heikkinen
Add Polar chart support...
r2483 ~QPolarChart();
void addAxis(QAbstractAxis *axis, PolarOrientation polarOrientation);
Marc Mutz
Make public headers compile with -Wzero-as-null-pointer-constant...
r2871 QList<QAbstractAxis*> axes(PolarOrientations polarOrientation = PolarOrientations(PolarOrientationRadial | PolarOrientationAngular), QAbstractSeries *series = Q_NULLPTR) const;
Miikka Heikkinen
Add Polar chart support...
r2483
static PolarOrientation axisPolarOrientation(QAbstractAxis *axis);
Miikka Heikkinen
Make all Q_DISABLE_COPY declarations private....
r2723 private:
Miikka Heikkinen
Add Polar chart support...
r2483 Q_DISABLE_COPY(QPolarChart)
};
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE
Miikka Heikkinen
Add Polar chart support...
r2483
#endif // QCHART_H