HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r568:9b365faaa041

src/chartpresenter.cpp +2 -2

              #include "stackedbarpresenter_p.h"
              #include "percentbarpresenter_p.h"
              #include "linechartitem_p.h"
-             #include "piepresenter_p.h"
+             #include "piechartitem_p.h"
              #include "scatterchartitem_p.h"
              #include "splinechartitem_p.h"
                  case QSeries::SeriesTypePie: {
                      QPieSeries *pieSeries = static_cast<QPieSeries *>(series);
-                     PiePresenter* pie = new PiePresenter(m_chart, pieSeries);
+                     PieChartItem* pie = new PieChartItem(m_chart, pieSeries);
                      if(m_options.testFlag(QChart::SeriesAnimations)) {
                         // m_animator->addAnimation(pie);
                      }

src/charttheme.cpp +2 -2

              #include "linechartitem_p.h"
              #include "areachartitem_p.h"
              #include "scatterchartitem_p.h"
-             #include "piepresenter_p.h"
+             #include "piechartitem_p.h"
              #include "splinechartitem_p.h"
              //themes
                  }
              }
-             void ChartTheme::decorate(PiePresenter* item, QPieSeries* series, int index)
+             void ChartTheme::decorate(PieChartItem* item, QPieSeries* series, int index)
              {
                  // Get color for a slice from a gradient linearly, beginning from the start of the gradient
                  for (int i(0); i < series->slices().count(); i++) {

src/charttheme_p.h +2 -2

              class PercentBarPresenter;
              class QScatterSeries;
              class ScatterChartItem;
-             class PiePresenter;
+             class PieChartItem;
              class QPieSeries;
              class SplineChartItem;
              class QSplineSeries;
                  void decorate(QLineSeries* series, int index);
                  void decorate(QAreaSeries* series, int index);
                  void decorate(QScatterSeries* series, int index);
-                 void decorate(PiePresenter* item, QPieSeries* series, int index);
+                 void decorate(PieChartItem* item, QPieSeries* series, int index);
                  void decorate(QSplineSeries* series, int index);
                  void decorate(QChartAxis* axis, bool axisX);

src/piechart/piechart.pri +2 -2

              SOURCES += \
                  $$PWD/qpieseries.cpp \
                  $$PWD/pieslice.cpp \
-                 $$PWD/piepresenter.cpp \
+                 $$PWD/piechartitem.cpp \
                  $$PWD/qpieslice.cpp
              PRIVATE_HEADERS += \
-                 $$PWD/piepresenter_p.h \
+                 $$PWD/piechartitem_p.h \
                  $$PWD/pieslice_p.h \
              PUBLIC_HEADERS += \

src/piechart/piechartitem.cpp ~~src/piechart/piepresenter.cpp~~ renamed +12 -12

-             #include "piepresenter_p.h"
+             #include "piechartitem_p.h"
              #include "pieslice_p.h"
              #include "qpieslice.h"
              #include "qpieseries.h"
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
-             PiePresenter::PiePresenter(QGraphicsItem *parent, QPieSeries *series)
+             PieChartItem::PieChartItem(QGraphicsItem *parent, QPieSeries *series)
                  :ChartItem(parent),
                  m_series(series)
              {
                  setZValue(ChartPresenter::PieSeriesZValue);
              }
-             PiePresenter::~PiePresenter()
+             PieChartItem::~PieChartItem()
              {
                  // slices deleted automatically through QGraphicsItem
              }
-             void PiePresenter::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
+             void PieChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
              {
                  // TODO: paint shadows for all components
                  // - get paths from items & merge & offset and draw with shadow color?
                  //painter->drawRect(m_debugRect);
              }
-             void PiePresenter::handleSeriesChanged()
+             void PieChartItem::handleSeriesChanged()
              {
                  QVector<PieSliceLayout> sliceLayout = calculateLayout();
                  applyLayout(sliceLayout);
                  update();
              }
-             void PiePresenter::handleSliceChanged()
+             void PieChartItem::handleSliceChanged()
              {
                  // TODO: optimize don't need to handle all slices
                  QVector<PieSliceLayout> sliceLayout = calculateLayout();
                  update();
              }
-             void PiePresenter::handleDomainChanged(qreal, qreal, qreal, qreal)
+             void PieChartItem::handleDomainChanged(qreal, qreal, qreal, qreal)
              {
                  // TODO
              }
-             void PiePresenter::handleGeometryChanged(const QRectF& rect)
+             void PieChartItem::handleGeometryChanged(const QRectF& rect)
              {
                  prepareGeometryChange();
                  m_rect = rect;
              }
-             QVector<PieSliceLayout> PiePresenter::calculateLayout()
+             QVector<PieSliceLayout> PieChartItem::calculateLayout()
              {
                  // find pie center coordinates
                  QPointF center;
                  return layout;
              }
-             void PiePresenter::applyLayout(const QVector<PieSliceLayout> &layout)
+             void PieChartItem::applyLayout(const QVector<PieSliceLayout> &layout)
              {
                  //if(m_animator)
                  //        m_animator->applyLayout(this,points);
                  setLayout(layout);
              }
-             void PiePresenter::setLayout(const QVector<PieSliceLayout> &layout)
+             void PieChartItem::setLayout(const QVector<PieSliceLayout> &layout)
              {
                  foreach (PieSliceLayout l, layout) {
                  }
              }
-             #include "moc_piepresenter_p.cpp"
+             #include "moc_piechartitem_p.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/piechartitem_p.h ~~src/piechart/piepresenter_p.h~~ renamed +6 -6

-             #ifndef PIEPRESENTER_H
-             #define PIEPRESENTER_H
+             #ifndef PIECHARTITEM_H
+             #define PIECHARTITEM_H
              #include "qpieseries.h"
              #include "chartitem_p.h"
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              class QPieSlice;
-             class PiePresenter : public QObject, public ChartItem
+             class PieChartItem : public QObject, public ChartItem
              {
                  Q_OBJECT
              public:
                  // TODO: use a generic data class instead of x and y
-                 PiePresenter(QGraphicsItem *parent, QPieSeries *series);
-                 ~PiePresenter();
+                 PieChartItem(QGraphicsItem *parent, QPieSeries *series);
+                 ~PieChartItem();
              public: // from QGraphicsItem
                  QRectF boundingRect() const { return m_rect; }
              QTCOMMERCIALCHART_END_NAMESPACE
-             #endif // PIEPRESENTER_H
+             #endif // PIECHARTITEM_H

src/piechart/pieslice.cpp +1 -1

              #include "pieslice_p.h"
-             #include "piepresenter_p.h"
+             #include "piechartitem_p.h"
              #include "qpieseries.h"
              #include "qpieslice.h"
              #include "chartpresenter_p.h"

src/piechart/pieslice_p.h +1 -1

              #define PIESLICE_LABEL_GAP 5
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
-             class PiePresenter;
+             class PieChartItem;
              class PieSliceLabel;
              class QPieSlice;

src/piechart/qpieseries.h +2 -2

              class QGraphicsObject;
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
-             class PiePresenter;
+             class PieChartItem;
              class PieSlice;
              class QPieSlice;
                  Q_DISABLE_COPY(QPieSeries)
                  // TODO: use PIML
-                 friend class PiePresenter;
+                 friend class PieChartItem;
                  friend class PieSlice;
                  QList<QPieSlice*> m_slices;

src/piechart/qpieslice.h +1 -1

                  // TODO: use private class
                  friend class QPieSeries;
-                 friend class PiePresenter;
+                 friend class PieChartItem;
                  friend class PieSlice;
                  // data

	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