##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Fixed animation to work when adding a new series....
Fixed animation to work when adding a new series. Change-Id: I698e4143213e49d07ef69c802eed051912af7532 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Miikka Heikkinen - - Load All Authors

File last commit:

r2432:53927f716a3d
r2478:5245fa8e4b16
Show More
pieanimation.cpp
110 lines | 3.3 KiB | text/x-c | CppLexer
/ src / animations / pieanimation.cpp
History | Source | Raw |Copy content |Copy permalink
Jani Honkonen
Add license headers
 r794 /****************************************************************************
**
Miikka Heikkinen
Fixed the copyright year 2012 -> 2013
 r2432 ** Copyright (C) 2013 Digia Plc
Jani Honkonen
Add license headers
 r794 ** All rights reserved.
** For any questions to Digia, please use contact form at http://qt.digia.com
**
** This file is part of the Qt Commercial Charts Add-on.
**
** $QT_BEGIN_LICENSE$
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia.
**
** If you have questions regarding the use of this file, please use
** contact form at http://qt.digia.com
** $QT_END_LICENSE$
**
****************************************************************************/
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"
QTCOMMERCIALCHART_BEGIN_NAMESPACE
PieAnimation::PieAnimation(PieChartItem *item)
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 : ChartAnimation(item),
m_item(item)
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
 r618 {
}
PieAnimation::~PieAnimation()
{
}
Jani Honkonen
more coding style fixes for src-folder...
 r2104 ChartAnimation *PieAnimation::updateValue(PieSliceItem *sliceItem, const PieSliceData &sliceData)
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
 r618 {
Jani Honkonen
Refactor piechart to avoid using invalid QPieSlice pointers....
 r1053 PieSliceAnimation *animation = m_animations.value(sliceItem);
Jani Honkonen
Fix pie animation chrash
 r2321 if (!animation) {
animation = new PieSliceAnimation(sliceItem);
m_animations.insert(sliceItem, animation);
} else {
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
Use same animation duration for all series animations.
 r1079 animation->setDuration(ChartAnimationDuration);
Jani Honkonen
Refactoring pie series and animations.
 r621 animation->setEasingCurve(QEasingCurve::OutQuart);
Michal Klocek
Refactor animator...
 r1735 return animation;
Jani Honkonen
Refactoring pie series and animations.
 r621 }
Jani Honkonen
more coding style fixes for src-folder...
 r2104 ChartAnimation *PieAnimation::addSlice(PieSliceItem *sliceItem, const PieSliceData &sliceData, bool startupAnimation)
Jani Honkonen
Refactoring pie series and animations.
 r621 {
Jani Honkonen
Refactor piechart to avoid using invalid QPieSlice pointers....
 r1053 PieSliceAnimation *animation = new PieSliceAnimation(sliceItem);
m_animations.insert(sliceItem, animation);
Jani Honkonen
Refactoring pie series and animations.
 r621
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
 r668 PieSliceData startValue = sliceData;
startValue.m_radius = 0;
Jani Honkonen
Refactor graphical side of pie to simplify the implementation.
 r1074 if (startupAnimation)
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
Marek Rosa
Animation folder formating: white spaces, brackets, etc fixed
 r738 startValue.m_startAngle = sliceData.m_startAngle + (sliceData.m_angleSpan / 2);
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
 r668 startValue.m_angleSpan = 0;
Jani Honkonen
Refactoring pie series and animations.
 r621
Marek Rosa
Donut support simplified. Examples updated
 r1838 if (sliceData.m_holeRadius > 0)
startValue.m_radius = sliceData.m_holeRadius;
Jani Honkonen
pie: finetuning donut animations...
 r1758
animation->setValue(startValue, sliceData);
Jani Honkonen
Use same animation duration for all series animations.
 r1079 animation->setDuration(ChartAnimationDuration);
Jani Honkonen
Refactoring pie series and animations.
 r621 animation->setEasingCurve(QEasingCurve::OutQuart);
Michal Klocek
Refactor animator...
 r1735
return animation;
Jani Honkonen
Refactoring pie series and animations.
 r621 }
Jani Honkonen
more coding style fixes for src-folder...
 r2104 ChartAnimation *PieAnimation::removeSlice(PieSliceItem *sliceItem)
Jani Honkonen
Refactoring pie series and animations.
 r621 {
Jani Honkonen
Refactor piechart to avoid using invalid QPieSlice pointers....
 r1053 PieSliceAnimation *animation = m_animations.value(sliceItem);
Jani Honkonen
Refactoring pie series and animations.
 r621 Q_ASSERT(animation);
animation->stop();
Jani Honkonen
Rename PieSliceLayout -> PieSliceData. A "layout" is a bad name for this.
 r668 PieSliceData endValue = animation->currentSliceValue();
Marek Rosa
Donut support simplified. Examples updated
 r1838 if (endValue.m_holeRadius > 0)
endValue.m_radius = endValue.m_holeRadius;
Jani Honkonen
pie: finetuning donut animations...
 r1758 else
endValue.m_radius = 0;
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
Slice remove animation hides the label
 r1075 endValue.m_isLabelVisible = false;
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
Use same animation duration for all series animations.
 r1079 animation->setDuration(ChartAnimationDuration);
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
 r618 animation->setEasingCurve(QEasingCurve::OutQuart);
Jani Honkonen
Refactoring pie series and animations.
 r621
Jani Honkonen
Refactor piechart to avoid using invalid QPieSlice pointers....
 r1053 // PieSliceItem is the parent of PieSliceAnimation so the animation will be deleted as well..
connect(animation, SIGNAL(finished()), sliceItem, SLOT(deleteLater()));
m_animations.remove(sliceItem);
Michal Klocek
Refactor animator...
 r1735 return animation;
Jani Honkonen
Add animations to pie. Works but has some visual issues when adding slices.
 r618 }
void PieAnimation::updateCurrentValue(const QVariant &)
{
// nothing to do...
}
#include "moc_pieanimation_p.cpp"
QTCOMMERCIALCHART_END_NAMESPACE