##// END OF EJS Templates
Fix point label drawing for XYSeries...
Fix point label drawing for XYSeries Reverting change 810e912b2c05d5f4305b0f1e56be57e765a30479. m_points is used for the point label because that has the series point information. The points variable that is passed to the function is used for positioning the label as it has the coordinates. Change-Id: Iad48660d245c06b736c14161e5c86a4746df2b28 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

File last commit:

r2776:bc1f6aa59d42
r2779:ce2af37ac88e
Show More
qxyseries.h
123 lines | 4.0 KiB | text/x-c | CLexer
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd
** All rights reserved.
** For any questions to The Qt Company, please use contact form at http://qt.io
**
** This file is part of the Qt Charts module.
**
** Licensees holding valid commercial license for Qt may use this file in
** accordance with the Qt License Agreement provided with the Software
** or, alternatively, in accordance with the terms contained in a written
** agreement between you and The Qt Company.
**
** If you have questions regarding the use of this file, please use
** contact form at http://qt.io
**
****************************************************************************/
#ifndef QXYSERIES_H
#define QXYSERIES_H
#include <QtCharts/QChartGlobal>
#include <QtCharts/QAbstractSeries>
#include <QtGui/QPen>
#include <QtGui/QBrush>
QT_BEGIN_NAMESPACE
class QModelIndex;
QT_END_NAMESPACE
QT_CHARTS_BEGIN_NAMESPACE
class QXYSeriesPrivate;
class QXYModelMapper;
class QT_CHARTS_EXPORT QXYSeries : public QAbstractSeries
{
Q_OBJECT
Q_PROPERTY(bool pointsVisible READ pointsVisible WRITE setPointsVisible)
Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
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)
protected:
explicit QXYSeries(QXYSeriesPrivate &d, QObject *parent = 0);
public:
~QXYSeries();
void append(qreal x, qreal y);
void append(const QPointF &point);
void append(const QList<QPointF> &points);
void replace(qreal oldX, qreal oldY, qreal newX, qreal newY);
void replace(const QPointF &oldPoint, const QPointF &newPoint);
void replace(int index, qreal newX, qreal newY);
void replace(int index, const QPointF &newPoint);
void remove(qreal x, qreal y);
void remove(const QPointF &point);
void remove(int index);
void insert(int index, const QPointF &point);
void clear();
int count() const;
QList<QPointF> points() const;
const QPointF &at(int index) const;
QXYSeries &operator << (const QPointF &point);
QXYSeries &operator << (const QList<QPointF> &points);
virtual void setPen(const QPen &pen);
QPen pen() const;
virtual void setBrush(const QBrush &brush);
QBrush brush() const;
virtual void setColor(const QColor &color);
virtual QColor color() const;
void setPointsVisible(bool visible = true);
bool pointsVisible() const;
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;
void replace(QList<QPointF> points);
Q_SIGNALS:
void clicked(const QPointF &point);
void hovered(const QPointF &point, bool state);
void pressed(const QPointF &point);
void released(const QPointF &point);
void doubleClicked(const QPointF &point);
void pointReplaced(int index);
void pointRemoved(int index);
void pointAdded(int index);
void colorChanged(QColor color);
void pointsReplaced();
void pointLabelsFormatChanged(const QString &format);
void pointLabelsVisibilityChanged(bool visible);
void pointLabelsFontChanged(const QFont &font);
void pointLabelsColorChanged(const QColor &color);
private:
Q_DECLARE_PRIVATE(QXYSeries)
Q_DISABLE_COPY(QXYSeries)
friend class QXYLegendMarkerPrivate;
friend class XYLegendMarker;
friend class XYChart;
};
QT_CHARTS_END_NAMESPACE
#endif // QXYSERIES_H