##// 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: .qmake.conf README src/charts/qchartglobal.h Change-Id: I20497b20947f589f9f73239a09ba6ea013b3597a

File last commit:

r2878:97bb01ce5d85 merge
r2878:97bb01ce5d85 merge
Show More
qxyseries.h
144 lines | 5.1 KiB | text/x-c | CLexer
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
Michal Klocek
Fixes header guard style issues
r969 #ifndef QXYSERIES_H
#define QXYSERIES_H
Michal Klocek
Add missing files from previous commit
r466
Titta Heikkala
Fix include syntax...
r2714 #include <QtCharts/QChartGlobal>
#include <QtCharts/QAbstractSeries>
#include <QtGui/QPen>
#include <QtGui/QBrush>
Michal Klocek
Add missing files from previous commit
r466
Christian Kandeler
Fix compilation with namespaced Qt....
r2774 QT_BEGIN_NAMESPACE
Marek Rosa
BarSeries - renamed internal model getter to modelInternal. Some smaller changes to other files to have in headers forward declarations for model related members instead of include
r877 class QModelIndex;
Christian Kandeler
Fix compilation with namespaced Qt....
r2774 QT_END_NAMESPACE
Marek Rosa
BarSeries - renamed internal model getter to modelInternal. Some smaller changes to other files to have in headers forward declarations for model related members instead of include
r877
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_BEGIN_NAMESPACE
Michal Klocek
Add missing files from previous commit
r466
Michal Klocek
Adds big fat pimpl to series classes...
r938 class QXYSeriesPrivate;
Marek Rosa
Mapper class added for xyseries and pieseries. Model support commented out for barseries for now.
r1164 class QXYModelMapper;
Michal Klocek
Adds big fat pimpl to series classes...
r938
Titta Heikkala
Qt Charts project file structure change...
r2712 class QT_CHARTS_EXPORT QXYSeries : public QAbstractSeries
Michal Klocek
Add missing files from previous commit
r466 {
Tero Ahola
Added data getter for XY series; example for customizing the looks
r491 Q_OBJECT
Tero Ahola
color and borderColor properties to XY charts; removed unnecessary signals
r1481 Q_PROPERTY(bool pointsVisible READ pointsVisible WRITE setPointsVisible)
Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
Titta Heikkala
Remove warnings about unmatched parentheses...
r2692 Q_PROPERTY(QString pointLabelsFormat READ pointLabelsFormat WRITE setPointLabelsFormat NOTIFY pointLabelsFormatChanged)
Q_PROPERTY(bool pointLabelsVisible READ pointLabelsVisible WRITE setPointLabelsVisible NOTIFY pointLabelsVisibilityChanged)
Q_PROPERTY(QFont pointLabelsFont READ pointLabelsFont WRITE setPointLabelsFont NOTIFY pointLabelsFontChanged)
Q_PROPERTY(QColor pointLabelsColor READ pointLabelsColor WRITE setPointLabelsColor NOTIFY pointLabelsColorChanged)
Titta Heikkala
Added option to set labels clipping...
r2815 Q_PROPERTY(bool pointLabelsClipping READ pointLabelsClipping WRITE setPointLabelsClipping NOTIFY pointLabelsClippingChanged)
Tero Ahola
Now using only one declarative model
r1169
Michal Klocek
Refactor scatter chart to fit the other classes...
r470 protected:
Marc Mutz
Make public headers compile with -Wzero-as-null-pointer-constant...
r2871 explicit QXYSeries(QXYSeriesPrivate &d, QObject *parent = Q_NULLPTR);
Michal Klocek
Add missing files from previous commit
r466
public:
Michal Klocek
Fix protected desturctor in xyseries
r1268 ~QXYSeries();
Jani Honkonen
rename functions add() -> append()
r796 void append(qreal x, qreal y);
void append(const QPointF &point);
Michal Klocek
Fixes and improvments to series API...
r1057 void append(const QList<QPointF> &points);
Jani Honkonen
astyle and manual coding style fixes for src-folder
r2097 void replace(qreal oldX, qreal oldY, qreal newX, qreal newY);
void replace(const QPointF &oldPoint, const QPointF &newPoint);
Miikka Heikkinen
Implement index based removing/replacing points in series...
r2496 void replace(int index, qreal newX, qreal newY);
void replace(int index, const QPointF &newPoint);
Michal Klocek
Adds missing scatter intercation implementation...
r541 void remove(qreal x, qreal y);
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 void remove(const QPointF &point);
Miikka Heikkinen
Implement index based removing/replacing points in series...
r2496 void remove(int index);
Miikka Heikkinen
Add a method to remove more than one point to QXYSeries...
r2805 void removePoints(int index, int count);
Marek Rosa
XYModelMapper slots for model signals implemented
r1256 void insert(int index, const QPointF &point);
void clear();
Tero Ahola
Added data getter for XY series; example for customizing the looks
r491
int count() const;
Michal Klocek
Fixes and improvments to series API...
r1057 QList<QPointF> points() const;
Miikka Heikkinen
Accelerating lineseries with OpenGL...
r2820 QVector<QPointF> pointsVector() const;
Miikka Heikkinen
Refactor the new QXYSeries::pointAt() -> QXYSeries::at()...
r2491 const QPointF &at(int index) const;
Tero Ahola
Added data getter for XY series; example for customizing the looks
r491
Jani Honkonen
more coding style fixes for src-folder...
r2104 QXYSeries &operator << (const QPointF &point);
QXYSeries &operator << (const QList<QPointF> &points);
Tero Ahola
Added data getter for XY series; example for customizing the looks
r491
Tero Ahola
Color and border color properties of XYSeries
r1537 virtual void setPen(const QPen &pen);
Michal Klocek
Adds big fat pimpl to series classes...
r938 QPen pen() const;
Tero Ahola
Color and border color properties of XYSeries
r1537 virtual void setBrush(const QBrush &brush);
Michal Klocek
Adds big fat pimpl to series classes...
r938 QBrush brush() const;
Tero Ahola
color and borderColor properties to XY charts; removed unnecessary signals
r1481 virtual void setColor(const QColor &color);
virtual QColor color() const;
Tero Ahola
Default to true in boolean setters
r987 void setPointsVisible(bool visible = true);
Michal Klocek
Adds big fat pimpl to series classes...
r938 bool pointsVisible() const;
Michal Klocek
Spline series windows compilation fix
r467
Titta Heikkala
Added possibility to show series value...
r2689 void setPointLabelsFormat(const QString &format);
QString pointLabelsFormat() const;
void setPointLabelsVisible(bool visible = true);
bool pointLabelsVisible() const;
void setPointLabelsFont(const QFont &font);
QFont pointLabelsFont() const;
void setPointLabelsColor(const QColor &color);
QColor pointLabelsColor() const;
Titta Heikkala
Added option to set labels clipping...
r2815 void setPointLabelsClipping(bool enabled = true);
bool pointLabelsClipping() const;
Tero Ahola
Added a new QXYSeries::replace override for performance reasons....
r1783 void replace(QList<QPointF> points);
Miikka Heikkinen
Add QXYSeries::replace(QVector<QPointF> points) overload....
r2798 void replace(QVector<QPointF> points);
Tero Ahola
Added a new QXYSeries::replace override for performance reasons....
r1783
sauimone
Q_SIGNALS and Q_SLOTS
r775 Q_SIGNALS:
sauimone
minor code review issues. indent, spaces, brackets etc.
r743 void clicked(const QPointF &point);
Marek Rosa
Added hovered signal to QLineSeries. Updated callout example
r2255 void hovered(const QPointF &point, bool state);
Titta Heikkala
Add pressed, released and doubleClicked signals...
r2739 void pressed(const QPointF &point);
void released(const QPointF &point);
void doubleClicked(const QPointF &point);
Marek Rosa
XYModelMapper slots for series signals implemented
r1262 void pointReplaced(int index);
void pointRemoved(int index);
void pointAdded(int index);
Tero Ahola
color and borderColor properties to XY charts; removed unnecessary signals
r1481 void colorChanged(QColor color);
Tero Ahola
Added a new QXYSeries::replace override for performance reasons....
r1783 void pointsReplaced();
Titta Heikkala
Added possibility to show series value...
r2689 void pointLabelsFormatChanged(const QString &format);
void pointLabelsVisibilityChanged(bool visible);
void pointLabelsFontChanged(const QFont &font);
void pointLabelsColorChanged(const QColor &color);
Titta Heikkala
Added option to set labels clipping...
r2815 void pointLabelsClippingChanged(bool clipping);
Miikka Heikkinen
Add a method to remove more than one point to QXYSeries...
r2805 void pointsRemoved(int index, int count);
Miikka Heikkinen
Accelerating lineseries with OpenGL...
r2820 void penChanged(const QPen &pen);
Michal Klocek
Add missing files from previous commit
r466
Michal Klocek
Adds big fat pimpl to series classes...
r938 private:
Tero Ahola
QML weather example to use data API instead of model
r1222 Q_DECLARE_PRIVATE(QXYSeries)
Q_DISABLE_COPY(QXYSeries)
sauimone
added QXYLegendMarker
r2175 friend class QXYLegendMarkerPrivate;
Michal Klocek
Adds big fat pimpl to series classes...
r938 friend class XYLegendMarker;
Michal Klocek
Refactor xychartitem -> xychart
r1218 friend class XYChart;
Michal Klocek
Add missing files from previous commit
r466 };
Titta Heikkala
Qt Charts project file structure change...
r2712 QT_CHARTS_END_NAMESPACE
Michal Klocek
Add missing files from previous commit
r466
Jani Honkonen
Spit&polish public headers
r2046 #endif // QXYSERIES_H