summaryrefslogtreecommitdiffstats
path: root/src/charts/animations/piesliceanimation.cpp
diff options
context:
space:
mode:
authorTitta Heikkala <titta.heikkala@digia.com>2014-07-01 07:10:00 +0300
committerTitta Heikkala <titta.heikkala@theqtcompany.com>2014-10-14 13:04:52 +0300
commitc544258484ff4fd5d2b88402fbaa5d154b89a3a2 (patch)
tree7659625abb566dec55d3783ed820b928542d9b2b /src/charts/animations/piesliceanimation.cpp
parent76339f714f088645e911cee65bdb66055fe029aa (diff)
Qt Charts project file structure change
Charts repository structure is changed to follow the structure of a Qt Add-On module. The task includes following changes: - All macros and definitions named 'commercial' have been renamed. - Compile errors related to QString and qSort usage have been fixed. - Old demos are moved under examples. The QML examples now support only Qt Quick 2.0, the support for Qt Quick 1 is removed. - The QML examples with multiple views are updated so that they are usable also with touch devices. - Unnecessary version checks are removed from examples. - The build stamp has been removed as it was only meant for Charts development purposes and it's no longer needed. Also development build related debug prints are removed as __DATE__ can't be used for all OS thus it doesn't make much sense. - Documentation structure has been updated based on the new module structure. The raw HTML files have been removed. Demos are combined to examples. - Unnecessary .qdocinc files are no longer needed. The content is moved to the corresponding .cpp files. - The Charts widget designer plugin is updated according to the module change. - The test cases updated according to the project structure change. Tests are added also for version 2.0. - cmake modules generation is not needed with Qt 5.4 and Qt Charts so it's disabled. - The new module name and version are updated to the plugin.qmltypes file. Task-number: QTRD-2844, QTRD-3217, QTRD-3218, QTRD-3277, QTRD-3228, QTRD-2526, QTRD-3233, QTRD-3222 Change-Id: Ib7fb26057cde710ffaf6bc780c8bf52a16f45160 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'src/charts/animations/piesliceanimation.cpp')
-rw-r--r--src/charts/animations/piesliceanimation.cpp128
1 files changed, 128 insertions, 0 deletions
diff --git a/src/charts/animations/piesliceanimation.cpp b/src/charts/animations/piesliceanimation.cpp
new file mode 100644
index 00000000..0a4503c9
--- /dev/null
+++ b/src/charts/animations/piesliceanimation.cpp
@@ -0,0 +1,128 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the Qt Enterprise Charts Add-on.
+**
+** $QT_BEGIN_LICENSE$
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise 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$
+**
+****************************************************************************/
+
+#include "piesliceanimation_p.h"
+#include "piechartitem_p.h"
+
+Q_DECLARE_METATYPE(QT_CHARTS_NAMESPACE::PieSliceData)
+
+QT_CHARTS_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(PieSliceItem *sliceItem)
+ : ChartAnimation(sliceItem),
+ m_sliceItem(sliceItem),
+ m_currentValue(m_sliceItem->m_data)
+{
+
+}
+
+PieSliceAnimation::~PieSliceAnimation()
+{
+}
+
+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 PieSliceData &endValue)
+{
+ if (state() != QAbstractAnimation::Stopped)
+ stop();
+
+ setKeyValueAt(0.0, qVariantFromValue(m_currentValue));
+ setKeyValueAt(1.0, qVariantFromValue(endValue));
+}
+
+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
+{
+ PieSliceData startValue = qvariant_cast<PieSliceData>(start);
+ PieSliceData endValue = qvariant_cast<PieSliceData>(end);
+
+ 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_slicePen = linearPos(startValue.m_slicePen, endValue.m_slicePen, progress);
+ result.m_sliceBrush = linearPos(startValue.m_sliceBrush, endValue.m_sliceBrush, progress);
+ result.m_holeRadius = linearPos(startValue.m_holeRadius, endValue.m_holeRadius, progress);
+
+ return qVariantFromValue(result);
+}
+
+void PieSliceAnimation::updateCurrentValue(const QVariant &value)
+{
+ if (state() != QAbstractAnimation::Stopped) { //workaround
+ m_currentValue = qvariant_cast<PieSliceData>(value);
+ m_sliceItem->setLayout(m_currentValue);
+ }
+}
+
+QT_CHARTS_END_NAMESPACE