##// END OF EJS Templates
Fixed build error caused by QSeries name change
Fixed build error caused by QSeries name change

File last commit:

r668:ea2480445e4a
r733:a8e3d9a5ee37
Show More
pieanimation.cpp
92 lines | 2.5 KiB | text/x-c | CppLexer
Michal Klocek
minor . compilation fix
r623 #include "pieanimation_p.h"
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
r618 #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()
{
}
Jani Honkonen
Getting rid of slice pointer in PieSliceLayout.
r629 void PieAnimation::updateValues(const PieLayout &newValues)
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
r618 {
Jani Honkonen
Getting rid of slice pointer in PieSliceLayout.
r629 foreach (QPieSlice* s, newValues.keys())
updateValue(s, newValues.value(s));
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
r618 }
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
r668 void PieAnimation::updateValue(QPieSlice *slice, const PieSliceData &sliceData)
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
r618 {
Jani Honkonen
Getting rid of slice pointer in PieSliceLayout.
r629 PieSliceAnimation *animation = m_animations.value(slice);
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
r618 Q_ASSERT(animation);
animation->stop();
Jani Honkonen
Refactoring pie series and animations.
r621
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
r668 animation->updateValue(sliceData);
Jani Honkonen
Refactoring pie series and animations.
r621 animation->setDuration(1000);
animation->setEasingCurve(QEasingCurve::OutQuart);
QTimer::singleShot(0, animation, SLOT(start()));
}
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
r668 void PieAnimation::addSlice(QPieSlice *slice, const PieSliceData &sliceData, bool isEmpty)
Jani Honkonen
Refactoring pie series and animations.
r621 {
Jani Honkonen
Getting rid of slice pointer in PieSliceLayout.
r629 PieSliceAnimation *animation = new PieSliceAnimation(m_item, slice);
Jani Honkonen
Refactoring pie series and animations.
r621 m_animations.insert(slice, animation);
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
r668 PieSliceData startValue = sliceData;
startValue.m_radius = 0;
Jani Honkonen
Nicer animation for adding a pie initially.
r634 if (isEmpty)
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
r668 startValue.m_startAngle = 0;
Jani Honkonen
Nicer animation for adding a pie initially.
r634 else
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
r668 startValue.m_startAngle = sliceData.m_startAngle + (sliceData.m_angleSpan/2);
startValue.m_angleSpan = 0;
animation->setValue(startValue, sliceData);
Jani Honkonen
Refactoring pie series and animations.
r621
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();
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
r668 PieSliceData endValue = animation->currentSliceValue();
endValue.m_radius = 0;
Jani Honkonen
Refactoring pie series and animations.
r621 // TODO: find the actual angle where this slice disappears
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
r668 endValue.m_startAngle = endValue.m_startAngle + endValue.m_angleSpan;
endValue.m_angleSpan = 0;
Jani Honkonen
Refactoring pie series and animations.
r621
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
r668 animation->updateValue(endValue);
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
r618 animation->setDuration(1000);
animation->setEasingCurve(QEasingCurve::OutQuart);
Jani Honkonen
Refactoring pie series and animations.
r621
connect(animation, SIGNAL(finished()), this, SLOT(destroySliceAnimationComplete()));
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
r618 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