HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r355:b889b21eeadf

QPieSlice: angle() -> startAngle(), angleSpan() -> endAngle()

Jani Honkonen -

r355:b889b21eeadf

parent child

Context file:

r355:b889b21eeadf

Collapse all files

src/piechart/piepresenter.cpp +1 -1

                 foreach (QPieSlice* s, m_series->m_slices) {
                     // calculate the farthest point in the slice from the pie center
-                    qreal centerAngle = s->angle() + (s->angleSpan() / 2);
+                    qreal centerAngle = s->m_startAngle + (s->m_angleSpan / 2);
                     qreal len = pieRadius + s->labelArmLength() + s->explodeDistance();
                     QPointF dp(qSin(centerAngle*(PI/180)) * len, -qCos(centerAngle*(PI/180)) * len);
                     QPointF p = pieRect.center() + dp;

src/piechart/pieslice.cpp +5 -5

             PieSlice::PieSlice(QGraphicsItem* parent)
                 :QGraphicsObject(parent),
                 m_slicelabel(new PieSliceLabel(this)),
-                m_angle(0),
+                m_startAngle(0),
                 m_angleSpan(0),
                 m_isExploded(false),
                 m_explodeDistance(0)
                 prepareGeometryChange();
                 // calculate center angle
-                qreal centerAngle = m_angle + (m_angleSpan/2);
+                qreal centerAngle = m_startAngle + (m_angleSpan/2);
                 // adjust rect for exploding
                 QRectF rect = m_pieRect;
                 // TODO: draw the shape so that it might have a hole in the center
                 QPainterPath path;
                 path.moveTo(rect.center());
-                path.arcTo(rect, -m_angle + 90, -m_angleSpan);
+                path.arcTo(rect, -m_startAngle + 90, -m_angleSpan);
                 path.closeSubpath();
                 m_path = path;
             {
                 // TODO: compare what has changes to avoid unneccesary geometry updates
-                m_angle = sliceData->angle();
+                m_startAngle = sliceData->startAngle();
-                m_angleSpan = sliceData->angleSpan();
+                m_angleSpan = sliceData->m_angleSpan;
                 m_isExploded = sliceData->isExploded();
                 m_explodeDistance = sliceData->explodeDistance(); // TODO: expose to public API
                 m_pen = sliceData->pen();

src/piechart/pieslice_p.h +1 -1

                 QRectF m_pieRect;
                 QPainterPath m_path;
-                qreal m_angle;
+                qreal m_startAngle;
                 qreal m_angleSpan;
                 bool m_isExploded;

src/piechart/qpieseries.cpp +2 -2

                         changed = true;
                     }
-                    if (s->m_angle != sliceAngle) {
+                    if (s->m_startAngle != sliceAngle) {
-                        s->m_angle = sliceAngle;
+                        s->m_startAngle = sliceAngle;
                         changed = true;
                     }
                     sliceAngle += sliceSpan;

src/piechart/qpieslice.cpp +7 -7

                 m_isExploded(false),
                 m_explodeDistance(DEFAULT_EXPOLODE_DISTANCE),
                 m_percentage(0),
-                m_angle(0),
+                m_startAngle(0),
                 m_angleSpan(0),
                 m_pen(DEFAULT_PEN_COLOR),
                 m_brush(DEFAULT_BRUSH_COLOR),
                 m_isExploded(false),
                 m_explodeDistance(DEFAULT_EXPOLODE_DISTANCE),
                 m_percentage(0),
-                m_angle(0),
+                m_startAngle(0),
                 m_angleSpan(0),
                 m_pen(DEFAULT_PEN_COLOR),
                 m_brush(DEFAULT_BRUSH_COLOR),
                 Updated internally after the slice is added to the series.
             */
-            qreal QPieSlice::angle() const
+            qreal QPieSlice::startAngle() const
             {
-                return m_angle;
+                return m_startAngle;
             }
             /*!
-                Returns the angle span of this slice in the series it belongs to.
+                Returns the end angle of this slice in the series it belongs to.
                 Full pie is 360 degrees where 0 degrees is at 12 a'clock.
                 Updated internally after the slice is added to the series.
             */
-            qreal QPieSlice::angleSpan() const
+            qreal QPieSlice::endAngle() const
             {
-                return m_angleSpan;
+                return m_startAngle + m_angleSpan;
             }
             /*!

src/piechart/qpieslice.h +4 -3

                 // generated data
                 qreal percentage() const;
-                qreal angle() const;
+                qreal startAngle() const;
-                qreal angleSpan() const;
+                qreal endAngle() const;
                 // customization
                 QPen pen() const;
                 // TODO: use private class
                 friend class QPieSeries;
                 friend class PiePresenter;
+                friend class PieSlice;
                 // data
                 qreal m_value;
                 // generated data
                 qreal m_percentage;
-                qreal m_angle;
+                qreal m_startAngle;
                 qreal m_angleSpan;
                 // customization

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