diff --git a/src/areachart/qareaseries.cpp b/src/areachart/qareaseries.cpp index 8f2c2ab..41bcff1 100644 --- a/src/areachart/qareaseries.cpp +++ b/src/areachart/qareaseries.cpp @@ -22,7 +22,6 @@ #include "qareaseries_p.h" #include "qlineseries.h" #include "areachartitem_p.h" -#include "legendmarker_p.h" #include "domain_p.h" #include "chartdataset_p.h" #include "charttheme_p.h" @@ -377,13 +376,6 @@ ChartElement *QAreaSeriesPrivate::createGraphics(ChartPresenter *presenter) return area; } -QList QAreaSeriesPrivate::createLegendMarker(QLegend *legend) -{ - Q_Q(QAreaSeries); - QList list; - return list << new AreaLegendMarker(q, legend); -} - QList QAreaSeriesPrivate::createLegendMarkers(QLegend* legend) { Q_Q(QAreaSeries); diff --git a/src/areachart/qareaseries_p.h b/src/areachart/qareaseries_p.h index 63d0822..e2fe3be 100644 --- a/src/areachart/qareaseries_p.h +++ b/src/areachart/qareaseries_p.h @@ -45,7 +45,6 @@ public: void scaleDomain(Domain &domain); ChartElement *createGraphics(ChartPresenter *presenter); - QList createLegendMarker(QLegend *legend); QList createLegendMarkers(QLegend* legend); void initializeAxis(QAbstractAxis *axis); diff --git a/src/barchart/qabstractbarseries.cpp b/src/barchart/qabstractbarseries.cpp index bb32ca2..ccf60cc 100644 --- a/src/barchart/qabstractbarseries.cpp +++ b/src/barchart/qabstractbarseries.cpp @@ -23,7 +23,6 @@ #include "qbarset.h" #include "qbarset_p.h" #include "domain_p.h" -#include "legendmarker_p.h" #include "chartdataset_p.h" #include "charttheme_p.h" #include "qvalueaxis.h" @@ -649,18 +648,6 @@ ChartElement *QAbstractBarSeriesPrivate::createGraphics(ChartPresenter *presente return 0; } -QList QAbstractBarSeriesPrivate::createLegendMarker(QLegend *legend) -{ - Q_Q(QAbstractBarSeries); - QList markers; - foreach (QBarSet *set, q->barSets()) { - BarLegendMarker* marker = new BarLegendMarker(q, set, legend); - markers << marker; - } - - return markers; -} - QList QAbstractBarSeriesPrivate::createLegendMarkers(QLegend* legend) { Q_Q(QAbstractBarSeries); diff --git a/src/barchart/qabstractbarseries_p.h b/src/barchart/qabstractbarseries_p.h index 8b98821..8b79c68 100644 --- a/src/barchart/qabstractbarseries_p.h +++ b/src/barchart/qabstractbarseries_p.h @@ -56,7 +56,6 @@ public: void scaleDomain(Domain &domain); ChartElement *createGraphics(ChartPresenter *presenter); - QList createLegendMarker(QLegend *legend); QList createLegendMarkers(QLegend* legend); void initializeAxis(QAbstractAxis *axis); diff --git a/src/chartlayout.cpp b/src/chartlayout.cpp index 12003b6..22fd318 100644 --- a/src/chartlayout.cpp +++ b/src/chartlayout.cpp @@ -24,7 +24,6 @@ #include "chartaxis_p.h" #include "charttitle_p.h" #include "chartbackground_p.h" -#include "legendmarker_p.h" #include QTCOMMERCIALCHART_BEGIN_NAMESPACE diff --git a/src/legend/legend.pri b/src/legend/legend.pri index ca28f4e..69043e9 100644 --- a/src/legend/legend.pri +++ b/src/legend/legend.pri @@ -3,7 +3,6 @@ DEPENDPATH += $$PWD SOURCES += \ $$PWD/qlegend.cpp \ - $$PWD/legendmarker.cpp \ $$PWD/legendlayout.cpp \ $$PWD/qlegendmarker.cpp \ $$PWD/qpielegendmarker.cpp \ @@ -13,7 +12,6 @@ SOURCES += \ $$PWD/qarealegendmarker.cpp PRIVATE_HEADERS += \ - $$PWD/legendmarker_p.h \ $$PWD/legendscroller_p.h \ $$PWD/qlegend_p.h \ $$PWD/legendlayout_p.h \ diff --git a/src/legend/legendlayout.cpp b/src/legend/legendlayout.cpp index e8ce113..eeaf343 100644 --- a/src/legend/legendlayout.cpp +++ b/src/legend/legendlayout.cpp @@ -20,7 +20,6 @@ #include "legendlayout_p.h" #include "chartpresenter_p.h" -//#include "legendmarker_p.h" #include "qlegend_p.h" #include "chartlayout_p.h" diff --git a/src/legend/legendmarker.cpp b/src/legend/legendmarker.cpp deleted file mode 100644 index 8db5e5f..0000000 --- a/src/legend/legendmarker.cpp +++ /dev/null @@ -1,252 +0,0 @@ -/**************************************************************************** - ** - ** Copyright (C) 2012 Digia Plc - ** All rights reserved. - ** For any questions to Digia, please use contact form at http://qt.digia.com - ** - ** This file is part of the Qt Commercial Charts Add-on. - ** - ** $QT_BEGIN_LICENSE$ - ** Licensees holding valid Qt Commercial licenses may use this file in - ** accordance with the Qt Commercial License Agreement provided with the - ** Software or, alternatively, in accordance with the terms contained in - ** a written agreement between you and Digia. - ** - ** If you have questions regarding the use of this file, please use - ** contact form at http://qt.digia.com - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ - -#include "legendmarker_p.h" -#include "qxyseries.h" -#include "qxyseries_p.h" -#include "qlegend.h" -#include "qabstractbarseries.h" -#include "qpieseries.h" -#include "qpieslice.h" -#include "qbarset.h" -#include "qbarset_p.h" -#include "qareaseries.h" -#include "qareaseries_p.h" -#include -#include -#include -#include - -QTCOMMERCIALCHART_BEGIN_NAMESPACE - -LegendMarker::LegendMarker(QAbstractSeries *series, QLegend *legend) : - QGraphicsObject(legend), - m_series(series), - m_markerRect(0, 0, 10.0, 10.0), - m_boundingRect(0, 0, 0, 0), - m_legend(legend), - m_textItem(new QGraphicsSimpleTextItem(this)), - m_rectItem(new QGraphicsRectItem(this)), - m_margin(4), - m_space(4) -{ - //setAcceptedMouseButtons(Qt::LeftButton|Qt::RightButton); - m_rectItem->setRect(m_markerRect); -} - -void LegendMarker::setPen(const QPen &pen) -{ - m_rectItem->setPen(pen); -} - -QPen LegendMarker::pen() const -{ - return m_rectItem->pen(); -} - -void LegendMarker::setBrush(const QBrush &brush) -{ - m_rectItem->setBrush(brush); -} - -QBrush LegendMarker::brush() const -{ - return m_rectItem->brush(); -} - -void LegendMarker::setFont(const QFont &font) -{ - m_textItem->setFont(font); - QFontMetrics fn(font); - m_markerRect = QRectF(0, 0, fn.height() / 2, fn.height() / 2); - updateGeometry(); - m_legend->layout()->invalidate(); -} - -QFont LegendMarker::font() const -{ - return m_textItem->font(); -} - -void LegendMarker::setLabel(const QString label) -{ - m_text = label; - updateGeometry(); - m_legend->layout()->invalidate(); -} - -QString LegendMarker::label() const -{ - return m_text; -} - -QRectF LegendMarker::boundingRect() const -{ - return m_boundingRect; -} - -void LegendMarker::setLabelBrush(const QBrush &brush) -{ - m_textItem->setBrush(brush); -} - -QBrush LegendMarker::labelBrush() const -{ - return m_textItem->brush(); -} - - -void LegendMarker::setGeometry(const QRectF &rect) -{ - QFontMetrics fn(font()); - - int width = rect.width(); - qreal x = m_margin + m_markerRect.width() + m_space + m_margin; - qreal y = qMax(m_markerRect.height() + 2 * m_margin, fn.height() + 2 * m_margin); - - if (fn.boundingRect(m_text).width() + x > width) { - QString string = m_text + "..."; - while (fn.boundingRect(string).width() + x > width && string.length() > 3) - string.remove(string.length() - 4, 1); - m_textItem->setText(string); - } else { - m_textItem->setText(m_text); - } - - const QRectF &textRect = m_textItem->boundingRect(); - m_textItem->setPos(x - m_margin, y / 2 - textRect.height() / 2); - m_rectItem->setRect(m_markerRect); - m_rectItem->setPos(m_margin, y / 2 - m_markerRect.height() / 2); - - prepareGeometryChange(); - m_boundingRect = QRectF(0, 0, x + textRect.width() + m_margin, y); -} - -void LegendMarker::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) -{ - Q_UNUSED(option) - Q_UNUSED(widget) - Q_UNUSED(painter) -} - -QSizeF LegendMarker::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const -{ - Q_UNUSED(constraint) - - QFontMetrics fn(m_textItem->font()); - QSizeF sh; - - switch (which) { - case Qt::MinimumSize: - sh = QSizeF(fn.boundingRect("...").width() + 2 * m_margin + m_space + m_markerRect.width(), qMax(m_markerRect.height() + 2 * m_margin, fn.height() + 2 * m_margin)); - break; - case Qt::PreferredSize: - sh = QSizeF(fn.boundingRect(m_text).width() + 2 * m_margin + m_space + m_markerRect.width(), qMax(m_markerRect.height() + 2 * m_margin, fn.height() + 2 * m_margin)); - break; - default: - break; - } - return sh; -} - -void LegendMarker::mousePressEvent(QGraphicsSceneMouseEvent *event) -{ - QGraphicsObject::mousePressEvent(event); - //TODO: selected signal removed for now -} - -////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -AreaLegendMarker::AreaLegendMarker(QAreaSeries *series, QLegend *legend) - : LegendMarker(series, legend), - m_series(series) -{ - //QObject::connect(this, SIGNAL(selected()), series, SIGNAL(selected())); - QObject::connect(series->d_func(), SIGNAL(updated()), this, SLOT(updated())); - QObject::connect(series, SIGNAL(nameChanged()), this, SLOT(updated())); - updated(); -} - -void AreaLegendMarker::updated() -{ - setBrush(m_series->brush()); - setLabel(m_series->name()); -} - -////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -BarLegendMarker::BarLegendMarker(QAbstractBarSeries *barseries, QBarSet *barset, QLegend *legend) - : LegendMarker(barseries, legend), - m_barset(barset) -{ - //QObject::connect(this, SIGNAL(selected()),barset->d_ptr.data(), SIGNAL(selected())); - QObject::connect(barset->d_ptr.data(), SIGNAL(updatedBars()), this, SLOT(updated())); - QObject::connect(barset, SIGNAL(labelChanged()), this, SLOT(updated())); - updated(); -} - -void BarLegendMarker::updated() -{ - setBrush(m_barset->brush()); - setLabel(m_barset->label()); -} - -////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -PieLegendMarker::PieLegendMarker(QPieSeries *series, QPieSlice *pieslice, QLegend *legend) - : LegendMarker(series, legend), - m_pieslice(pieslice) -{ - QObject::connect(pieslice, SIGNAL(labelChanged()), this, SLOT(updated())); - QObject::connect(pieslice, SIGNAL(brushChanged()), this, SLOT(updated())); - updated(); -} - -void PieLegendMarker::updated() -{ - setBrush(m_pieslice->brush()); - setLabel(m_pieslice->label()); -} - -////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - -XYLegendMarker::XYLegendMarker(QXYSeries *series, QLegend *legend) - : LegendMarker(series, legend), - m_series(series) -{ - //QObject::connect(this, SIGNAL(selected()), series, SIGNAL(selected())); - QObject::connect(series->d_func(), SIGNAL(updated()), this, SLOT(updated())); - QObject::connect(series, SIGNAL(nameChanged()), this, SLOT(updated())); - updated(); -} - -void XYLegendMarker::updated() -{ - setLabel(m_series->name()); - - if (m_series->type() == QAbstractSeries::SeriesTypeScatter) - setBrush(m_series->brush()); - else - setBrush(QBrush(m_series->pen().color())); -} - -#include "moc_legendmarker_p.cpp" - -QTCOMMERCIALCHART_END_NAMESPACE diff --git a/src/legend/legendmarker_p.h b/src/legend/legendmarker_p.h deleted file mode 100644 index 83f51b5..0000000 --- a/src/legend/legendmarker_p.h +++ /dev/null @@ -1,145 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc -** All rights reserved. -** For any questions to Digia, please use contact form at http://qt.digia.com -** -** This file is part of the Qt Commercial Charts Add-on. -** -** $QT_BEGIN_LICENSE$ -** Licensees holding valid Qt Commercial licenses may use this file in -** accordance with the Qt Commercial License Agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. -** -** If you have questions regarding the use of this file, please use -** contact form at http://qt.digia.com -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// W A R N I N G -// ------------- -// -// This file is not part of the QtCommercial Chart API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef LEGENDMARKER_P_H -#define LEGENDMARKER_P_H - -#include "qchartglobal.h" -#include -#include -#include -#include -#include - -QTCOMMERCIALCHART_BEGIN_NAMESPACE - -class QAbstractSeries; -class QAreaSeries; -class QXYSeries; -class QBarSet; -class QAbstractBarSeries; -class QPieSlice; -class QLegend; -class QPieSeries; - -class LegendMarker : public QGraphicsObject, public QGraphicsLayoutItem -{ - Q_OBJECT - Q_INTERFACES(QGraphicsLayoutItem) -public: - explicit LegendMarker(QAbstractSeries *m_series, QLegend *parent); - - void setPen(const QPen &pen); - QPen pen() const; - - void setBrush(const QBrush &brush); - QBrush brush() const; - - void setFont(const QFont &font); - QFont font() const; - - void setLabel(const QString label); - QString label() const; - - void setLabelBrush(const QBrush &brush); - QBrush labelBrush() const; - - QAbstractSeries *series() const { return m_series;} - - void setGeometry(const QRectF &rect); - - QRectF boundingRect() const; - - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); - - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const; - -protected: - // From QGraphicsObject - void mousePressEvent(QGraphicsSceneMouseEvent *event); - -public Q_SLOTS: - virtual void updated() = 0; - -protected: - QAbstractSeries *m_series; - QRectF m_markerRect; - QRectF m_boundingRect; - QLegend *m_legend; - QGraphicsSimpleTextItem *m_textItem; - QGraphicsRectItem *m_rectItem; - qreal m_margin; - qreal m_space; - QString m_text; - -}; - -////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class XYLegendMarker : public LegendMarker -{ -public: - XYLegendMarker(QXYSeries *series, QLegend *legend); -protected: - void updated(); -private: - QXYSeries *m_series; -}; -////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class AreaLegendMarker : public LegendMarker -{ -public: - AreaLegendMarker(QAreaSeries *series, QLegend *legend); -protected: - void updated(); -private: - QAreaSeries *m_series; -}; -////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class BarLegendMarker : public LegendMarker -{ -public: - BarLegendMarker(QAbstractBarSeries *barseries, QBarSet *barset, QLegend *legend); -protected: - void updated(); -private: - QBarSet *m_barset; -}; -////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -class PieLegendMarker : public LegendMarker -{ -public: - PieLegendMarker(QPieSeries *pieSeries, QPieSlice *pieslice, QLegend *legend); -protected: - void updated(); -private: - QPieSlice *m_pieslice; -}; - -QTCOMMERCIALCHART_END_NAMESPACE -#endif // LEGENDMARKER_P_H diff --git a/src/legend/qarealegendmarker.cpp b/src/legend/qarealegendmarker.cpp index a8c14a3..84084ed 100644 --- a/src/legend/qarealegendmarker.cpp +++ b/src/legend/qarealegendmarker.cpp @@ -62,7 +62,6 @@ QAreaLegendMarkerPrivate::QAreaLegendMarkerPrivate(QAreaLegendMarker *q, QAreaSe QLegendMarkerPrivate(q,legend), m_series(series) { - qDebug() << "QAreaLegendMarkerPrivate created"; QObject::connect(m_series->d_func(),SIGNAL(updated()), this, SLOT(updated())); QObject::connect(m_series, SIGNAL(nameChanged()), this, SLOT(updated())); updated(); @@ -76,7 +75,6 @@ QAreaLegendMarkerPrivate::~QAreaLegendMarkerPrivate() void QAreaLegendMarkerPrivate::updated() { - qDebug() << "QAreaLegendMarkerPrivate::updated"; m_item->setBrush(m_series->brush()); m_item->setLabel(m_series->name()); } diff --git a/src/legend/qbarlegendmarker.h b/src/legend/qbarlegendmarker.h index 9541332..46a55e4 100644 --- a/src/legend/qbarlegendmarker.h +++ b/src/legend/qbarlegendmarker.h @@ -24,7 +24,6 @@ #include #include #include -//#include "qbarlegendmarker_p.h" QTCOMMERCIALCHART_BEGIN_NAMESPACE diff --git a/src/legend/qlegend.cpp b/src/legend/qlegend.cpp index a2415e7..ac01b25 100644 --- a/src/legend/qlegend.cpp +++ b/src/legend/qlegend.cpp @@ -24,7 +24,6 @@ #include "qabstractseries_p.h" #include "qchart_p.h" #include "legendlayout_p.h" -#include "legendmarker_p.h" // TODO: deprecated #include "qxyseries.h" #include "qlineseries.h" #include "qareaseries.h" @@ -265,10 +264,11 @@ QPen QLegend::pen() const void QLegend::setFont(const QFont &font) { - if (d_ptr->m_font != font) { + if (d_ptr->m_font != font) d_ptr->m_font = font; - foreach (LegendMarker *marker, d_ptr->markers()) - marker->setFont(d_ptr->m_font); + + foreach (QLegendMarker *marker, d_ptr->legendMarkers()) { + marker->setFont(d_ptr->m_font); layout()->invalidate(); emit fontChanged(font); } @@ -300,7 +300,7 @@ void QLegend::setLabelBrush(const QBrush &brush) { if (d_ptr->m_labelBrush != brush) { d_ptr->m_labelBrush = brush; - foreach (LegendMarker *marker, d_ptr->markers()) { + foreach (QLegendMarker *marker, d_ptr->legendMarkers()) { marker->setLabelBrush(d_ptr->m_labelBrush); // Note: The pen of the marker rectangle could be exposed in the public QLegend API // instead of mapping it from label brush color diff --git a/src/legend/qlegend_p.h b/src/legend/qlegend_p.h index 577bcd6..1b1abb5 100644 --- a/src/legend/qlegend_p.h +++ b/src/legend/qlegend_p.h @@ -38,7 +38,6 @@ class QChart; class ChartPresenter; class QAbstractSeries; class LegendLayout; -class LegendMarker; class Domain; class QLegendMarker; @@ -53,11 +52,10 @@ public: QPointF offset() const; int roundness(qreal size); - QList markers() { return m_markers; } // TODO: this will be removed QGraphicsItemGroup* items() { return m_items; } // New stuff: - QList legendMarkers() { return m_legendMarkers; } // TODO: function name will change + QList legendMarkers() { return m_legendMarkers; } void appendSeries(QAbstractSeries* series); void removeSeries(QAbstractSeries* series); @@ -73,7 +71,6 @@ private: LegendLayout *m_layout; QChart* m_chart; QGraphicsItemGroup* m_items; - QList m_markers; // TODO: this will be removed Qt::Alignment m_alignment; QBrush m_brush; QPen m_pen; diff --git a/src/legend/qpielegendmarker.h b/src/legend/qpielegendmarker.h index fc50e4e..e3ede68 100644 --- a/src/legend/qpielegendmarker.h +++ b/src/legend/qpielegendmarker.h @@ -25,7 +25,6 @@ #include #include #include -//#include "qpielegendmarker_p.h" QTCOMMERCIALCHART_BEGIN_NAMESPACE diff --git a/src/piechart/qpieseries.cpp b/src/piechart/qpieseries.cpp index 8137de1..7379cef 100644 --- a/src/piechart/qpieseries.cpp +++ b/src/piechart/qpieseries.cpp @@ -25,7 +25,6 @@ #include "pieslicedata_p.h" #include "chartdataset_p.h" #include "charttheme_p.h" -#include "legendmarker_p.h" #include "qabstractaxis.h" #include "pieanimation_p.h" @@ -851,20 +850,8 @@ ChartElement *QPieSeriesPrivate::createGraphics(ChartPresenter *presenter) return pie; } -QList QPieSeriesPrivate::createLegendMarker(QLegend *legend) -{ - Q_Q(QPieSeries); - QList markers; - foreach (QPieSlice *slice, q->slices()) { - PieLegendMarker* marker = new PieLegendMarker(q, slice, legend); - markers << marker; - } - return markers; -} - QList QPieSeriesPrivate::createLegendMarkers(QLegend* legend) { -// Q_UNUSED(legend); Q_Q(QPieSeries); QList markers; foreach(QPieSlice* slice, q->slices()) { diff --git a/src/piechart/qpieseries_p.h b/src/piechart/qpieseries_p.h index 357ff57..c5c1aad 100644 --- a/src/piechart/qpieseries_p.h +++ b/src/piechart/qpieseries_p.h @@ -46,7 +46,6 @@ public: void scaleDomain(Domain &domain); ChartElement *createGraphics(ChartPresenter *presenter); - QList createLegendMarker(QLegend *legend); QList createLegendMarkers(QLegend *legend); void initializeAxis(QAbstractAxis *axis); QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const; diff --git a/src/qabstractseries_p.h b/src/qabstractseries_p.h index d12d596..2c28ec9 100644 --- a/src/qabstractseries_p.h +++ b/src/qabstractseries_p.h @@ -52,7 +52,6 @@ public: virtual void scaleDomain(Domain &domain) = 0; virtual ChartElement *createGraphics(ChartPresenter *presenter) = 0; - virtual QList createLegendMarker(QLegend *legend) = 0; virtual QList createLegendMarkers(QLegend* legend) = 0; virtual void initializeAxis(QAbstractAxis *axis) = 0; virtual QAbstractAxis::AxisType defaultAxisType(Qt::Orientation) const = 0; diff --git a/src/xychart/qxyseries.cpp b/src/xychart/qxyseries.cpp index d70f9db..421c26a 100644 --- a/src/xychart/qxyseries.cpp +++ b/src/xychart/qxyseries.cpp @@ -21,7 +21,6 @@ #include "qxyseries.h" #include "qxyseries_p.h" #include "domain_p.h" -#include "legendmarker_p.h" #include "qvalueaxis.h" #include "qxylegendmarker.h" @@ -449,13 +448,6 @@ void QXYSeriesPrivate::scaleDomain(Domain &domain) domain.setRange(minX, maxX, minY, maxY); } -QList QXYSeriesPrivate::createLegendMarker(QLegend *legend) -{ - Q_Q(QXYSeries); - QList list; - return list << new XYLegendMarker(q, legend); -} - QList QXYSeriesPrivate::createLegendMarkers(QLegend* legend) { Q_Q(QXYSeries); diff --git a/src/xychart/qxyseries_p.h b/src/xychart/qxyseries_p.h index 3f2d485..876cffa 100644 --- a/src/xychart/qxyseries_p.h +++ b/src/xychart/qxyseries_p.h @@ -45,7 +45,6 @@ public: QXYSeriesPrivate(QXYSeries *q); void scaleDomain(Domain &domain); - QList createLegendMarker(QLegend *legend); QList createLegendMarkers(QLegend* legend); void initializeAxis(QAbstractAxis *axis); @@ -53,9 +52,6 @@ public: Q_SIGNALS: void updated(); -// void pointReplaced(int index); -// void pointRemoved(int index); -// void pointAdded(int index); protected: QVector m_points;