HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r540:7d8a0757e05d

examples/stackedbarchartdrilldown/main.cpp +1 -4

                  drilldownChart->setChartTitle(seasonSeries->title());
                  //! [6]
-                 // Disable axis, since they don't really apply to bar chart
-             //    drilldownChart->axisX()->setAxisVisible(false);
                  drilldownChart->axisX()->setGridLineVisible(false);
-             //    drilldownChart->axisX()->setLabelsVisible(false);
                  QLegend* l = drilldownChart->legend();
-                 l->handleGeometryChanged(QRectF(20,20,100,100));
+                 l->handleGeometryChanged(QRectF(50,270,300,20));
                  window.setCentralWidget(drilldownChart);
                  window.resize(400, 300);

src/chartpresenter.cpp +1 0

                  delete m_chartTheme;
                  m_chartTheme = ChartTheme::createTheme(theme);
                  m_chartTheme->decorate(m_chart);
+                 m_chartTheme->decorate(m_chart->legend());
                  resetAllElements();
              }

src/chartpresenter_p.h +2 -1

                      AxisZValue,
                      LineChartZValue,
                      ScatterSeriesZValue,
-                     PieSeriesZValue
+                     PieSeriesZValue,
+                     LegendZValue
                  };
                  ChartPresenter(QChart* chart,ChartDataSet *dataset);

src/charttheme.cpp +6 0

              #include "charttheme_p.h"
              #include "qchart.h"
+             #include "qlegend.h"
              #include "qchartaxis.h"
              #include <QTime>
                  chart->setChartBackgroundBrush(m_backgroundGradient);
              }
+             void ChartTheme::decorate(QLegend* legend)
+             {
+                 legend->setBackgroundBrush(m_backgroundGradient);
+             }
              void ChartTheme::decorate(AreaChartItem* item, QAreaSeries* series, int index)
              {
                  QPen pen;

src/charttheme_p.h +1 0

                  static ChartTheme* createTheme(QChart::ChartTheme theme);
                  QChart::ChartTheme id() const {return m_id;}
                  void decorate(QChart* chart);
+                 void decorate(QLegend* legend);
                  //void decorate(ChartItem* item, QSeries* series,int index);
                  void decorate(BarPresenter* item, QBarSeries* series, int index);
                  void decorate(StackedBarPresenter* item, QStackedBarSeries* series, int index);

src/qchart.cpp +14 -4

                  m_backgroundItem(0),
                  m_titleItem(0),
                  m_dataset(new ChartDataSet(this)),
-                 m_presenter(new ChartPresenter(this,m_dataset)),
-                 m_legend(new QLegend(this)) // TODO: is this the parent we want the legend to have?
+                 m_presenter(new ChartPresenter(this,m_dataset))
              {
+                 createLegend();
                  connect(m_dataset,SIGNAL(seriesAdded(QSeries*,Domain*)),m_legend,SLOT(handleSeriesAdded(QSeries*,Domain*)));
                  connect(m_dataset,SIGNAL(seriesRemoved(QSeries*)),m_legend,SLOT(handleSeriesRemoved(QSeries*)));
              }
                  }
              }
+             void QChart::createLegend()
+             {
+                 // TODO: Why we have null pointer, even if this is created in constructor?
+                 if(!m_legend) {
+                     m_legend = new QLegend(this);
+                     m_legend->setZValue(ChartPresenter::LegendZValue);
+                 }
+             }
              /*!
                  Returns the chart margin, which is the distance between the widget edge and the part of the chart where the actual data can be displayed.
                  \sa setMargin()
              /*!
                  Returns the legend object of the chart
              */
-             QLegend* QChart::legend() const
+             QLegend* QChart::legend()
              {
+                 createLegend();
                  return m_legend;
              }
              /*!
                  Resizes and updates the chart area using the \a event data
              */

src/qchart.h +2 -1

                  QChartAxis* axisX() const;
                  QChartAxis* axisY() const;
-                 QLegend* legend() const;
+                 QLegend* legend();
              protected:
                  void resizeEvent(QGraphicsSceneResizeEvent *event);
              private:
                  inline void createChartBackgroundItem();
                  inline void createChartTitleItem();
+                 inline void createLegend();
              private:
                  Q_DISABLE_COPY(QChart)

src/qchartview.cpp 0 -1

                  return m_chart->legend();
              }
              /*!
                  Sets animation \a options for the chart
              */

src/qlegend.cpp +23 -10

                  void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0)
                  {
-                     qDebug() << "LegendMarker::paint" << mBoundingRect;
                      painter->setBrush(mBrush);
                      painter->drawRect(mBoundingRect);
                  }
              QLegend::QLegend(QGraphicsItem *parent)
                  : QGraphicsObject(parent)
                  ,mBoundingRect(0,0,1,1)
+                 ,mBackgroundBrush(Qt::darkGray)     // TODO: from theme?
              {
              }
              void QLegend::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
              {
-                 // TODO: layout for text. using marker layout + magic for now.
+                 painter->setBrush(mBackgroundBrush);
+                 painter->drawRect(mBoundingRect);
                  foreach(LegendMarker* m, mMarkers) {
                      QRectF r = m->boundingRect();
                      painter->setPen(m->color());
-                     // TODO: r.y + r.height is incorrect. should be r.y. Find the bug, and remove the hack
-                     painter->drawText(r.x() + 20, r.y()+r.height(), m->name());
+                     painter->drawText(r.x() + 20, r.y() + r.height(), m->name());
                  }
              }
                  return mBoundingRect;
              }
+             void QLegend::setBackgroundBrush(const QBrush& brush)
+             {
+                 mBackgroundBrush = brush;
+             }
+             QBrush QLegend::backgroundBrush() const
+             {
+                 return mBackgroundBrush;
+             }
              void QLegend::handleSeriesAdded(QSeries* series,Domain* domain)
              {
                  mSeriesList.append(series);
                          marker->setBrush(s->legendEntries().at(i).mBrush);
                          marker->setName(s->legendEntries().at(i).mName);
                          mMarkers.append(marker);
-                         childItems().append(marker);
+             //            childItems().append(marker);
                      }
                  }
              }
              void QLegend::layoutChanged()
              {
                  // Calculate layout for markers and text
                  // TODO: better layout, this is just concept.
                  // Leave some space around markers like this: | x x x x |
-                 qreal steps = mMarkers.count() * 2 + 1;
+                 qreal steps = mMarkers.count();
+                 qreal xStep = mBoundingRect.width() / steps;
                  qreal yStep = mBoundingRect.height() / steps;
-                 qreal x = 0;
-                 qreal y = yStep;    // first step is empty
+                 qreal x = mBoundingRect.x() + 5;
+                 qreal y = mBoundingRect.y() + (mBoundingRect.height() - markerSize.height())/2;
                  foreach (LegendMarker* m, mMarkers) {
+                     qDebug() << "marker x:" << x;
+                     qDebug() << "marker y:" << y;
                      m->setBoundingRect(QRectF(x,y,markerSize.width(),markerSize.height()));
-                     y += yStep*2;   // 2 steps per marker (marker and empty space)
+                     x += xStep;
                  }
              }

src/qlegend.h +5 0

                  void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
                  QRectF boundingRect() const;
+                 void setBackgroundBrush(const QBrush& brush);
+                 QBrush backgroundBrush() const;
              signals:
              public slots:
                  QRectF mBoundingRect;
                  QList<QSeries*> mSeriesList;
                  QList<LegendMarker*> mMarkers;
+                 QBrush mBackgroundBrush;
              };
              QTCOMMERCIALCHART_END_NAMESPACE

	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