##// END OF EJS Templates
Check that areaseries is actually in chart before trying to update....
Check that areaseries is actually in chart before trying to update. When a line series is used both as a series on chart and as an area series boundary, but not at the same time, animation can sometimes get confused as to what series to update if the area series is removed from the chart and the line series is added to the chart while a series animation is running. Task-number: QTRD-3445 Change-Id: Ia3d72d3ceba784b6e162b2c9b678acdc3e3ffcac Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>

File last commit:

r2799:e9626fb58a47
r2800:891ed0097501
Show More
declarativecategoryaxis.cpp
111 lines | 3.3 KiB | text/x-c | CppLexer
/ src / chartsqml2 / declarativecategoryaxis.cpp
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd
** All rights reserved.
** For any questions to The Qt Company, please use contact form at http://qt.io
**
** This file is part of the Qt Charts module.
**
** Licensees holding valid commercial license for Qt may use this file in
** accordance with the Qt License Agreement provided with the Software
** or, alternatively, in accordance with the terms contained in a written
** agreement between you and The Qt Company.
**
** If you have questions regarding the use of this file, please use
** contact form at http://qt.io
**
****************************************************************************/
#include "declarativecategoryaxis.h"
#include <QtCore/QDebug>
QT_CHARTS_BEGIN_NAMESPACE
/*!
\qmltype CategoryRange
\inqmlmodule QtCharts
\brief With CategoryRange you can define a range used by a CategoryAxis.
\sa CategoryAxis
*/
DeclarativeCategoryRange::DeclarativeCategoryRange(QObject *parent) :
QObject(parent),
m_endValue(0),
m_label(QString())
{
}
DeclarativeCategoryAxis::DeclarativeCategoryAxis(QObject *parent) :
QCategoryAxis(parent)
{
}
void DeclarativeCategoryAxis::classBegin()
{
}
void DeclarativeCategoryAxis::componentComplete()
{
QList<QPair<QString, qreal> > ranges;
foreach (QObject *child, children()) {
if (qobject_cast<DeclarativeCategoryRange *>(child)) {
DeclarativeCategoryRange *range = qobject_cast<DeclarativeCategoryRange *>(child);
ranges.append(QPair<QString, qreal>(range->label(), range->endValue()));
}
}
// Sort and append the range objects according to end value
qSort(ranges.begin(), ranges.end(), endValueLessThan);
for (int i(0); i < ranges.count(); i++)
append(ranges.at(i).first, ranges.at(i).second);
}
bool DeclarativeCategoryAxis::endValueLessThan(const QPair<QString, qreal> &value1, const QPair<QString, qreal> &value2)
{
return value1.second < value2.second;
}
QQmlListProperty<QObject> DeclarativeCategoryAxis::axisChildren()
{
return QQmlListProperty<QObject>(this, 0, &DeclarativeCategoryAxis::appendAxisChildren ,0,0,0);
}
void DeclarativeCategoryAxis::append(const QString &label, qreal categoryEndValue)
{
QCategoryAxis::append(label, categoryEndValue);
}
void DeclarativeCategoryAxis::remove(const QString &label)
{
QCategoryAxis::remove(label);
}
void DeclarativeCategoryAxis::replace(const QString &oldLabel, const QString &newLabel)
{
QCategoryAxis::replaceLabel(oldLabel, newLabel);
}
void DeclarativeCategoryAxis::appendAxisChildren(QQmlListProperty<QObject> *list, QObject *element)
{
// Empty implementation; the children are parsed in componentComplete instead
Q_UNUSED(list)
Q_UNUSED(element)
}
DeclarativeCategoryAxis::AxisLabelsPosition DeclarativeCategoryAxis::labelsPosition() const
{
return (DeclarativeCategoryAxis::AxisLabelsPosition) QCategoryAxis::labelsPosition();
}
void DeclarativeCategoryAxis::setLabelsPosition(AxisLabelsPosition position)
{
if (position != m_labelsPosition) {
QCategoryAxis::setLabelsPosition((QCategoryAxis::AxisLabelsPosition)position);
emit labelsPositionChanged(position);
}
}
#include "moc_declarativecategoryaxis.cpp"
QT_CHARTS_END_NAMESPACE