HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r469:bfbe6f34c25e

Renaming pen & brush functions for pie and adding const

Jani Honkonen -

r469:bfbe6f34c25e

parent child

Context file:

r469:bfbe6f34c25e

Collapse all files

example/piechartcustomization/main.cpp +3 -3

                 void handleHoverEnter()
                 {
-                    QBrush brush = this->brush();
+                    QBrush brush = this->sliceBrush();
                     m_originalBrush = brush;
                     brush.setColor(brush.color().lighter());
-                    setBrush(brush);
+                    setSliceBrush(brush);
                 }
                 void handleHoverLeave()
                 {
-                    setBrush(m_originalBrush);
+                    setSliceBrush(m_originalBrush);
                 }
             private:

src/charttheme.cpp +2 -2

                 // finally update colors
                 foreach (QPieSlice* s, series->slices()) {
                     QColor c = colors.takeFirst();
-                    s->setPen(c);
+                    s->setSlicePen(c);
-                    s->setBrush(c);
+                    s->setSliceBrush(c);
                 }
             }

src/piechart/pieslice.cpp +5 -5

                 painter->setClipRect(parentItem()->boundingRect());
                 painter->save();
-                painter->setPen(m_pen);
+                painter->setPen(m_slicePen);
-                painter->setBrush(m_brush);
+                painter->setBrush(m_sliceBrush);
                 painter->drawPath(m_slicePath);
                 painter->restore();
                 m_angleSpan = sliceData->m_angleSpan;
                 m_isExploded = sliceData->isExploded();
                 m_explodeDistanceFactor = sliceData->explodeDistanceFactor();
-                m_pen = sliceData->pen();
+                m_slicePen = sliceData->slicePen();
-                m_brush = sliceData->brush();
+                m_sliceBrush = sliceData->sliceBrush();
                 m_labelVisible = sliceData->isLabelVisible();
                 m_labelText = sliceData->label();
                 m_labelFont = sliceData->labelFont();
                 m_labelArmLengthFactor = sliceData->labelArmLengthFactor();
-                m_labelArmPen = sliceData->labelPen();
+                m_labelArmPen = sliceData->labelArmPen();
                 updateGeometry();
                 update();

src/piechart/pieslice_p.h +2 -2

                 bool m_isExploded;
                 qreal m_explodeDistanceFactor;
                 bool m_labelVisible;
-                QPen m_pen;
+                QPen m_slicePen;
-                QBrush m_brush;
+                QBrush m_sliceBrush;
                 QPainterPath m_labelArmPath;
                 qreal m_labelArmLengthFactor;

src/piechart/qpieslice.cpp +30 -30

                 m_percentage(0),
                 m_startAngle(0),
                 m_angleSpan(0),
-                m_pen(DEFAULT_PEN_COLOR),
+                m_slicePen(DEFAULT_PEN_COLOR),
-                m_brush(DEFAULT_BRUSH_COLOR),
+                m_sliceBrush(DEFAULT_BRUSH_COLOR),
-                m_labelPen(DEFAULT_PEN_COLOR),
+                m_labelArmPen(DEFAULT_PEN_COLOR),
                 m_labelArmLengthFactor(DEFAULT_LABEL_ARM_LENGTH_FACTOR)
             {
                 m_percentage(0),
                 m_startAngle(0),
                 m_angleSpan(0),
-                m_pen(DEFAULT_PEN_COLOR),
+                m_slicePen(DEFAULT_PEN_COLOR),
-                m_brush(DEFAULT_BRUSH_COLOR),
+                m_sliceBrush(DEFAULT_BRUSH_COLOR),
-                m_labelPen(DEFAULT_PEN_COLOR),
+                m_labelArmPen(DEFAULT_PEN_COLOR),
                 m_labelArmLengthFactor(DEFAULT_LABEL_ARM_LENGTH_FACTOR)
             {
             /*!
                 Returns the pen used to draw this slice.
-                \sa setPen()
+                \sa setSlicePen()
             */
-            QPen QPieSlice::pen() const
+            QPen QPieSlice::slicePen() const
             {
-                return m_pen;
+                return m_slicePen;
             }
             /*!
                 Returns the brush used to draw this slice.
-                \sa setBrush()
+                \sa setSliceBrush()
             */
-            QBrush QPieSlice::brush() const
+            QBrush QPieSlice::sliceBrush() const
             {
-                return m_brush;
+                return m_sliceBrush;
             }
             /*!
-                Returns the pen used to draw label in this slice.
+                Returns the pen used to draw label arm in this slice.
-                \sa setLabelPen()
+                \sa setLabelArmPen()
             */
-            QPen QPieSlice::labelPen() const
+            QPen QPieSlice::labelArmPen() const
             {
-                return m_labelPen;
+                return m_labelArmPen;
             }
             /*!
             /*!
                 Sets the \a pen used to draw this slice.
                 Note that applying a theme will override this.
-                \sa pen()
+                \sa slicePen()
             */
-            void QPieSlice::setPen(QPen pen)
+            void QPieSlice::setSlicePen(const QPen &pen)
             {
-                if (m_pen != pen) {
+                if (m_slicePen != pen) {
-                    m_pen = pen;
+                    m_slicePen = pen;
                     emit changed();
                 }
             }
             /*!
                 Sets the \a brush used to draw this slice.
                 Note that applying a theme will override this.
-                \sa brush()
+                \sa sliceBrush()
             */
-            void QPieSlice::setBrush(QBrush brush)
+            void QPieSlice::setSliceBrush(const QBrush &brush)
             {
-                if (m_brush != brush) {
+                if (m_sliceBrush != brush) {
-                    m_brush = brush;
+                    m_sliceBrush = brush;
                     emit changed();
                 }
             }
             /*!
-                Sets the \a pen used to draw the label in this slice.
+                Sets the \a pen used to draw the label arm in this slice.
                 Note that applying a theme will override this.
-                \sa labelPen()
+                \sa labelArmPen()
             */
-            void QPieSlice::setLabelPen(QPen pen)
+            void QPieSlice::setLabelArmPen(const QPen &pen)
             {
-                if (m_labelPen != pen) {
+                if (m_labelArmPen != pen) {
-                    m_labelPen = pen;
+                    m_labelArmPen = pen;
                     emit changed();
                 }
             }
                 Note that applying a theme will override this.
                 \sa labelFont()
             */
-            void QPieSlice::setLabelFont(QFont font)
+            void QPieSlice::setLabelFont(const QFont &font)
             {
                 if (m_labelFont != font) {
                     m_labelFont = font;

src/piechart/qpieslice.h +10 -10

                 qreal endAngle() const;
                 // customization
-                void setPen(QPen pen);
+                void setSlicePen(const QPen &pen);
-                QPen pen() const;
+                QPen slicePen() const;
-                void setBrush(QBrush brush);
+                void setSliceBrush(const QBrush &brush);
-                QBrush brush() const;
+                QBrush sliceBrush() const;
-                void setLabelPen(QPen pen);
+                void setLabelArmPen(const QPen &pen);
-                QPen labelPen() const;
+                QPen labelArmPen() const;
-                void setLabelFont(QFont font);
+                void setLabelFont(const QFont &font);
                 QFont labelFont() const;
                 void setLabelArmLengthFactor(qreal factor);
                 qreal labelArmLengthFactor() const;
                 qreal m_angleSpan;
                 // customization
-                QPen m_pen;
+                QPen m_slicePen;
-                QBrush m_brush;
+                QBrush m_sliceBrush;
-                QPen m_labelPen;
                 QFont m_labelFont;
+                QPen m_labelArmPen;
                 qreal m_labelArmLengthFactor;
             };

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