HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r673:e6252af95451

rename PieSlice -> PieSliceItem

Jani Honkonen -

r673:e6252af95451

parent child

Context file:

r673:e6252af95451

Collapse all files

src/piechart/piechart.pri +2 -2

             SOURCES += \
                 $$PWD/qpieseries.cpp \
-                $$PWD/pieslice.cpp \
+                $$PWD/piesliceitem.cpp \
                 $$PWD/piechartitem.cpp \
                 $$PWD/qpieslice.cpp
             PRIVATE_HEADERS += \
                 $$PWD/piechartitem_p.h \
-                $$PWD/pieslice_p.h \
+                $$PWD/piesliceitem_p.h \
                 $$PWD/qpiesliceprivate_p.h \
                 $$PWD/qpieseriesprivate_p.h

src/piechart/piechartitem.cpp +17 -17

             #include "piechartitem_p.h"
-            #include "pieslice_p.h"
+            #include "piesliceitem_p.h"
             #include "qpieslice.h"
             #include "qpiesliceprivate_p.h"
             #include "qpieseries.h"
                 m_presenter->theme()->decorate(m_series, m_presenter->dataSet()->seriesIndex(m_series));
                 foreach (QPieSlice *s, slices) {
-                    PieSlice* slice = new PieSlice(this);
+                    PieSliceItem* item = new PieSliceItem(this);
-                    m_slices.insert(s, slice);
+                    m_slices.insert(s, item);
                     connect(s, SIGNAL(changed()), this, SLOT(handleSliceChanged()));
-                    connect(slice, SIGNAL(clicked()), s, SIGNAL(clicked()));
+                    connect(item, SIGNAL(clicked()), s, SIGNAL(clicked()));
-                    connect(slice, SIGNAL(hoverEnter()), s, SIGNAL(hoverEnter()));
+                    connect(item, SIGNAL(hoverEnter()), s, SIGNAL(hoverEnter()));
-                    connect(slice, SIGNAL(hoverLeave()), s, SIGNAL(hoverLeave()));
+                    connect(item, SIGNAL(hoverLeave()), s, SIGNAL(hoverLeave()));
                     PieSliceData data = sliceData(s);
             PieSliceData PieChartItem::sliceData(QPieSlice *slice)
             {
                 PieSliceData sliceData = slice->d_ptr->m_data;
-                sliceData.m_center = PieSlice::sliceCenter(m_pieCenter, m_pieRadius, slice);
+                sliceData.m_center = PieSliceItem::sliceCenter(m_pieCenter, m_pieRadius, slice);
                 sliceData.m_radius = m_pieRadius;
                 sliceData.m_angleSpan = slice->endAngle() - slice->startAngle();
                 return sliceData;
             void PieChartItem::setLayout(const PieLayout &layout)
             {
                 foreach (QPieSlice *slice, layout.keys()) {
-                    PieSlice *s = m_slices.value(slice);
+                    PieSliceItem *item = m_slices.value(slice);
-                    Q_ASSERT(s);
+                    Q_ASSERT(item);
-                    s->setSliceData(layout.value(slice));
+                    item->setSliceData(layout.value(slice));
-                    s->updateGeometry();
+                    item->updateGeometry();
-                    s->update();
+                    item->update();
                 }
             }
             void PieChartItem::setLayout(QPieSlice *slice, const PieSliceData &sliceData)
             {
                 // find slice
-                PieSlice *s = m_slices.value(slice);
+                PieSliceItem *item = m_slices.value(slice);
-                Q_ASSERT(s);
+                Q_ASSERT(item);
-                s->setSliceData(sliceData);
+                item->setSliceData(sliceData);
-                s->updateGeometry();
+                item->updateGeometry();
-                s->update();
+                item->update();
             }
             void PieChartItem::destroySlice(QPieSlice *slice)

src/piechart/piechartitem_p.h +3 -3

             #include "qpieseries.h"
             #include "chartitem_p.h"
-            #include "pieslice_p.h"
+            #include "piesliceitem_p.h"
             class QGraphicsItem;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 void destroySlice(QPieSlice *slice);
             private:
-                friend class PieSlice;
+                friend class PieSliceItem;
-                QHash<QPieSlice*, PieSlice*> m_slices;
+                QHash<QPieSlice*, PieSliceItem*> m_slices;
                 QPieSeries *m_series;
                 QRectF m_rect;
                 QPointF m_pieCenter;

src/piechart/piesliceitem.cpp ~~src/piechart/pieslice.cpp~~ renamed +16 -16

-            #include "pieslice_p.h"
+            #include "piesliceitem_p.h"
             #include "piechartitem_p.h"
             #include "qpieseries.h"
             #include "qpieslice.h"
                 return QPointF(dx, -dy);
             }
-            PieSlice::PieSlice(QGraphicsItem* parent)
+            PieSliceItem::PieSliceItem(QGraphicsItem* parent)
                 :QGraphicsObject(parent)
             {
                 setAcceptHoverEvents(true);
                 setZValue(ChartPresenter::PieSeriesZValue);
             }
-            PieSlice::~PieSlice()
+            PieSliceItem::~PieSliceItem()
             {
             }
-            QRectF PieSlice::boundingRect() const
+            QRectF PieSliceItem::boundingRect() const
             {
                 return m_boundingRect;
             }
-            QPainterPath PieSlice::shape() const
+            QPainterPath PieSliceItem::shape() const
             {
                 // Don't include the label and label arm.
                 // This is used to detect a mouse clicks. We do not want clicks from label.
                 return m_slicePath;
             }
-            void PieSlice::paint(QPainter* painter, const QStyleOptionGraphicsItem* /*option*/, QWidget* /*widget*/)
+            void PieSliceItem::paint(QPainter* painter, const QStyleOptionGraphicsItem* /*option*/, QWidget* /*widget*/)
             {
                 painter->setClipRect(parentItem()->boundingRect());
                 }
             }
-            void PieSlice::hoverEnterEvent(QGraphicsSceneHoverEvent* /*event*/)
+            void PieSliceItem::hoverEnterEvent(QGraphicsSceneHoverEvent* /*event*/)
             {
                 emit hoverEnter();
             }
-            void PieSlice::hoverLeaveEvent(QGraphicsSceneHoverEvent* /*event*/)
+            void PieSliceItem::hoverLeaveEvent(QGraphicsSceneHoverEvent* /*event*/)
             {
                 emit hoverLeave();
             }
-            void PieSlice::mousePressEvent(QGraphicsSceneMouseEvent* /*event*/)
+            void PieSliceItem::mousePressEvent(QGraphicsSceneMouseEvent* /*event*/)
             {
                 emit clicked();
             }
-            void PieSlice::setSliceData(PieSliceData sliceData)
+            void PieSliceItem::setSliceData(PieSliceData sliceData)
             {
                 m_data = sliceData;
             }
-            void PieSlice::updateGeometry()
+            void PieSliceItem::updateGeometry()
             {
                 if (m_data.m_radius <= 0)
                     return;
                 m_boundingRect = m_slicePath.boundingRect().united(m_labelArmPath.boundingRect()).united(m_labelTextRect);
             }
-            QPointF PieSlice::sliceCenter(QPointF point, qreal radius, QPieSlice *slice)
+            QPointF PieSliceItem::sliceCenter(QPointF point, qreal radius, QPieSlice *slice)
             {
                 if (slice->isExploded()) {
                     qreal centerAngle = slice->startAngle() + ((slice->endAngle() - slice->startAngle())/2);
                 return point;
             }
-            QPainterPath PieSlice::slicePath(QPointF center, qreal radius, qreal startAngle, qreal angleSpan, qreal* centerAngle, QPointF* armStart)
+            QPainterPath PieSliceItem::slicePath(QPointF center, qreal radius, qreal startAngle, qreal angleSpan, qreal* centerAngle, QPointF* armStart)
             {
                 // calculate center angle
                 *centerAngle = startAngle + (angleSpan/2);
                 return path;
             }
-            QPainterPath PieSlice::labelArmPath(QPointF start, qreal angle, qreal length, qreal textWidth, QPointF* textStart)
+            QPainterPath PieSliceItem::labelArmPath(QPointF start, qreal angle, qreal length, qreal textWidth, QPointF* textStart)
             {
                 qreal dx = qSin(angle*(PI/180)) * length;
                 qreal dy = -qCos(angle*(PI/180)) * length;
                 return path;
             }
-            QRectF PieSlice::labelTextRect(QFont font, QString text)
+            QRectF PieSliceItem::labelTextRect(QFont font, QString text)
             {
                 QFontMetricsF fm(font);
                 return fm.boundingRect(text);
             }
-            #include "moc_pieslice_p.cpp"
+            #include "moc_piesliceitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/piesliceitem_p.h ~~src/piechart/pieslice_p.h~~ renamed +6 -6

-            #ifndef PIESLICE_H
+            #ifndef PIESLICEITEM_H
-            #define PIESLICE_H
+            #define PIESLICEITEM_H
             #include "qchartglobal.h"
             #include "charttheme_p.h"
             class PieSliceLabel;
             class QPieSlice;
-            class PieSlice : public QGraphicsObject
+            class PieSliceItem : public QGraphicsObject
             {
                 Q_OBJECT
             public:
-                PieSlice(QGraphicsItem* parent = 0);
+                PieSliceItem(QGraphicsItem* parent = 0);
-                ~PieSlice();
+                ~PieSliceItem();
             public: // from QGraphicsItem
                 QRectF boundingRect() const;
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // PIESLICE_H
+            #endif // PIESLICEITEM_H

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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