HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r668:ea2480445e4a

Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.

Jani Honkonen -

r668:ea2480445e4a

parent child

Context file:

r668:ea2480445e4a

Collapse all files

src/animations/chartanimator.cpp +4 -4

             #include "chartanimator_p.h"
             #include "axisanimation_p.h"
             #include "xyanimation_p.h"
             #include "splineanimation_p.h"
             #include "xychartitem_p.h"
             #include "pieanimation_p.h"
             #include "areachartitem_p.h"
             #include "splinechartitem_p.h"
             #include "scatterchartitem_p.h"
             #include <QTimer>
             Q_DECLARE_METATYPE(QVector<QPointF>)
             Q_DECLARE_METATYPE(QVector<qreal>)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             const static int duration = 1000;
             ChartAnimator::ChartAnimator(QObject *parent):QObject(parent)
             {
             }
             ChartAnimator::~ChartAnimator()
             {
             }
             void ChartAnimator::addAnimation(AxisItem* item)
             {
                 ChartAnimation* animation = m_animations.value(item);
                 if(!animation) {
                     animation = new AxisAnimation(item);
                     m_animations.insert(item,animation);
                 }
                 item->setAnimator(this);
             }
             void ChartAnimator::addAnimation(SplineChartItem*  item)
             {
                 ChartAnimation* animation = m_animations.value(item);
                 if(!animation) {
                     animation = new SplineAnimation(item);
                     m_animations.insert(item,animation);
                 }
                 item->setAnimator(this);
             }
             void ChartAnimator::addAnimation(ScatterChartItem* item)
             {
                 ChartAnimation* animation = m_animations.value(item);
                 if(!animation) {
                     animation = new XYAnimation(item);
                     m_animations.insert(item,animation);
                 }
                 item->setAnimator(this);
             }
             void ChartAnimator::addAnimation(LineChartItem*  item)
             {
                 ChartAnimation* animation = m_animations.value(item);
                 if(!animation) {
                     animation = new XYAnimation(item);
                     m_animations.insert(item,animation);
                 }
                 item->setAnimator(this);
             }
             void ChartAnimator::addAnimation(PieChartItem* item)
             {
                 ChartAnimation* animation = m_animations.value(item);
                 if(!animation) {
                     animation = new PieAnimation(item);
                     m_animations.insert(item,animation);
                 }
                 item->setAnimator(this);
             }
             void ChartAnimator::removeAnimation(ChartItem* item)
             {
                 item->setAnimator(0);
                 m_animations.remove(item);
             }
             void ChartAnimator::updateLayout(AxisItem* item , QVector<qreal>& newLayout)
             {
                 AxisAnimation* animation = static_cast<AxisAnimation*>(m_animations.value(item));
                 Q_ASSERT(animation);
                 QVector<qreal> oldLayout = item->layout();
                 if(newLayout.count()==0) return;
                 switch(m_state)
             	{
                 	case ZoomOutState: {
                 			QRectF rect = item->geometry();
                 			oldLayout.resize(newLayout.count());
                 			for(int i=0,j=oldLayout.count()-1;i<(oldLayout.count()+1)/2;i++,j--)
                 			{
                 				oldLayout[i]= item->axisType()==AxisItem::X_AXIS?rect.left():rect.bottom();
                 				oldLayout[j]= item->axisType()==AxisItem::X_AXIS?rect.right():rect.top();
                 			}
                 		}
                 	break;
             		case ZoomInState: {
             			int index = qMin(oldLayout.count()*(item->axisType()==AxisItem::X_AXIS?m_point.x():(1 -m_point.y())),newLayout.count()-1.0);
             			oldLayout.resize(newLayout.count());
             			for(int i=0;i<oldLayout.count();i++)
             			{
             				oldLayout[i]= oldLayout[index];
             			}
             		}
             		break;
             		case ScrollDownState:
             		case ScrollRightState: {
             			oldLayout.resize(newLayout.count());
             			for(int i=0, j=i+1;i<oldLayout.count()-1;i++,j++)
             			{
             				oldLayout[i]= oldLayout[j];
             			}
             		}
             		break;
             		case ScrollUpState:
             		case ScrollLeftState: {
             			oldLayout.resize(newLayout.count());
             			for(int i=oldLayout.count()-1, j=i-1;i>0;i--,j--)
             			{
             				oldLayout[i]= oldLayout[j];
             			}
             		}
             		break;
             		default: {
             			oldLayout.resize(newLayout.count());
             			QRectF rect = item->geometry();
             			for(int i=0, j=oldLayout.count()-1;i<oldLayout.count();i++,j--)
             			{
             				oldLayout[i]= item->axisType()==AxisItem::X_AXIS?rect.left():rect.top();
             			}
             		}
             		break;
             	}
                 if(animation->state()!=QAbstractAnimation::Stopped) {
                     animation->stop();
                 }
                 animation->setDuration(duration);
                 animation->setEasingCurve(QEasingCurve::OutQuart);
                 QVariantAnimation::KeyValues value;
                 animation->setKeyValues(value); //workaround for wrong interpolation call
                 animation->setKeyValueAt(0.0, qVariantFromValue(oldLayout));
                 animation->setKeyValueAt(1.0, qVariantFromValue(newLayout));
                 QTimer::singleShot(0,animation,SLOT(start()));
             }
             void ChartAnimator::updateLayout(SplineChartItem* item, QVector<QPointF>& oldPoints ,QVector<QPointF>& newPoints, QVector<QPointF>& oldControlPoints, QVector<QPointF>& newControlPoints,int index)
             {
                 SplineAnimation* animation = static_cast<SplineAnimation*>(m_animations.value(item));
                 Q_ASSERT(animation);
                 if(newPoints.count()<2 || newControlPoints.count()<2) return;
                 bool empty = oldPoints.count()==0;
                 if(animation->state()!=QAbstractAnimation::Stopped) {
                      animation->stop();
                 }
                 animation->setDuration(duration);
                 if(!empty)
                 animation->setAnimationType(ChartAnimation::MoveDownAnimation);
                 else
                 animation->setAnimationType(ChartAnimation::LineDrawAnimation);
                 animation->setEasingCurve(QEasingCurve::OutQuart);
                 animation->setValues(oldPoints,newPoints,oldControlPoints,newControlPoints,index);
                 QTimer::singleShot(0,animation,SLOT(start()));
             }
             void ChartAnimator::updateLayout(XYChartItem* item,  QVector<QPointF>& oldPoints , QVector<QPointF>& newPoints, int index)
             {
                 XYAnimation* animation = static_cast<XYAnimation*>(m_animations.value(item));
                 Q_ASSERT(animation);
                 if(newPoints.count()==0) return;
                 bool empty = oldPoints.count()==0;
                 if(animation->state()!=QAbstractAnimation::Stopped) {
                     animation->stop();
                 }
                 animation->setDuration(duration);
                 if(!empty)
                 animation->setAnimationType(ChartAnimation::MoveDownAnimation);
                 else
                 animation->setAnimationType(ChartAnimation::LineDrawAnimation);
                 animation->setEasingCurve(QEasingCurve::OutQuart);
                 animation->setValues(oldPoints,newPoints,index);
                 QTimer::singleShot(0,animation,SLOT(start()));
             }
-            void ChartAnimator::addAnimation(PieChartItem* item, QPieSlice *slice, const PieSliceLayout &layout, bool isEmpty)
+            void ChartAnimator::addAnimation(PieChartItem* item, QPieSlice *slice, const PieSliceData &sliceData, bool isEmpty)
             {
                 PieAnimation* animation = static_cast<PieAnimation*>(m_animations.value(item));
                 Q_ASSERT(animation);
-                animation->addSlice(slice, layout, isEmpty);
+                animation->addSlice(slice, sliceData, isEmpty);
             }
             void ChartAnimator::removeAnimation(PieChartItem* item, QPieSlice *slice)
             {
                 PieAnimation* animation = static_cast<PieAnimation*>(m_animations.value(item));
                 Q_ASSERT(animation);
                 animation->removeSlice(slice);
             }
             void ChartAnimator::updateLayout(PieChartItem* item, const PieLayout &layout)
             {
                 PieAnimation* animation = static_cast<PieAnimation*>(m_animations.value(item));
                 Q_ASSERT(animation);
                 animation->updateValues(layout);
             }
-            void ChartAnimator::updateLayout(PieChartItem* item, QPieSlice *slice, const PieSliceLayout &layout)
+            void ChartAnimator::updateLayout(PieChartItem* item, QPieSlice *slice, const PieSliceData &sliceData)
             {
                 PieAnimation* animation = static_cast<PieAnimation*>(m_animations.value(item));
                 Q_ASSERT(animation);
-                animation->updateValue(slice, layout);
+                animation->updateValue(slice, sliceData);
             }
             void ChartAnimator::setState(State state,const QPointF& point)
             {
             	m_state=state;
             	m_point=point;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/chartanimator_p.h +2 -2

             #ifndef CHARTANIMATOR_P_H_
             #define CHARTANIMATOR_P_H_
             #include "qchartglobal.h"
             #include "chartanimation_p.h"
             #include "piechartitem_p.h"
             #include <QPointF>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartItem;
             class AxisItem;
             class AreaChartItem;
             class SplineChartItem;
             class ScatterChartItem;
             class LineChartItem;
             class XYChartItem;
             class ChartAnimator : public QObject {
             public:
             	//TODO: this should be flags in case of two state at the time
             	enum State{ShowState, ScrollUpState, ScrollDownState, ScrollLeftState,ScrollRightState,ZoomInState,ZoomOutState};
                 ChartAnimator(QObject *parent = 0);
                 virtual ~ChartAnimator();
                 void addAnimation(AxisItem* item);
                 void addAnimation(PieChartItem* item);
                 void addAnimation(ScatterChartItem* item);
                 void addAnimation(LineChartItem* item);
                 void addAnimation(SplineChartItem* item);
                 void removeAnimation(ChartItem* item);
                 void animationStarted();
                 void updateLayout(XYChartItem* item, QVector<QPointF>& oldLayout,QVector<QPointF>& newLayout,int index);
                 void updateLayout(SplineChartItem* item,  QVector<QPointF>& oldPoints , QVector<QPointF>& newPoints, QVector<QPointF>& oldControlPoints, QVector<QPointF>& newContorlPoints,int index);
                 void updateLayout(AxisItem* item, QVector<qreal>& layout);
-                void addAnimation(PieChartItem* item, QPieSlice *slice, const PieSliceLayout &layout, bool isEmpty);
+                void addAnimation(PieChartItem* item, QPieSlice *slice, const PieSliceData &sliceData, bool isEmpty);
                 void removeAnimation(PieChartItem* item, QPieSlice *slice);
                 void updateLayout(PieChartItem* item, const PieLayout &layout);
-                void updateLayout(PieChartItem* item, QPieSlice *slice, const PieSliceLayout &layout);
+                void updateLayout(PieChartItem* item, QPieSlice *slice, const PieSliceData &sliceData);
                 void setState(State state,const QPointF& point = QPointF());
             private:
                  QMap<ChartItem*,ChartAnimation*> m_animations;
                  State m_state;
                  QPointF m_point;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/animations/pieanimation.cpp +14 -14

             #include "pieanimation_p.h"
             #include "piesliceanimation_p.h"
             #include "piechartitem_p.h"
             #include <QParallelAnimationGroup>
             #include <QTimer>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             PieAnimation::PieAnimation(PieChartItem *item)
                 :ChartAnimation(item),
                 m_item(item)
             {
             }
             PieAnimation::~PieAnimation()
             {
             }
             void PieAnimation::updateValues(const PieLayout &newValues)
             {
                 foreach (QPieSlice* s, newValues.keys())
                     updateValue(s, newValues.value(s));
             }
-            void PieAnimation::updateValue(QPieSlice *slice, const PieSliceLayout &endLayout)
+            void PieAnimation::updateValue(QPieSlice *slice, const PieSliceData &sliceData)
             {
                 PieSliceAnimation *animation = m_animations.value(slice);
                 Q_ASSERT(animation);
                 animation->stop();
-                animation->updateValue(endLayout);
+                animation->updateValue(sliceData);
                 animation->setDuration(1000);
                 animation->setEasingCurve(QEasingCurve::OutQuart);
                 QTimer::singleShot(0, animation, SLOT(start()));
             }
-            void PieAnimation::addSlice(QPieSlice *slice, const PieSliceLayout &endLayout, bool isEmpty)
+            void PieAnimation::addSlice(QPieSlice *slice, const PieSliceData &sliceData, bool isEmpty)
             {
                 PieSliceAnimation *animation = new PieSliceAnimation(m_item, slice);
                 m_animations.insert(slice, animation);
-                PieSliceLayout startLayout = endLayout;
+                PieSliceData startValue = sliceData;
-                startLayout.m_radius = 0;
+                startValue.m_radius = 0;
                 if (isEmpty)
-                    startLayout.m_startAngle = 0;
+                    startValue.m_startAngle = 0;
                 else
-                    startLayout.m_startAngle = endLayout.m_startAngle + (endLayout.m_angleSpan/2);
+                    startValue.m_startAngle = sliceData.m_startAngle + (sliceData.m_angleSpan/2);
-                startLayout.m_angleSpan = 0;
+                startValue.m_angleSpan = 0;
-                animation->setValue(startLayout, endLayout);
+                animation->setValue(startValue, sliceData);
                 animation->setDuration(1000);
                 animation->setEasingCurve(QEasingCurve::OutQuart);
                 QTimer::singleShot(0, animation, SLOT(start()));
             }
             void PieAnimation::removeSlice(QPieSlice *slice)
             {
                 PieSliceAnimation *animation = m_animations.value(slice);
                 Q_ASSERT(animation);
                 animation->stop();
-                PieSliceLayout endLayout = animation->currentSliceValue();
+                PieSliceData endValue = animation->currentSliceValue();
-                endLayout.m_radius = 0;
+                endValue.m_radius = 0;
                 // TODO: find the actual angle where this slice disappears
-                endLayout.m_startAngle = endLayout.m_startAngle + endLayout.m_angleSpan;
+                endValue.m_startAngle = endValue.m_startAngle + endValue.m_angleSpan;
-                endLayout.m_angleSpan = 0;
+                endValue.m_angleSpan = 0;
-                animation->updateValue(endLayout);
+                animation->updateValue(endValue);
                 animation->setDuration(1000);
                 animation->setEasingCurve(QEasingCurve::OutQuart);
                 connect(animation, SIGNAL(finished()), this, SLOT(destroySliceAnimationComplete()));
                 QTimer::singleShot(0, animation, SLOT(start()));
             }
             void PieAnimation::updateCurrentValue(const QVariant &)
             {
                 // nothing to do...
             }
             void PieAnimation::destroySliceAnimationComplete()
             {
                 PieSliceAnimation *animation = static_cast<PieSliceAnimation*>(sender());
                 QPieSlice *slice = m_animations.key(animation);
                 m_item->destroySlice(slice);
                 delete m_animations.take(slice);
             }
             #include "moc_pieanimation_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/pieanimation_p.h +2 -2

             #ifndef PIEANIMATION_P_H_
             #define PIEANIMATION_P_H_
             #include "chartanimation_p.h"
             #include "piechartitem_p.h"
             #include "piesliceanimation_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class PieChartItem;
             class PieAnimation : public ChartAnimation
             {
                 Q_OBJECT
             public:
                 PieAnimation(PieChartItem *item);
                 ~PieAnimation();
                 void updateValues(const PieLayout &newValues);
-                void updateValue(QPieSlice *slice, const PieSliceLayout &newValue);
+                void updateValue(QPieSlice *slice, const PieSliceData &newValue);
-                void addSlice(QPieSlice *slice, const PieSliceLayout &endLayout, bool isEmpty);
+                void addSlice(QPieSlice *slice, const PieSliceData &endValue, bool isEmpty);
                 void removeSlice(QPieSlice *slice);
             public: // from QVariantAnimation
                 void updateCurrentValue(const QVariant &value);
             public Q_SLOTS:
                 void destroySliceAnimationComplete();
             private:
                 PieChartItem *m_item;
                 QHash<QPieSlice*, PieSliceAnimation*> m_animations;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/animations/piesliceanimation.cpp +8 -8

             #include "piesliceanimation_p.h"
             #include "piechartitem_p.h"
             #include "qpieslice.h"
-            Q_DECLARE_METATYPE(QtCommercialChart::PieSliceLayout)
+            Q_DECLARE_METATYPE(QtCommercialChart::PieSliceData)
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             qreal linearPos(qreal start, qreal end, qreal pos)
             {
                 return start + ((end - start) * pos);
             }
             QPointF linearPos(QPointF start, QPointF end, qreal pos)
             {
                 qreal x = linearPos(start.x(), end.x(), pos);
                 qreal y = linearPos(start.y(), end.y(), pos);
                 return QPointF(x, y);
             }
             QPen linearPos(QPen start, QPen end, qreal pos)
             {
                 QColor c;
                 c.setRedF(linearPos(start.color().redF(), end.color().redF(), pos));
                 c.setGreenF(linearPos(start.color().greenF(), end.color().greenF(), pos));
                 c.setBlueF(linearPos(start.color().blueF(), end.color().blueF(), pos));
                 end.setColor(c);
                 return end;
             }
             QBrush linearPos(QBrush start, QBrush end, qreal pos)
             {
                 QColor c;
                 c.setRedF(linearPos(start.color().redF(), end.color().redF(), pos));
                 c.setGreenF(linearPos(start.color().greenF(), end.color().greenF(), pos));
                 c.setBlueF(linearPos(start.color().blueF(), end.color().blueF(), pos));
                 end.setColor(c);
                 return end;
             }
             PieSliceAnimation::PieSliceAnimation(PieChartItem *item, QPieSlice *slice)
                 :QVariantAnimation(item),
                 m_item(item),
                 m_slice(slice)
             {
             }
             PieSliceAnimation::~PieSliceAnimation()
             {
             }
-            void PieSliceAnimation::setValue(const PieSliceLayout &startValue, const PieSliceLayout &endValue)
+            void PieSliceAnimation::setValue(const PieSliceData &startValue, const PieSliceData &endValue)
             {
                 if (state() != QAbstractAnimation::Stopped)
                     stop();
                 m_currentValue = startValue;
                 setKeyValueAt(0.0, qVariantFromValue(startValue));
                 setKeyValueAt(1.0, qVariantFromValue(endValue));
             }
-            void PieSliceAnimation::updateValue(const PieSliceLayout &endValue)
+            void PieSliceAnimation::updateValue(const PieSliceData &endValue)
             {
                 if (state() != QAbstractAnimation::Stopped)
                     stop();
                 setKeyValueAt(0.0, qVariantFromValue(m_currentValue));
                 setKeyValueAt(1.0, qVariantFromValue(endValue));
             }
-            PieSliceLayout PieSliceAnimation::currentSliceValue()
+            PieSliceData PieSliceAnimation::currentSliceValue()
             {
                 // NOTE:
                 // We must use an internal current value because QVariantAnimation::currentValue() is updated
                 // before the animation is actually started. So if we get 2 updateValue() calls in a row the currentValue()
                 // will have the end value set from the first call and the second call will interpolate that instead of
                 // the original current value as it was before the first call.
                 return m_currentValue;
             }
             QVariant PieSliceAnimation::interpolated(const QVariant &start, const QVariant &end, qreal progress) const
             {
-                PieSliceLayout startValue = qVariantValue<PieSliceLayout>(start);
+                PieSliceData startValue = qVariantValue<PieSliceData>(start);
-                PieSliceLayout endValue = qVariantValue<PieSliceLayout>(end);
+                PieSliceData endValue = qVariantValue<PieSliceData>(end);
-                PieSliceLayout result;
+                PieSliceData result;
                 result = endValue;
                 result.m_center = linearPos(startValue.m_center, endValue.m_center, progress);
                 result.m_radius = linearPos(startValue.m_radius, endValue.m_radius, progress);
                 result.m_startAngle = linearPos(startValue.m_startAngle, endValue.m_startAngle, progress);
                 result.m_angleSpan = linearPos(startValue.m_angleSpan, endValue.m_angleSpan, progress);
                 result.m_pen = linearPos(startValue.m_pen, endValue.m_pen, progress);
                 result.m_brush = linearPos(startValue.m_brush, endValue.m_brush, progress);
                 return qVariantFromValue(result);
             }
             void PieSliceAnimation::updateCurrentValue(const QVariant &value)
             {
                 if (state() != QAbstractAnimation::Stopped) { //workaround
-                    m_currentValue = qVariantValue<PieSliceLayout>(value);
+                    m_currentValue = qVariantValue<PieSliceData>(value);
                     m_item->setLayout(m_slice, m_currentValue);
                 }
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/animations/piesliceanimation_p.h +4 -4

             #ifndef PIESLICEANIMATION_P_H_
             #define PIESLICEANIMATION_P_H_
             #include "piechartitem_p.h"
             #include <QVariantAnimation>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class PieChartItem;
             class QPieSlice;
             class PieSliceAnimation : public QVariantAnimation
             {
             public:
                 PieSliceAnimation(PieChartItem *item, QPieSlice *slice);
                 ~PieSliceAnimation();
-                void setValue(const PieSliceLayout &startValue, const PieSliceLayout &endValue);
+                void setValue(const PieSliceData &startValue, const PieSliceData &endValue);
-                void updateValue(const PieSliceLayout &endValue);
+                void updateValue(const PieSliceData &endValue);
-                PieSliceLayout currentSliceValue();
+                PieSliceData currentSliceValue();
             protected:
                 QVariant interpolated(const QVariant &start, const QVariant &end, qreal progress) const;
                 void updateCurrentValue(const QVariant &value);
             private:
                 PieChartItem *m_item;
                 QPieSlice *m_slice;
-                PieSliceLayout m_currentValue;
+                PieSliceData m_currentValue;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/piechart/piechartitem.cpp +37 -25

             #include "piechartitem_p.h"
             #include "pieslice_p.h"
             #include "qpieslice.h"
             #include "qpieseries.h"
             #include "chartpresenter_p.h"
             #include "chartdataset_p.h"
             #include "chartanimator_p.h"
             #include <QDebug>
             #include <QPainter>
             #include <QTimer>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             PieChartItem::PieChartItem(QPieSeries *series, ChartPresenter *presenter, QGraphicsItem *parent)
                 :ChartItem(parent),
                 m_series(series),
                 m_presenter(presenter)
             {
                 Q_ASSERT(series);
                 connect(series, SIGNAL(added(QList<QPieSlice*>)), this, SLOT(handleSlicesAdded(QList<QPieSlice*>)));
                 connect(series, SIGNAL(removed(QList<QPieSlice*>)), this, SLOT(handleSlicesRemoved(QList<QPieSlice*>)));
                 connect(series, SIGNAL(piePositionChanged()), this, SLOT(handlePieLayoutChanged()));
                 connect(series, SIGNAL(pieSizeChanged()), this, SLOT(handlePieLayoutChanged()));
                 QTimer::singleShot(0, this, SLOT(initialize()));
                 // Note: the following does not affect as long as the item does not have anything to paint
                 setZValue(ChartPresenter::PieSeriesZValue);
             }
             PieChartItem::~PieChartItem()
             {
                 // slices deleted automatically through QGraphicsItem
             }
             void PieChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *)
             {
                 Q_UNUSED(painter)
                 // TODO: paint shadows for all components
                 // - get paths from items & merge & offset and draw with shadow color?
                 //painter->setBrush(QBrush(Qt::red));
                 //painter->drawRect(m_debugRect);
             }
             void PieChartItem::initialize()
             {
                 handleSlicesAdded(m_series->m_slices);
             }
             void PieChartItem::handleSlicesAdded(QList<QPieSlice*> slices)
             {
                 bool isEmpty = m_slices.isEmpty();
                 m_presenter->theme()->decorate(m_series, m_presenter->dataSet()->seriesIndex(m_series));
                 foreach (QPieSlice *s, slices) {
                     PieSlice* slice = new PieSlice(this);
                     m_slices.insert(s, slice);
                     connect(s, SIGNAL(changed()), this, SLOT(handleSliceChanged()));
                     connect(slice, SIGNAL(clicked()), s, SIGNAL(clicked()));
                     connect(slice, SIGNAL(hoverEnter()), s, SIGNAL(hoverEnter()));
                     connect(slice, SIGNAL(hoverLeave()), s, SIGNAL(hoverLeave()));
-                    PieSliceLayout layout = calculateSliceLayout(s);
+                    PieSliceData data = sliceData(s);
                     if (m_animator)
-                        m_animator->addAnimation(this, s, layout, isEmpty);
+                        m_animator->addAnimation(this, s, data, isEmpty);
                     else
-                        setLayout(s, layout);
+                        setLayout(s, data);
                 }
             }
             void PieChartItem::handleSlicesRemoved(QList<QPieSlice*> slices)
             {
                 m_presenter->theme()->decorate(m_series, m_presenter->dataSet()->seriesIndex(m_series));
                 foreach (QPieSlice *s, slices) {
                     if (m_animator)
                         m_animator->removeAnimation(this, s);
                     else
                         destroySlice(s);
                 }
             }
             void PieChartItem::handlePieLayoutChanged()
             {
                 PieLayout layout = calculateLayout();
                 applyLayout(layout);
                 update();
             }
             void PieChartItem::handleSliceChanged()
             {
                 QPieSlice* slice = qobject_cast<QPieSlice *>(sender());
                 Q_ASSERT(m_slices.contains(slice));
-                PieSliceLayout layout = calculateSliceLayout(slice);
+                PieSliceData data = sliceData(slice);
-                updateLayout(slice, layout);
+                updateLayout(slice, data);
                 update();
             }
             void PieChartItem::handleDomainChanged(qreal, qreal, qreal, qreal)
             {
                 // TODO
             }
             void PieChartItem::handleGeometryChanged(const QRectF& rect)
             {
                 prepareGeometryChange();
                 m_rect = rect;
                 handlePieLayoutChanged();
             }
             void PieChartItem::calculatePieLayout()
             {
                 // find pie center coordinates
                 m_pieCenter.setX(m_rect.left() + (m_rect.width() * m_series->pieHorizontalPosition()));
                 m_pieCenter.setY(m_rect.top() + (m_rect.height() * m_series->pieVerticalPosition()));
                 // find maximum radius for pie
                 m_pieRadius = m_rect.height() / 2;
                 if (m_rect.width() < m_rect.height())
                     m_pieRadius = m_rect.width() / 2;
                 // apply size factor
                 m_pieRadius *= m_series->pieSize();
             }
-            PieSliceLayout PieChartItem::calculateSliceLayout(QPieSlice *slice)
+            PieSliceData PieChartItem::sliceData(QPieSlice *slice)
             {
-                PieSliceLayout sliceLayout;
+                PieSliceData sliceData;
-                sliceLayout.m_center = PieSlice::sliceCenter(m_pieCenter, m_pieRadius, slice);
-                sliceLayout.m_radius = m_pieRadius;
+                // TODO:
-                sliceLayout.m_startAngle = slice->startAngle();
+                // sliceData = slice->m_data;
-                sliceLayout.m_angleSpan = slice->m_angleSpan;
-                sliceLayout.m_pen = slice->m_slicePen;
+                sliceData.m_center = PieSlice::sliceCenter(m_pieCenter, m_pieRadius, slice);
-                sliceLayout.m_brush = slice->m_sliceBrush;
+                sliceData.m_radius = m_pieRadius;
-                return sliceLayout;
+                sliceData.m_startAngle = slice->startAngle();
+                sliceData.m_angleSpan = slice->m_angleSpan;
+                sliceData.m_pen = slice->m_slicePen;
+                sliceData.m_brush = slice->m_sliceBrush;
+                sliceData.m_isExploded = slice->isExploded();
+                sliceData.m_explodeDistanceFactor = slice->explodeDistanceFactor();
+                sliceData.m_labelVisible = slice->isLabelVisible();
+                sliceData.m_labelText = slice->label();
+                sliceData.m_labelFont = slice->labelFont();
+                sliceData.m_labelArmLengthFactor = slice->labelArmLengthFactor();
+                sliceData.m_labelArmPen = slice->labelArmPen();
+                return sliceData;
             }
             PieLayout PieChartItem::calculateLayout()
             {
                 calculatePieLayout();
-                PieLayout  layout;
+                PieLayout layout;
                 foreach (QPieSlice* s, m_series->slices()) {
                     if (m_slices.contains(s)) // calculate layout only for those slices that are already visible
-                        layout.insert(s, calculateSliceLayout(s));
+                        layout.insert(s, sliceData(s));
                 }
                 return layout;
             }
             void PieChartItem::applyLayout(const PieLayout &layout)
             {
                 if (m_animator)
                     m_animator->updateLayout(this, layout);
                 else
                     setLayout(layout);
             }
-            void PieChartItem::updateLayout(QPieSlice *slice, const PieSliceLayout &layout)
+            void PieChartItem::updateLayout(QPieSlice *slice, const PieSliceData &sliceData)
             {
                 if (m_animator)
-                    m_animator->updateLayout(this, slice, layout);
+                    m_animator->updateLayout(this, slice, sliceData);
                 else
-                    setLayout(slice, layout);
+                    setLayout(slice, sliceData);
             }
             void PieChartItem::setLayout(const PieLayout &layout)
             {
                 foreach (QPieSlice *slice, layout.keys()) {
                     PieSlice *s = m_slices.value(slice);
                     Q_ASSERT(s);
-                    s->setLayout(layout.value(slice));
+                    s->setSliceData(layout.value(slice));
-                    s->updateData(slice);
                     s->updateGeometry();
                     s->update();
                 }
             }
-            void PieChartItem::setLayout(QPieSlice *slice, const PieSliceLayout &layout)
+            void PieChartItem::setLayout(QPieSlice *slice, const PieSliceData &sliceData)
             {
                 // find slice
                 PieSlice *s = m_slices.value(slice);
                 Q_ASSERT(s);
-                s->setLayout(layout);
+                s->setSliceData(sliceData);
-                if (m_series->m_slices.contains(slice)) // Slice has been deleted if not found. Animations ongoing...
-                    s->updateData(slice);
                 s->updateGeometry();
                 s->update();
             }
             void PieChartItem::destroySlice(QPieSlice *slice)
             {
                 delete m_slices.take(slice);
             }
             #include "moc_piechartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/piechartitem_p.h +4 -4

             #ifndef PIECHARTITEM_H
             #define PIECHARTITEM_H
             #include "qpieseries.h"
             #include "chartitem_p.h"
             #include "pieslice_p.h"
             class QGraphicsItem;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QPieSlice;
             class ChartPresenter;
-            typedef QHash<QPieSlice*, PieSliceLayout> PieLayout;
+            typedef QHash<QPieSlice*, PieSliceData> PieLayout;
             class PieChartItem : public QObject, public ChartItem
             {
                 Q_OBJECT
             public:
                 // TODO: use a generic data class instead of x and y
                 PieChartItem(QPieSeries *series, ChartPresenter *presenter, QGraphicsItem *parent);
                 ~PieChartItem();
             public: // from QGraphicsItem
                 QRectF boundingRect() const { return m_rect; }
                 void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
             public Q_SLOTS:
                 void initialize();
                 void handleSlicesAdded(QList<QPieSlice*> slices);
                 void handleSlicesRemoved(QList<QPieSlice*> slices);
                 void handlePieLayoutChanged();
                 void handleSliceChanged();
                 void handleDomainChanged(qreal, qreal, qreal, qreal);
                 void handleGeometryChanged(const QRectF& rect);
             public:
                 void calculatePieLayout();
-                PieSliceLayout calculateSliceLayout(QPieSlice *slice);
+                PieSliceData sliceData(QPieSlice *slice);
                 PieLayout calculateLayout();
                 void applyLayout(const PieLayout &layout);
-                void updateLayout(QPieSlice *slice, const PieSliceLayout &layout);
+                void updateLayout(QPieSlice *slice, const PieSliceData &sliceData);
                 void setLayout(const PieLayout &layout);
-                void setLayout(QPieSlice *slice, const PieSliceLayout &layout);
+                void setLayout(QPieSlice *slice, const PieSliceData &sliceData);
                 void destroySlice(QPieSlice *slice);
             private:
                 friend class PieSlice;
                 QHash<QPieSlice*, PieSlice*> m_slices;
                 QPieSeries *m_series;
                 QRectF m_rect;
                 QPointF m_pieCenter;
                 qreal m_pieRadius;
                 ChartPresenter *m_presenter;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // PIECHARTITEM_H

src/piechart/pieslice.cpp +13 -31

             #include "pieslice_p.h"
             #include "piechartitem_p.h"
             #include "qpieseries.h"
             #include "qpieslice.h"
             #include "chartpresenter_p.h"
             #include <QPainter>
             #include <QDebug>
             #include <qmath.h>
             #include <QGraphicsSceneEvent>
             #include <QTime>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             #define PI 3.14159265 // TODO: is this defined in some header?
             QPointF offset(qreal angle, qreal length)
             {
                 qreal dx = qSin(angle*(PI/180)) * length;
                 qreal dy = qCos(angle*(PI/180)) * length;
                 return QPointF(dx, -dy);
             }
             PieSlice::PieSlice(QGraphicsItem* parent)
-                :QGraphicsObject(parent),
+                :QGraphicsObject(parent)
-                m_isExploded(false),
-                m_explodeDistanceFactor(0),
-                m_labelVisible(false),
-                m_labelArmLengthFactor(0)
             {
                 setAcceptHoverEvents(true);
                 setAcceptedMouseButtons(Qt::LeftButton);
                 setZValue(ChartPresenter::PieSeriesZValue);
             }
             PieSlice::~PieSlice()
             {
             }
             QRectF PieSlice::boundingRect() const
             {
                 return m_boundingRect;
             }
             QPainterPath PieSlice::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*/)
             {
                 painter->setClipRect(parentItem()->boundingRect());
                 painter->save();
-                painter->setPen(m_layout.m_pen);
+                painter->setPen(m_data.m_pen);
-                painter->setBrush(m_layout.m_brush);
+                painter->setBrush(m_data.m_brush);
                 painter->drawPath(m_slicePath);
                 painter->restore();
-                if (m_labelVisible) {
+                if (m_data.m_labelVisible) {
                     painter->save();
-                    painter->setPen(m_labelArmPen);
+                    painter->setPen(m_data.m_labelArmPen);
                     painter->drawPath(m_labelArmPath);
                     painter->restore();
-                    painter->setFont(m_labelFont);
+                    painter->setFont(m_data.m_labelFont);
-                    painter->drawText(m_labelTextRect.bottomLeft(), m_labelText);
+                    painter->drawText(m_labelTextRect.bottomLeft(), m_data.m_labelText);
                 }
             }
             void PieSlice::hoverEnterEvent(QGraphicsSceneHoverEvent* /*event*/)
             {
                 emit hoverEnter();
             }
             void PieSlice::hoverLeaveEvent(QGraphicsSceneHoverEvent* /*event*/)
             {
                 emit hoverLeave();
             }
             void PieSlice::mousePressEvent(QGraphicsSceneMouseEvent* /*event*/)
             {
                 emit clicked();
             }
-            void PieSlice::setLayout(PieSliceLayout layout)
+            void PieSlice::setSliceData(PieSliceData sliceData)
             {
-                m_layout = layout;
+                m_data = sliceData;
             }
             void PieSlice::updateGeometry()
             {
-                if (m_layout.m_radius <= 0)
+                if (m_data.m_radius <= 0)
                     return;
                 prepareGeometryChange();
                 // update slice path
                 qreal centerAngle;
                 QPointF armStart;
-                m_slicePath = slicePath(m_layout.m_center, m_layout.m_radius, m_layout.m_startAngle, m_layout.m_angleSpan, &centerAngle, &armStart);
+                m_slicePath = slicePath(m_data.m_center, m_data.m_radius, m_data.m_startAngle, m_data.m_angleSpan, &centerAngle, &armStart);
                 // update text rect
-                m_labelTextRect = labelTextRect(m_labelFont, m_labelText);
+                m_labelTextRect = labelTextRect(m_data.m_labelFont, m_data.m_labelText);
                 // update label arm path
                 QPointF labelTextStart;
-                m_labelArmPath = labelArmPath(armStart, centerAngle, m_layout.m_radius * m_labelArmLengthFactor, m_labelTextRect.width(), &labelTextStart);
+                m_labelArmPath = labelArmPath(armStart, centerAngle, m_data.m_radius * m_data.m_labelArmLengthFactor, m_labelTextRect.width(), &labelTextStart);
                 // update text position
                 m_labelTextRect.moveBottomLeft(labelTextStart);
                 // update bounding rect
                 m_boundingRect = m_slicePath.boundingRect().united(m_labelArmPath.boundingRect()).united(m_labelTextRect);
             }
-            void PieSlice::updateData(const QPieSlice* sliceData)
-                // TODO: compare what has changes to avoid unneccesary geometry updates
-                m_isExploded = sliceData->isExploded();
-                m_explodeDistanceFactor = sliceData->explodeDistanceFactor();
-                m_labelVisible = sliceData->isLabelVisible();
-                m_labelText = sliceData->label();
-                m_labelFont = sliceData->labelFont();
-                m_labelArmLengthFactor = sliceData->labelArmLengthFactor();
-                m_labelArmPen = sliceData->labelArmPen();
             QPointF PieSlice::sliceCenter(QPointF point, qreal radius, QPieSlice *slice)
             {
                 if (slice->isExploded()) {
                     qreal centerAngle = slice->startAngle() + (slice->m_angleSpan/2);
                     qreal len = radius * slice->explodeDistanceFactor();
                     qreal dx = qSin(centerAngle*(PI/180)) * len;
                     qreal dy = -qCos(centerAngle*(PI/180)) * len;
                     point += QPointF(dx, dy);
                 }
                 return point;
             }
             QPainterPath PieSlice::slicePath(QPointF center, qreal radius, qreal startAngle, qreal angleSpan, qreal* centerAngle, QPointF* armStart)
             {
                 // calculate center angle
                 *centerAngle = startAngle + (angleSpan/2);
                 // calculate slice rectangle
                 QRectF rect(center.x()-radius, center.y()-radius, radius*2, radius*2);
                 // slice path
                 // TODO: draw the shape so that it might have a hole in the center
                 QPainterPath path;
                 path.moveTo(rect.center());
                 path.arcTo(rect, -startAngle + 90, -angleSpan);
                 path.closeSubpath();
                 // calculate label arm start point
                 *armStart = center;
                 *armStart += offset(*centerAngle, radius + PIESLICE_LABEL_GAP);
                 return path;
             }
             QPainterPath PieSlice::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;
                 QPointF parm1 = start + QPointF(dx, dy);
                 QPointF parm2 = parm1;
                 if (angle < 180) { // arm swings the other way on the left side
                      parm2 += QPointF(textWidth, 0);
                      *textStart = parm1;
                 }
                 else {
                      parm2 += QPointF(-textWidth,0);
                      *textStart = parm2;
                 }
                 // elevate the text position a bit so that it does not hit the line
                 *textStart += QPointF(0, -5);
                 QPainterPath path;
                 path.moveTo(start);
                 path.lineTo(parm1);
                 path.lineTo(parm2);
                 return path;
             }
             QRectF PieSlice::labelTextRect(QFont font, QString text)
             {
                 QFontMetricsF fm(font);
                 return fm.boundingRect(text);
             }
             #include "moc_pieslice_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/piechart/pieslice_p.h +13 -14

             #ifndef PIESLICE_H
             #define PIESLICE_H
             #include "qchartglobal.h"
             #include "charttheme_p.h"
             #include "qpieseries.h"
             #include <QGraphicsItem>
             #include <QRectF>
             #include <QColor>
             #include <QPen>
             #define PIESLICE_LABEL_GAP 5
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class PieChartItem;
             class PieSliceLabel;
             class QPieSlice;
-            class PieSliceLayout
+            class PieSliceData
             {
             public:
                 QPointF m_center;
                 qreal m_radius;
                 qreal m_startAngle;
                 qreal m_angleSpan;
                 QPen m_pen;
                 QBrush m_brush;
+                bool m_isExploded;
+                qreal m_explodeDistanceFactor;
+                bool m_labelVisible;
+                QString m_labelText;
+                QFont m_labelFont;
+                qreal m_labelArmLengthFactor;
+                QPen m_labelArmPen;
             };
             class PieSlice : public QGraphicsObject
             {
                 Q_OBJECT
             public:
                 PieSlice(QGraphicsItem* parent = 0);
                 ~PieSlice();
             public: // from QGraphicsItem
                 QRectF boundingRect() const;
                 QPainterPath shape() const;
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
                 void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
                 void mousePressEvent(QGraphicsSceneMouseEvent *event);
             Q_SIGNALS:
                 void clicked();
                 void hoverEnter();
                 void hoverLeave();
             public:
-                void setLayout(PieSliceLayout layout);
+                void setSliceData(PieSliceData sliceData);
                 void updateGeometry();
-                void updateData(const QPieSlice *sliceData);
                 static QPointF sliceCenter(QPointF point, qreal radius, QPieSlice *slice);
                 static QPainterPath slicePath(QPointF center, qreal radius, qreal startAngle, qreal angleSpan, qreal* centerAngle, QPointF* armStart);
                 static QPainterPath labelArmPath(QPointF start, qreal angle, qreal length, qreal textWidth, QPointF* textStart);
                 static QRectF labelTextRect(QFont font, QString text);
             private:
-                PieSliceLayout m_layout;
+                PieSliceData m_data;
                 QRectF m_boundingRect;
                 QPainterPath m_slicePath;
-                bool m_isExploded;
-                qreal m_explodeDistanceFactor;
-                bool m_labelVisible;
                 QPainterPath m_labelArmPath;
-                qreal m_labelArmLengthFactor;
-                QPen m_labelArmPen;
                 QRectF m_labelTextRect;
-                QFont m_labelFont;
-                QString m_labelText;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // PIESLICE_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