HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r818:5bf1dbd3a89a

Refactoring QPieSlice private implementation. Removes the useless QPieSlicePrivate layer and uses PieSliceData directly.

Jani Honkonen -

r818:5bf1dbd3a89a

parent child

Context file:

r818:5bf1dbd3a89a

Collapse all files

src/charttheme.cpp +6 -5

             void ChartTheme::decorate(QPieSeries* series, int index, bool force)
             {
                 for (int i(0); i < series->slices().count(); i++) {
                     QColor penColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), 0.0);
                     qreal pos = (qreal) (i + 1) / (qreal) series->count();
                     QColor brushColor = colorAt(m_seriesGradients.at(index % m_seriesGradients.size()), pos);
-                    QPieSlice::DataPtr s = series->slices().at(i)->data_ptr();
+                    QPieSlice *s = series->slices().at(i);
-                    PieSliceData data = s->m_data;
+                    PieSliceData data = *s->data_ptr();
                     if (data.m_slicePen.isThemed() || force) {
                         data.m_slicePen = penColor;
                         data.m_labelFont.setThemed(true);
                     }
-                    if (s->m_data != data) {
+                    if (*s->data_ptr() != data) {
-                        s->m_data = data;
+                        *s->data_ptr() = data;
-                        emit s->changed();
+                        emit s->data_ptr()->emitChangedSignal(s);
                     }
                 }
             }

src/piechart/piechart.pri 0 -1

                 $$PWD/pieslicedata_p.h \
                 $$PWD/piechartitem_p.h \
                 $$PWD/piesliceitem_p.h \
-                $$PWD/qpiesliceprivate_p.h \
                 $$PWD/qpieseriesprivate_p.h
             PUBLIC_HEADERS += \

src/piechart/piechartitem.cpp +2 -2

             #include "piechartitem_p.h"
             #include "piesliceitem_p.h"
             #include "qpieslice.h"
-            #include "qpiesliceprivate_p.h"
             #include "qpieseries.h"
             #include "chartpresenter_p.h"
             #include "chartdataset_p.h"
             PieSliceData PieChartItem::sliceData(QPieSlice *slice)
             {
-                PieSliceData sliceData = slice->data_ptr()->m_data;
+            	// TODO: This function is kid of useless now. Refactor.
+                PieSliceData sliceData = *slice->data_ptr();
                 sliceData.m_center = PieSliceItem::sliceCenter(m_pieCenter, m_pieRadius, slice);
                 sliceData.m_radius = m_pieRadius;
                 return sliceData;

src/piechart/pieslicedata_p.h +7 -1

             #ifndef PIESLICEDATA_P_H
             #define PIESLICEDATA_P_H
-            #include <qchartglobal.h>
+            #include "qchartglobal.h"
+            #include "qpieslice.h"
             #include <QPen>
             #include <QBrush>
             #include <QDebug>
                     return false;
                 }
+                void emitChangedSignal(QPieSlice *s)
+                {
+                    emit s->changed();
+                }
                 qreal m_value;
                 Themed<QPen> m_slicePen;

src/piechart/piesliceitem_p.h +1 -1

             #include "qchartglobal.h"
             #include "charttheme_p.h"
             #include "qpieseries.h"
-            #include "qpiesliceprivate_p.h"
+            #include "pieslicedata_p.h"
             #include <QGraphicsItem>
             #include <QRectF>
             #include <QColor>

src/piechart/qpieseries.cpp +6 -5

             ****************************************************************************/
             #include "qpieseries.h"
-            #include "qpiesliceprivate_p.h"
             #include "qpieseriesprivate_p.h"
+            #include "qpieslice.h"
+            #include "pieslicedata_p.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 QVector<QPieSlice*> changed;
                 foreach (QPieSlice* s, m_slices) {
-                    PieSliceData data = s->data_ptr()->m_data;
+                    PieSliceData data = *s->data_ptr();
                     data.m_percentage = s->value() / m_total;
                     data.m_angleSpan = pieSpan * data.m_percentage;
                     data.m_startAngle = sliceAngle;
                     sliceAngle += data.m_angleSpan;
-                    if (s->data_ptr()->m_data != data) {
+                    if (*s->data_ptr() != data) {
-                        s->data_ptr()->m_data = data;
+                        *s->data_ptr() = data;
                         changed << s;
                     }
                 }
                 // emit signals
                 foreach (QPieSlice* s, changed)
-                    emit s->data_ptr()->changed();
+                    s->data_ptr()->emitChangedSignal(s);
             }
             void QPieSeriesPrivate::sliceChanged()

src/piechart/qpieseries.h 0 -4

                 QPieSeriesPrivate * const d_ptr;
                 Q_DECLARE_PRIVATE(QPieSeries)
                 Q_DISABLE_COPY(QPieSeries)
-            public:
-                typedef QPieSeriesPrivate * const DataPtr;
-                inline DataPtr &data_ptr() { return d_ptr; }
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/qpieslice.cpp +43 -75

             ****************************************************************************/
             #include "qpieslice.h"
-            #include "qpiesliceprivate_p.h"
+            #include "pieslicedata_p.h"
-            #include "qpieseries.h"
-            #include "qpieseriesprivate_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             */
             QPieSlice::QPieSlice(QObject *parent)
                 :QObject(parent),
-                d_ptr(new QPieSlicePrivate(this))
+                d(new PieSliceData())
             {
             }
             */
             QPieSlice::QPieSlice(qreal value, QString label, QObject *parent)
                 :QObject(parent),
-                d_ptr(new QPieSlicePrivate(this))
+                d(new PieSliceData())
             {
-                Q_D(QPieSlice);
+                d->m_value = value;
-                d->m_data.m_value = value;
+                d->m_labelText = label;
-                d->m_data.m_labelText = label;
             }
             /*!
             */
             QPieSlice::~QPieSlice()
             {
-                delete d_ptr;
+                delete d;
             }
             /*!
             */
             qreal QPieSlice::value() const
             {
-                Q_D(const QPieSlice);
+                return d->m_value;
-                return d->m_data.m_value;
             }
             /*!
             */
             QString QPieSlice::label() const
             {
-                Q_D(const QPieSlice);
+                return d->m_labelText;
-                return d->m_data.m_labelText;
             }
             /*!
             */
             bool QPieSlice::isLabelVisible() const
             {
-                Q_D(const QPieSlice);
+                return d->m_isLabelVisible;
-                return d->m_data.m_isLabelVisible;
             }
             /*!
             */
             bool QPieSlice::isExploded() const
             {
-                Q_D(const QPieSlice);
+                return d->m_isExploded;
-                return d->m_data.m_isExploded;
             }
             /*!
             */
             qreal QPieSlice::explodeDistanceFactor() const
             {
-                Q_D(const QPieSlice);
+                return d->m_explodeDistanceFactor;
-                return d->m_data.m_explodeDistanceFactor;
             }
             /*!
             */
             qreal QPieSlice::percentage() const
             {
-                Q_D(const QPieSlice);
+                return d->m_percentage;
-                return d->m_data.m_percentage;
             }
             /*!
             */
             qreal QPieSlice::startAngle() const
             {
-                Q_D(const QPieSlice);
+                return d->m_startAngle;
-                return d->m_data.m_startAngle;
             }
             /*!
             */
             qreal QPieSlice::endAngle() const
             {
-                Q_D(const QPieSlice);
+                return d->m_startAngle + d->m_angleSpan;
-                return d->m_data.m_startAngle + d->m_data.m_angleSpan;
             }
             /*!
             */
             QPen QPieSlice::pen() const
             {
-                Q_D(const QPieSlice);
+                return d->m_slicePen;
-                return d->m_data.m_slicePen;
             }
             /*!
             */
             QBrush QPieSlice::brush() const
             {
-                Q_D(const QPieSlice);
+                return d->m_sliceBrush;
-                return d->m_data.m_sliceBrush;
             }
             /*!
             */
             QPen QPieSlice::labelPen() const
             {
-                Q_D(const QPieSlice);
+                return d->m_labelPen;
-                return d->m_data.m_labelPen;
             }
             /*!
             */
             QFont QPieSlice::labelFont() const
             {
-                Q_D(const QPieSlice);
+                return d->m_labelFont;
-                return d->m_data.m_labelFont;
             }
             /*!
             */
             qreal QPieSlice::labelArmLengthFactor() const
             {
-                Q_D(const QPieSlice);
+                return d->m_labelArmLengthFactor;
-                return d->m_data.m_labelArmLengthFactor;
             }
             /*!
             */
             void QPieSlice::setValue(qreal value)
             {
-                Q_D(QPieSlice);
+                if (!qFuzzyIsNull(d->m_value - value)) {
-                if (!qFuzzyIsNull(d->m_data.m_value - value)) {
+                    d->m_value = value;
-                    d->m_data.m_value = value;
-                    QPieSeries *series = qobject_cast<QPieSeries*>(parent());
-                    if (series)
-                        series->data_ptr()->updateDerivativeData(); // will emit changed()
-                    else
                     emit changed();
                 }
             }
             */
             void QPieSlice::setLabel(QString label)
             {
-                Q_D(QPieSlice);
+                if (d->m_labelText != label) {
-                if (d->m_data.m_labelText != label) {
+                    d->m_labelText = label;
-                    d->m_data.m_labelText = label;
                     emit changed();
                 }
             }
             */
             void QPieSlice::setLabelVisible(bool visible)
             {
-                Q_D(QPieSlice);
+                if (d->m_isLabelVisible != visible) {
-                if (d->m_data.m_isLabelVisible != visible) {
+                    d->m_isLabelVisible = visible;
-                    d->m_data.m_isLabelVisible = visible;
                     emit changed();
                 }
             }
             */
             void QPieSlice::setExploded(bool exploded)
             {
-                Q_D(QPieSlice);
+                if (d->m_isExploded != exploded) {
-                if (d->m_data.m_isExploded != exploded) {
+                    d->m_isExploded = exploded;
-                    d->m_data.m_isExploded = exploded;
                     emit changed();
                 }
             }
             */
             void QPieSlice::setExplodeDistanceFactor(qreal factor)
             {
-                Q_D(QPieSlice);
+                if (!qFuzzyIsNull(d->m_explodeDistanceFactor - factor)) {
-                if (!qFuzzyIsNull(d->m_data.m_explodeDistanceFactor - factor)) {
+                    d->m_explodeDistanceFactor = factor;
-                    d->m_data.m_explodeDistanceFactor = factor;
                     emit changed();
                 }
             }
             */
             void QPieSlice::setPen(const QPen &pen)
             {
-                Q_D(QPieSlice);
+                if (d->m_slicePen != pen) {
-                if (d->m_data.m_slicePen != pen) {
+                    d->m_slicePen = pen;
-                    d->m_data.m_slicePen = pen;
+                    d->m_slicePen.setThemed(false);
-                    d->m_data.m_slicePen.setThemed(false);
                     emit changed();
                 }
             }
             */
             void QPieSlice::setBrush(const QBrush &brush)
             {
-                Q_D(QPieSlice);
+                if (d->m_sliceBrush != brush) {
-                if (d->m_data.m_sliceBrush != brush) {
+                    d->m_sliceBrush = brush;
-                    d->m_data.m_sliceBrush = brush;
+                    d->m_sliceBrush.setThemed(false);
-                    d->m_data.m_sliceBrush.setThemed(false);
                     emit changed();
                 }
             }
             */
             void QPieSlice::setLabelPen(const QPen &pen)
             {
-                Q_D(QPieSlice);
+                if (d->m_labelPen != pen) {
-                if (d->m_data.m_labelPen != pen) {
+                    d->m_labelPen = pen;
-                    d->m_data.m_labelPen = pen;
+                    d->m_labelPen.setThemed(false);
-                    d->m_data.m_labelPen.setThemed(false);
                     emit changed();
                 }
             }
             */
             void QPieSlice::setLabelFont(const QFont &font)
             {
-                Q_D(QPieSlice);
+                if (d->m_labelFont != font) {
-                if (d->m_data.m_labelFont != font) {
+                    d->m_labelFont = font;
-                    d->m_data.m_labelFont = font;
+                    d->m_labelFont.setThemed(false);
-                    d->m_data.m_labelFont.setThemed(false);
                     emit changed();
                 }
             }
             */
             void QPieSlice::setLabelArmLengthFactor(qreal factor)
             {
-                Q_D(QPieSlice);
+                if (!qFuzzyIsNull(d->m_labelArmLengthFactor - factor)) {
-                if (!qFuzzyIsNull(d->m_data.m_labelArmLengthFactor - factor)) {
+                    d->m_labelArmLengthFactor = factor;
-                    d->m_data.m_labelArmLengthFactor = factor;
                     emit changed();
                 }
             }
             #include "moc_qpieslice.cpp"
-            #include "moc_qpiesliceprivate_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/qpieslice.h +5 -5

             #include <QFont>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class QPieSlicePrivate;
+            class PieSliceData;
             class QTCOMMERCIALCHART_EXPORT QPieSlice : public QObject
             {
                 void changed();
             private:
-                QPieSlicePrivate * const d_ptr;
+                friend class PieSliceData;
-                Q_DECLARE_PRIVATE(QPieSlice)
+                PieSliceData * const d;
                 Q_DISABLE_COPY(QPieSlice)
             public:
-                typedef QPieSlicePrivate * const DataPtr;
+                typedef PieSliceData * const DataPtr;
-                inline DataPtr &data_ptr() { return d_ptr; }
+                inline DataPtr &data_ptr() { return d; }
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/qpiesliceprivate_p.h removed 0 -56

NO CONTENT: file was removed

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