##// 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
qabstractseries.h
112 lines | 3.4 KiB | text/x-c | CLexer
/ src / charts / qabstractseries.h
Miikka Heikkinen
Updated license...
r2854 /****************************************************************************
Jani Honkonen
Add license headers
r794 **
Miikka Heikkinen
Updated license...
r2854 ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Jani Honkonen
Add license headers
r794 **
Miikka Heikkinen
Updated license...
r2854 ** This file is part of the Qt Charts module of the Qt Toolkit.
Jani Honkonen
Add license headers
r794 **
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.
Jani Honkonen
Add license headers
r794 **
Titta Heikkala
Updated license headers...
r2845 ** $QT_END_LICENSE$
**
Miikka Heikkinen
Updated license...
r2854 ****************************************************************************/
Jani Honkonen
Add license headers
r794
Tero Ahola
Renamed QSeries to QAbstractSeries
r988 #ifndef QABSTRACTSERIES_H
#define QABSTRACTSERIES_H
Michal Klocek
Fix missing file from one of the prvious commits...
r23
Titta Heikkala
Fix include syntax...
r2714 #include <QtCharts/QChartGlobal>
#include <QtCharts/QAbstractAxis>
#include <QtCore/QObject>
#include <QtGui/QPen>
Michal Klocek
Fix missing file from one of the prvious commits...
r23
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_BEGIN_NAMESPACE
Michal Klocek
Fix missing file from one of the prvious commits...
r23
Tero Ahola
Renamed QSeries to QAbstractSeries
r988 class QAbstractSeriesPrivate;
Michal Klocek
Adds if series deleted , remove series from chart
r1062 class QChart;
Michal Klocek
Adds big fat pimpl to series classes...
r938
Titta Heikkala
Qt Charts project file structure change...
r2712 class QT_CHARTS_EXPORT QAbstractSeries : public QObject
Michal Klocek
Fix missing file from one of the prvious commits...
r23 {
sauimone
Improved bar chart series
r71 Q_OBJECT
Tero Ahola
Fixed a bug with legend not updating series labels
r1328 Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
Tero Ahola
Visible property to abstract series
r1342 Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
Tero Ahola
Added opacity property to QAbstractSeries
r2067 Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged)
Tero Ahola
Minor modifications to properties of abstract, area and bar series
r1462 Q_PROPERTY(SeriesType type READ type)
Miikka Heikkinen
Accelerating lineseries with OpenGL...
r2820 Q_PROPERTY(bool useOpenGL READ useOpenGL WRITE setUseOpenGL NOTIFY useOpenGLChanged)
Michal Klocek
Fixes to API , QSeriesType -> SeriesType , add missing getters
r1107 Q_ENUMS(SeriesType)
Tero Ahola
QSeries name and QPieSeries properties to QML api
r884
Michal Klocek
Fix missing file from one of the prvious commits...
r23 public:
Michal Klocek
Fixes to API , QSeriesType -> SeriesType , add missing getters
r1107 enum SeriesType {
Tero Ahola
Proof-of-concept for QML api...
r120 SeriesTypeLine,
Tero Ahola
qdoc for QChartSeries
r309 SeriesTypeArea,
sauimone
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?
r56 SeriesTypeBar,
sauimone
added stacked bar chart
r94 SeriesTypeStackedBar,
sauimone
percent bar chart
r101 SeriesTypePercentBar,
Tero Ahola
Integrated draft version of pie series
r51 SeriesTypePie,
Tero Ahola
qdoc for QChartSeries
r309 SeriesTypeScatter,
sauimone
horizontal barchart frame
r1672 SeriesTypeSpline,
sauimone
compilation fix again
r1687 SeriesTypeHorizontalBar,
sauimone
compilation fix
r1686 SeriesTypeHorizontalStackedBar,
Mika Salmela
A new box-and-whiskers series type added to charts....
r2548 SeriesTypeHorizontalPercentBar,
SeriesTypeBoxPlot
Tero Ahola
Renamed to QtCommercialChart
r30 };
Michal Klocek
Fix missing file from one of the prvious commits...
r23
protected:
Marc Mutz
Make public headers compile with -Wzero-as-null-pointer-constant...
r2871 QAbstractSeries(QAbstractSeriesPrivate &d, QObject *parent = Q_NULLPTR);
Michal Klocek
Fix missing file from one of the prvious commits...
r23
public:
Tero Ahola
Renamed QSeries to QAbstractSeries
r988 ~QAbstractSeries();
Michal Klocek
Fixes to API , QSeriesType -> SeriesType , add missing getters
r1107 virtual SeriesType type() const = 0;
Michal Klocek
Adds createDefaultAxes logic
r1588
Jani Honkonen
more coding style fixes for src-folder...
r2104 void setName(const QString &name);
Michal Klocek
Adds big fat pimpl to series classes...
r938 QString name() const;
Tero Ahola
Visible property to abstract series
r1342 void setVisible(bool visible = true);
bool isVisible() const;
Tero Ahola
Added opacity property to QAbstractSeries
r2067 qreal opacity() const;
void setOpacity(qreal opacity);
Miikka Heikkinen
Accelerating lineseries with OpenGL...
r2820 void setUseOpenGL(bool enable = true);
bool useOpenGL() const;
Tero Ahola
Added opacity property to QAbstractSeries
r2067
Jani Honkonen
more coding style fixes for src-folder...
r2104 QChart *chart() const;
Jani Honkonen
Add title to QSeries
r405
Mika Salmela
A new box-and-whiskers series type added to charts....
r2548 bool attachAxis(QAbstractAxis *axis);
bool detachAxis(QAbstractAxis *axis);
Michal Klocek
Refactors internals...
r2273 QList<QAbstractAxis*> attachedAxes();
Michal Klocek
Adding missing functions to API
r1552 void show();
void hide();
Tero Ahola
Fixed a bug with legend not updating series labels
r1328 Q_SIGNALS:
void nameChanged();
Tero Ahola
Visible property to abstract series
r1342 void visibleChanged();
Tero Ahola
Added opacity property to QAbstractSeries
r2067 void opacityChanged();
Miikka Heikkinen
Accelerating lineseries with OpenGL...
r2820 void useOpenGLChanged();
Tero Ahola
Fixed a bug with legend not updating series labels
r1328
Marek Rosa
Added data from model support to QPieSeries(modify, remove). Data from model example updated
r597 protected:
Tero Ahola
Renamed QSeries to QAbstractSeries
r988 QScopedPointer<QAbstractSeriesPrivate> d_ptr;
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943 friend class ChartDataSet;
friend class ChartPresenter;
Michal Klocek
Refactors internals...
r2273 friend class ChartThemeManager;
Michal Klocek
Adds qlegend pimpl...
r950 friend class QLegendPrivate;
Tero Ahola
Refactored QML axis handling
r1813 friend class DeclarativeChart;
Miikka Heikkinen
Accelerating lineseries with OpenGL...
r2820 friend class QAreaSeries;
Michal Klocek
Fix missing file from one of the prvious commits...
r23 };
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE
Michal Klocek
Fix missing file from one of the prvious commits...
r23
Jani Honkonen
Spit&polish public headers
r2046 #endif // QABSTRACTSERIES_H