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

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

Fix label truncate issues with multiple axes...
Fix label truncate issues with multiple axes If there were multiple axes on single side of the chart, the axes wider/higher than average never got their preferred size, causing labels to truncate. Fixed by calculating the required squeeze ratio instead of just blindly using even fraction of available space. Task-number: QTRD-1897 Reviewed-by: Mika Salmela
Marek Rosa - - Load All Authors

File last commit:

r2320:b9410ebe3045
r2411:6fca0e6f42a3
Show More
baranimation.cpp
82 lines | 2.6 KiB | text/x-c | CppLexer
/ src / animations / baranimation.cpp
History | Source | Raw |Copy content |Copy permalink
Jani Honkonen
Add license headers
 r794 /****************************************************************************
**
** Copyright (C) 2012 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 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$
**
****************************************************************************/
sauimone
Animation framework for barchart.
 r671 #include "baranimation_p.h"
sauimone
refactoring internal barchart items
 r1674 #include "abstractbarchartitem_p.h"
sauimone
Animation framework for barchart.
 r671
sauimone
barchart animation mechanics working. still some todo
 r681 Q_DECLARE_METATYPE(QVector<QRectF>)
sauimone
Animation framework for barchart.
 r671
QTCOMMERCIALCHART_BEGIN_NAMESPACE
sauimone
refactoring internal barchart items
 r1674 BarAnimation::BarAnimation(AbstractBarChartItem *item)
Marek Rosa
Bar animations refactored
 r2316 : ChartAnimation(item),
m_item(item)
sauimone
Animation framework for barchart.
 r671 {
Marek Rosa
Bar animations refactored
 r2316 setDuration(ChartAnimationDuration);
setEasingCurve(QEasingCurve::OutQuart);
sauimone
Animation framework for barchart.
 r671 }
BarAnimation::~BarAnimation()
{
}
QVariant BarAnimation::interpolated(const QVariant &from, const QVariant &to, qreal progress) const
{
Jani Honkonen
Fix deprecation errors from Qt5
 r2241 QVector<QRectF> startVector = qvariant_cast<QVector<QRectF> >(from);
QVector<QRectF> endVector = qvariant_cast<QVector<QRectF> >(to);
sauimone
barchart animation mechanics working. still some todo
 r681 QVector<QRectF> result;
sauimone
Animation framework for barchart.
 r671
Marek Rosa
PieSeries: model now supports custom mapping.
 r1056 Q_ASSERT(startVector.count() == endVector.count());
sauimone
Animation framework for barchart.
 r671
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 for (int i = 0; i < startVector.count(); i++) {
sauimone
correct interpolation for baranimation
 r1879 QRectF start = startVector[i].normalized();
QRectF end = endVector[i].normalized();
Marek Rosa
Bar animations refactored
 r2316 qreal x1 = start.left() + progress * (end.left() - start.left());
qreal x2 = start.right() + progress * (end.right() - start.right());
qreal y1 = start.top() + progress * (end.top() - start.top());
qreal y2 = start.bottom() + progress * (end.bottom() - start.bottom());
sauimone
correct interpolation for baranimation
 r1879
Marek Rosa
Bar animations refactored
 r2316 QRectF value(QPointF(x1, y1), QPointF(x2, y2));
sauimone
fix to baranimations leaving crap on screen with negative bars
 r1824 result << value.normalized();
sauimone
Animation framework for barchart.
 r671 }
return qVariantFromValue(result);
}
Marek Rosa
Bar animations refactored
 r2316 void BarAnimation::updateCurrentValue(const QVariant &value)
{
Marek Rosa
Fixed baranimation blinking
 r2320 if (state() != QAbstractAnimation::Stopped) { //workaround
QVector<QRectF> layout = qvariant_cast<QVector<QRectF> >(value);
m_item->setLayout(layout);
}
Marek Rosa
Bar animations refactored
 r2316 }
void BarAnimation::setup(const QVector<QRectF> &oldLayout, const QVector<QRectF> &newLayout)
{
QVariantAnimation::KeyValues value;
setKeyValues(value); //workaround for wrong interpolation call
setKeyValueAt(0.0, qVariantFromValue(oldLayout));
setKeyValueAt(1.0, qVariantFromValue(newLayout));
}
sauimone
Animation framework for barchart.
 r671 #include "moc_baranimation_p.cpp"
QTCOMMERCIALCHART_END_NAMESPACE
Marek Rosa
Bar animations refactored
 r2316