HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2185:7d15b2a5d252

examples/newlegend/main.cpp 0 -2

              #include <QApplication>
              #include <QMainWindow>
-             QTCOMMERCIALCHART_USE_NAMESPACE
              int main(int argc, char *argv[])
              {
                  QApplication a(argc, argv);

examples/newlegend/mainwidget.h 0 -4

                  void showLegendSpinbox();
                  void hideLegendSpinbox();
-             signals:
              public slots:
                  void toggleAttached();
                  void addSlice();
                  void fontSizeChanged();
                  void updateLegendLayout();
                  void handleMarkerClicked();
              private:
                  QChart *m_chart;

src/areachart/qareaseries.cpp 0 -1

              #include "chartdataset_p.h"
              #include "charttheme_p.h"
              #include "qvalueaxis.h"
              #include "qarealegendmarker.h"
              QTCOMMERCIALCHART_BEGIN_NAMESPACE

src/barchart/qabstractbarseries.cpp 0 -1

              #include "charttheme_p.h"
              #include "qvalueaxis.h"
              #include "qbarcategoryaxis.h"
              #include "qbarlegendmarker.h"
              QTCOMMERCIALCHART_BEGIN_NAMESPACE

src/legend/legendlayout.cpp +8 -8

                  QSizeF size(0, 0);
-                 if (m_legend->d_ptr->legendMarkers().isEmpty()) {
+                 if (m_legend->d_ptr->markers().isEmpty()) {
                      return;
                  }
                  case Qt::AlignTop:
                  case Qt::AlignBottom: {
                          QPointF point(0,0);
-                         foreach (QLegendMarker* marker, m_legend->d_ptr->legendMarkers()) {
+                         foreach (QLegendMarker* marker, m_legend->d_ptr->markers()) {
                              LegendMarkerItem* item = marker->d_ptr->item();
                              if (item->isVisible()) {
                                  item->setGeometry(geometry);
                  case Qt::AlignLeft:
                  case Qt::AlignRight: {
                          QPointF point(0,0);
-                         foreach (QLegendMarker* marker, m_legend->d_ptr->legendMarkers()) {
+                         foreach (QLegendMarker* marker, m_legend->d_ptr->markers()) {
                              LegendMarkerItem* item = marker->d_ptr->item();
                              if (item->isVisible()) {
                                  item->setGeometry(geometry);
                  QSizeF size(0, 0);
-                 QList<QLegendMarker *> markers = m_legend->d_ptr->legendMarkers();
+                 QList<QLegendMarker *> markers = m_legend->d_ptr->markers();
                  if (markers.isEmpty())
                      return;
                  getContentsMargins(&left, &top, &right, &bottom);
                  if(constraint.isValid()) {
-                     foreach(QLegendMarker* marker, m_legend->d_ptr->legendMarkers()) {
+                     foreach(QLegendMarker* marker, m_legend->d_ptr->markers()) {
                          LegendMarkerItem *item = marker->d_ptr->item();
                          size = size.expandedTo(item->effectiveSizeHint(which));
                      }
                  else if (constraint.width() >= 0) {
                      qreal width = 0;
                      qreal height = 0;
-                     foreach(QLegendMarker* marker, m_legend->d_ptr->legendMarkers()) {
+                     foreach(QLegendMarker* marker, m_legend->d_ptr->markers()) {
                          LegendMarkerItem *item = marker->d_ptr->item();
                          width+=item->effectiveSizeHint(which).width();
                          height=qMax(height,item->effectiveSizeHint(which).height());
                  else if (constraint.height() >= 0) {
                      qreal width = 0;
                      qreal height = 0;
-                     foreach(QLegendMarker* marker, m_legend->d_ptr->legendMarkers()) {
+                     foreach(QLegendMarker* marker, m_legend->d_ptr->markers()) {
                          LegendMarkerItem *item = marker->d_ptr->item();
                          width=qMax(width,item->effectiveSizeHint(which).width());
                          height+=height,item->effectiveSizeHint(which).height();
                      size = QSizeF(width,qMin(constraint.height(),height));
                  }
                  else {
-                     foreach(QLegendMarker* marker, m_legend->d_ptr->legendMarkers()) {
+                     foreach(QLegendMarker* marker, m_legend->d_ptr->markers()) {
                          LegendMarkerItem *item = marker->d_ptr->item();
                          size = size.expandedTo(item->effectiveSizeHint(which));
                      }

src/legend/qarealegendmarker.cpp 0 -2

              QAreaLegendMarkerPrivate::~QAreaLegendMarkerPrivate()
              {
-                 QObject::disconnect(m_series->d_func(),SIGNAL(updated()), this, SLOT(updated()));
-                 QObject::disconnect(m_series, SIGNAL(nameChanged()), this, SLOT(updated()));
              }
              QAreaSeries* QAreaLegendMarkerPrivate::series()

src/legend/qbarlegendmarker.cpp 0 -3

              QBarLegendMarkerPrivate::~QBarLegendMarkerPrivate()
              {
-                 QObject::disconnect(m_barset, SIGNAL(labelChanged()), this, SLOT(updated()));
-                 QObject::disconnect(m_barset, SIGNAL(brushChanged()), this, SLOT(updated()));
-                 QObject::disconnect(m_barset, SIGNAL(penChanged()), this, SLOT(updated()));
              }
              QAbstractBarSeries* QBarLegendMarkerPrivate::series()

src/legend/qbarlegendmarker_p.h +1 -1

                  QAbstractBarSeries* m_series;
                  QBarSet* m_barset;
-                 friend class QLegendPrivate; // TODO: Is this needed?
+                 friend class QLegendPrivate;
                  Q_DECLARE_PUBLIC(QBarLegendMarker)
              };

src/legend/qlegend.cpp +13 -15

                  if (d_ptr->m_font != font)
                      d_ptr->m_font = font;
-                 foreach (QLegendMarker *marker, d_ptr->legendMarkers()) {
+                 foreach (QLegendMarker *marker, d_ptr->markers()) {
                      marker->setFont(d_ptr->m_font);
+                 }
-                     layout()->invalidate();
-                     emit fontChanged(font);
                  }
+             }
              QFont QLegend::font() const
              {
              {
                  if (d_ptr->m_labelBrush != brush) {
                      d_ptr->m_labelBrush = brush;
-                     foreach (QLegendMarker *marker, d_ptr->legendMarkers()) {
+                     foreach (QLegendMarker *marker, d_ptr->markers()) {
                          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
                  return d_ptr->m_backgroundVisible;
              }
              QList<QLegendMarker*> QLegend::markers() const
              {
-                 // TODO: name of PIMPL method will change.
-                 return d_ptr->legendMarkers();
+                 return d_ptr->markers();
              }
-             void QLegend::appendSeries(QAbstractSeries* series)
+             void QLegend::addSeries(QAbstractSeries* series)
              {
-                 d_ptr->appendSeries(series);
+                 d_ptr->addSeries(series);
              }
              void QLegend::removeSeries(QAbstractSeries* series)
                  return 100 * m_diameter / int(size);
              }
-             void QLegendPrivate::appendSeries(QAbstractSeries* series)
+             void QLegendPrivate::addSeries(QAbstractSeries* series)
              {
                  // Only allow one instance of series
                  if (m_series.contains(series)) {
                  // Find out, which markers to remove
                  QList<QLegendMarker *> removed;
-                 foreach (QLegendMarker *m, m_legendMarkers) {
+                 foreach (QLegendMarker *m, m_markers) {
                      if (m->series() == series) {
                          removed << m;
                      }
              {
                  // Moved to appendSeries
                  // This slot is just to make old code work for now.
-                 appendSeries(series);
+                 addSeries(series);
              }
              void QLegendPrivate::handleSeriesRemoved(QAbstractSeries *series)
                  QAbstractSeries *series = qobject_cast<QAbstractSeries *> (sender());
                  Q_ASSERT(series);
-                 foreach (QLegendMarker* marker, m_legendMarkers) {
+                 foreach (QLegendMarker* marker, m_markers) {
                      if (marker->series() == series) {
                          marker->setVisible(series->isVisible());
                      }
                  // Find out removed markers and created markers
                  QList<QLegendMarker *> removedMarkers;
-                 foreach (QLegendMarker *oldMarker, m_legendMarkers) {
+                 foreach (QLegendMarker *oldMarker, m_markers) {
                      // we have marker, which is related to sender.
                      if (oldMarker->series() == series) {
                          bool found = false;
              {
                  foreach (QLegendMarker* marker, markers) {
                      m_items->addToGroup(marker->d_ptr.data()->item());
-                     m_legendMarkers << marker;
+                     m_markers << marker;
                  }
              }
                      marker->d_ptr->item()->setVisible(false);
                      m_items->removeFromGroup(marker->d_ptr->item());
                      delete marker;
-                     m_legendMarkers.removeOne(marker);
+                     m_markers.removeOne(marker);
                  }
              }

src/legend/qlegend.h +1 -1

                  // New stuff:
                  QList <QLegendMarker*> markers() const;
-                 void appendSeries(QAbstractSeries* series);
+                 void addSeries(QAbstractSeries* series);
                  void removeSeries(QAbstractSeries* series);
              protected:

src/legend/qlegend_p.h +3 -3

                  QGraphicsItemGroup* items() { return m_items; }
                  // New stuff:
-                 QList<QLegendMarker*> legendMarkers() { return m_legendMarkers; }
-                 void appendSeries(QAbstractSeries* series);
+                 QList<QLegendMarker*> markers() { return m_markers; }
+                 void addSeries(QAbstractSeries* series);
                  void removeSeries(QAbstractSeries* series);
              public Q_SLOTS:
                  friend class QLegend;
                  friend class LegendLayout;
-                 QList<QLegendMarker*> m_legendMarkers;  // TODO: rename to m_markers eventually.
+                 QList<QLegendMarker*> m_markers;
                  QList<QAbstractSeries*> m_series;
                  friend class QLegend;

src/legend/qpielegendmarker.cpp 0 -3

              QPieLegendMarkerPrivate::~QPieLegendMarkerPrivate()
              {
-                 QObject::disconnect(m_slice, SIGNAL(labelChanged()), this, SLOT(updated()));
-                 QObject::disconnect(m_slice, SIGNAL(brushChanged()), this, SLOT(updated()));
-                 QObject::disconnect(m_slice, SIGNAL(penChanged()), this, SLOT(updated()));
              }
              QPieSeries* QPieLegendMarkerPrivate::series()

src/legend/qxylegendmarker.cpp 0 -2

              QXYLegendMarkerPrivate::~QXYLegendMarkerPrivate()
              {
-                 QObject::disconnect(m_series->d_func(), SIGNAL(updated()), this, SLOT(updated()));
-                 QObject::disconnect(m_series, SIGNAL(nameChanged()), this, SLOT(updated()));
              }
              QAbstractSeries* QXYLegendMarkerPrivate::series()

	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