##// 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:

r2854:46147b040d06
r2898:03a6177a3223 merge master
Show More
qabstractseries_p.h
124 lines | 3.7 KiB | text/x-c | CLexer
/ src / charts / qabstractseries_p.h
Miikka Heikkinen
Updated license...
r2854 /****************************************************************************
Michal Klocek
Adds big fat pimpl to series classes...
r938 **
Miikka Heikkinen
Updated license...
r2854 ** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
Michal Klocek
Adds big fat pimpl to series classes...
r938 **
Miikka Heikkinen
Updated license...
r2854 ** This file is part of the Qt Charts module of the Qt Toolkit.
Michal Klocek
Adds big fat pimpl to series classes...
r938 **
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 big fat pimpl to series classes...
r938 **
Titta Heikkala
Updated license headers...
r2845 ** $QT_END_LICENSE$
**
Miikka Heikkinen
Updated license...
r2854 ****************************************************************************/
Michal Klocek
Adds big fat pimpl to series classes...
r938
// 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 big fat pimpl to series classes...
r938 // implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
Tero Ahola
Renamed QSeries to QAbstractSeries
r988 #ifndef QABSTRACTSERIES_P_H
#define QABSTRACTSERIES_P_H
Michal Klocek
Adds big fat pimpl to series classes...
r938
Titta Heikkala
Fix include syntax...
r2714 #include <QtCharts/QAbstractSeries>
#include <QtCharts/QChart>
#include <private/abstractdomain_p.h>
Michal Klocek
Refactors internals...
r2273
Christian Kandeler
Fix compilation with namespaced Qt....
r2774 QT_BEGIN_NAMESPACE
Michal Klocek
Refactors internals...
r2273 class QGraphicsItem;
Christian Kandeler
Fix compilation with namespaced Qt....
r2774 QT_END_NAMESPACE
Michal Klocek
Adds big fat pimpl to series classes...
r938
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_BEGIN_NAMESPACE
Michal Klocek
Adds big fat pimpl to series classes...
r938
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943 class ChartPresenter;
Michal Klocek
Refactors Chart to ChartElement
r1736 class ChartElement;
Michal Klocek
Adds qlegend pimpl...
r950 class LegendMarker;
class QLegend;
Michal Klocek
Adds if series deleted , remove series from chart
r1062 class ChartDataSet;
Michal Klocek
Adds missing functions to qchart API
r1542 class QAbstractAxis;
sauimone
Added createLegendMarkers to private series. This will replace old createLegendMarker method. Notice the s in new method name. PIMPL for QLegendMarker. Newlegend example updated a bit
r2163 class QLegendMarker;
Michal Klocek
Refactors internals...
r2273 class ChartTheme;
class ChartAnimation;
class ChartItem;
Mika Salmela
A new box-and-whiskers series type added to charts....
r2548 class BoxPlotChartItem;
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943
Tero Ahola
Renamed QSeries to QAbstractSeries
r988 class QAbstractSeriesPrivate : public QObject
Michal Klocek
Adds big fat pimpl to series classes...
r938 {
Michal Klocek
Krazy reported errors...
r974 Q_OBJECT
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943 public:
Tero Ahola
Renamed QSeries to QAbstractSeries
r988 QAbstractSeriesPrivate(QAbstractSeries *q);
~QAbstractSeriesPrivate();
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943
Michal Klocek
Refactors internals...
r2273 virtual void initializeDomain() = 0;
virtual void initializeAxes() = 0;
virtual void initializeTheme(int index, ChartTheme* theme, bool forced = false) = 0;
virtual void initializeGraphics(QGraphicsItem* parent) = 0;
Titta Heikkala
Added possibility to set duration and easing curve for chart animation...
r2804 virtual void initializeAnimations(QChart::AnimationOptions options, int duration,
QEasingCurve &curve) = 0;
Michal Klocek
Refactors internals...
r2273
sauimone
Added createLegendMarkers to private series. This will replace old createLegendMarker method. Notice the s in new method name. PIMPL for QLegendMarker. Newlegend example updated a bit
r2163 virtual QList<QLegendMarker*> createLegendMarkers(QLegend* legend) = 0;
Michal Klocek
Refactors internals...
r2273
Michal Klocek
Adds axis domain intialization
r1695 virtual QAbstractAxis::AxisType defaultAxisType(Qt::Orientation) const = 0;
Michal Klocek
Refactors internals...
r2273 virtual QAbstractAxis* createDefaultAxis(Qt::Orientation) const = 0;
ChartItem* chartItem() { return m_item.data(); }
Michal Klocek
Domain not sharable again
r2285 virtual void setDomain(AbstractDomain* domain);
AbstractDomain* domain() { return m_domain.data(); }
Michal Klocek
Refactors internals...
r2273
Miikka Heikkinen
Added QChart::localizeNumbers...
r2707 virtual void setPresenter(ChartPresenter *presenter);
ChartPresenter *presenter() const;
Michal Klocek
Refactors internals...
r2273 QChart* chart() { return m_chart; }
Titta Heikkala
Add possibility to set reverse values to axes...
r2781 bool reverseXAxis();
bool reverseYAxis();
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943
Miikka Heikkinen
Accelerating lineseries with OpenGL...
r2820 void setBlockOpenGL(bool enable);
sauimone
legend private implemantation modified.
r2081 Q_SIGNALS:
Michal Klocek
Fixes legend markers updates
r2085 void countChanged();
sauimone
legend private implemantation modified.
r2081
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943 protected:
Tero Ahola
Renamed QSeries to QAbstractSeries
r988 QAbstractSeries *q_ptr;
Jani Honkonen
Implemented QAbstractSeries::chart()...
r1314 QChart *m_chart;
Michal Klocek
Refactors internals...
r2273 QScopedPointer<ChartItem> m_item;
QList<QAbstractAxis*> m_axes;
Titta Heikkala
Add possibility to set reverse values to axes...
r2781
Michal Klocek
Refactors internals...
r2273 private:
Michal Klocek
Domain not sharable again
r2285 QScopedPointer<AbstractDomain> m_domain;
Michal Klocek
Adds big fat pimpl to series classes...
r938 QString m_name;
Tero Ahola
Visible property to abstract series
r1342 bool m_visible;
Tero Ahola
Added opacity property to QAbstractSeries
r2067 qreal m_opacity;
Miikka Heikkinen
Added QChart::localizeNumbers...
r2707 ChartPresenter *m_presenter;
Miikka Heikkinen
Accelerating lineseries with OpenGL...
r2820 bool m_useOpenGL;
bool m_blockOpenGL;
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943
Tero Ahola
Renamed QSeries to QAbstractSeries
r988 friend class QAbstractSeries;
Michal Klocek
Adds if series deleted , remove series from chart
r1062 friend class ChartDataSet;
Michal Klocek
Refactors internals...
r2273 friend class ChartPresenter;
Michal Klocek
Fixes legend markers updates
r2085 friend class QLegendPrivate;
Mika Salmela
A new box-and-whiskers series type added to charts....
r2548 friend class BoxPlotChartItem;
Michal Klocek
Adds big fat pimpl to series classes...
r938 };
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE
Michal Klocek
Adds big fat pimpl to series classes...
r938
#endif