HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2178:e02bd659997b

0

src/areachart/qareaseries.cpp 0 -8

             #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"
                 return area;
             }
-            QList<LegendMarker *> QAreaSeriesPrivate::createLegendMarker(QLegend *legend)
-                Q_Q(QAreaSeries);
-                QList<LegendMarker *> list;
-                return list << new AreaLegendMarker(q, legend);
             QList<QLegendMarker*> QAreaSeriesPrivate::createLegendMarkers(QLegend* legend)
             {
                 Q_Q(QAreaSeries);

0

src/areachart/qareaseries_p.h 0 -1

                 void scaleDomain(Domain &domain);
                 ChartElement *createGraphics(ChartPresenter *presenter);
-                QList<LegendMarker *> createLegendMarker(QLegend *legend);
                 QList<QLegendMarker*> createLegendMarkers(QLegend* legend);
                 void initializeAxis(QAbstractAxis *axis);

0

src/barchart/qabstractbarseries.cpp 0 -13

             #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"
                 return 0;
             }
-            QList<LegendMarker *> QAbstractBarSeriesPrivate::createLegendMarker(QLegend *legend)
-                Q_Q(QAbstractBarSeries);
-                QList<LegendMarker *> markers;
-                foreach (QBarSet *set, q->barSets()) {
-                    BarLegendMarker* marker = new BarLegendMarker(q, set, legend);
-                    markers << marker;
-                return markers;
             QList<QLegendMarker*> QAbstractBarSeriesPrivate::createLegendMarkers(QLegend* legend)
             {
                 Q_Q(QAbstractBarSeries);

0

src/barchart/qabstractbarseries_p.h 0 -1

                 void scaleDomain(Domain &domain);
                 ChartElement *createGraphics(ChartPresenter *presenter);
-                QList<LegendMarker *> createLegendMarker(QLegend *legend);
                 QList<QLegendMarker*> createLegendMarkers(QLegend* legend);
                 void initializeAxis(QAbstractAxis *axis);

0

src/chartlayout.cpp 0 -1

             #include "chartaxis_p.h"
             #include "charttitle_p.h"
             #include "chartbackground_p.h"
-            #include "legendmarker_p.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

0

src/legend/legend.pri 0 -2

             SOURCES += \
                 $$PWD/qlegend.cpp \
-                $$PWD/legendmarker.cpp \
                 $$PWD/legendlayout.cpp \
                 $$PWD/qlegendmarker.cpp \
                 $$PWD/qpielegendmarker.cpp \
                 $$PWD/qarealegendmarker.cpp
             PRIVATE_HEADERS += \
-                $$PWD/legendmarker_p.h \
                 $$PWD/legendscroller_p.h \
                 $$PWD/qlegend_p.h  \
                 $$PWD/legendlayout_p.h \

0

src/legend/legendlayout.cpp 0 -1

             #include "legendlayout_p.h"
             #include "chartpresenter_p.h"
-            //#include "legendmarker_p.h"
             #include "qlegend_p.h"
             #include "chartlayout_p.h"

0

src/legend/qarealegendmarker.cpp 0 -2

                 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();
             void QAreaLegendMarkerPrivate::updated()
             {
-                qDebug() << "QAreaLegendMarkerPrivate::updated";
                 m_item->setBrush(m_series->brush());
                 m_item->setLabel(m_series->name());
             }

0

src/legend/qbarlegendmarker.h 0 -1

             #include <QLegendMarker>
             #include <QAbstractBarSeries>
             #include <QBarSet>
-            //#include "qbarlegendmarker_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

0

src/legend/qlegend.cpp +5 -5

             #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"
             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);
                 }
             {
                 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

0

src/legend/qlegend_p.h +1 -4

             class ChartPresenter;
             class QAbstractSeries;
             class LegendLayout;
-            class LegendMarker;
             class Domain;
             class QLegendMarker;
                 QPointF offset() const;
                 int roundness(qreal size);
-                QList<LegendMarker*> markers() { return m_markers; }    // TODO: this will be removed
                 QGraphicsItemGroup* items() { return m_items; }
                 // New stuff:
-                QList<QLegendMarker*> legendMarkers() { return m_legendMarkers; }   // TODO: function name will change
+                QList<QLegendMarker*> legendMarkers() { return m_legendMarkers; }
                 void appendSeries(QAbstractSeries* series);
                 void removeSeries(QAbstractSeries* series);
                 LegendLayout *m_layout;
                 QChart* m_chart;
                 QGraphicsItemGroup* m_items;
-                QList<LegendMarker*> m_markers;     // TODO: this will be removed
                 Qt::Alignment m_alignment;
                 QBrush m_brush;
                 QPen m_pen;

0

src/legend/qpielegendmarker.h 0 -1

             #include <QLegendMarker>
             #include <QPieSeries>
             #include <QPieSlice>
-            //#include "qpielegendmarker_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

0

src/piechart/qpieseries.cpp 0 -13

             #include "pieslicedata_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
-            #include "legendmarker_p.h"
             #include "qabstractaxis.h"
             #include "pieanimation_p.h"
                 return pie;
             }
-            QList<LegendMarker *> QPieSeriesPrivate::createLegendMarker(QLegend *legend)
-                Q_Q(QPieSeries);
-                QList<LegendMarker *> markers;
-                foreach (QPieSlice *slice, q->slices()) {
-                    PieLegendMarker* marker = new PieLegendMarker(q, slice, legend);
-                    markers << marker;
-                return markers;
             QList<QLegendMarker*> QPieSeriesPrivate::createLegendMarkers(QLegend* legend)
             {
-            //    Q_UNUSED(legend);
                 Q_Q(QPieSeries);
                 QList<QLegendMarker*> markers;
                 foreach(QPieSlice* slice, q->slices()) {

0

src/piechart/qpieseries_p.h 0 -1

                 void scaleDomain(Domain &domain);
                 ChartElement *createGraphics(ChartPresenter *presenter);
-                QList<LegendMarker *> createLegendMarker(QLegend *legend);
                 QList<QLegendMarker *> createLegendMarkers(QLegend *legend);
                 void initializeAxis(QAbstractAxis *axis);
                 QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;

0

src/qabstractseries_p.h 0 -1

                 virtual void scaleDomain(Domain &domain) = 0;
                 virtual ChartElement *createGraphics(ChartPresenter *presenter) = 0;
-                virtual QList<LegendMarker *> createLegendMarker(QLegend *legend) = 0;
                 virtual QList<QLegendMarker*> createLegendMarkers(QLegend* legend) = 0;
                 virtual void initializeAxis(QAbstractAxis *axis) = 0;
                 virtual QAbstractAxis::AxisType defaultAxisType(Qt::Orientation) const = 0;

0

src/xychart/qxyseries.cpp 0 -8

             #include "qxyseries.h"
             #include "qxyseries_p.h"
             #include "domain_p.h"
-            #include "legendmarker_p.h"
             #include "qvalueaxis.h"
             #include "qxylegendmarker.h"
                 domain.setRange(minX, maxX, minY, maxY);
             }
-            QList<LegendMarker *> QXYSeriesPrivate::createLegendMarker(QLegend *legend)
-                Q_Q(QXYSeries);
-                QList<LegendMarker *> list;
-                return list << new XYLegendMarker(q, legend);
             QList<QLegendMarker*> QXYSeriesPrivate::createLegendMarkers(QLegend* legend)
             {
                 Q_Q(QXYSeries);

0

src/xychart/qxyseries_p.h 0 -4

                 QXYSeriesPrivate(QXYSeries *q);
                 void scaleDomain(Domain &domain);
-                QList<LegendMarker *> createLegendMarker(QLegend *legend);
                 QList<QLegendMarker*> createLegendMarkers(QLegend* legend);
                 void initializeAxis(QAbstractAxis *axis);
             Q_SIGNALS:
                 void updated();
-            //    void pointReplaced(int index);
-            //    void pointRemoved(int index);
-            //    void pointAdded(int index);
             protected:
                 QVector<QPointF> m_points;

0

src/legend/legendmarker.cpp removed 0 -252

1

NO CONTENT: file was removed

0

src/legend/legendmarker_p.h removed 0 -145

1

NO CONTENT: file was removed

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages