diff --git a/plugins/declarative/declarativecategoryaxis.cpp b/plugins/declarative/declarativecategoryaxis.cpp index b898204..f9ec64b 100644 --- a/plugins/declarative/declarativecategoryaxis.cpp +++ b/plugins/declarative/declarativecategoryaxis.cpp @@ -47,12 +47,23 @@ void DeclarativeCategoryAxis::classBegin() void DeclarativeCategoryAxis::componentComplete() { + QList > ranges; foreach(QObject *child, children()) { if (qobject_cast(child)) { DeclarativeCategoryRange *range = qobject_cast(child); - append(range->label(), range->endValue()); + ranges.append(QPair(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 &value1, const QPair &value2) +{ + return value1.second < value2.second; } QDeclarativeListProperty DeclarativeCategoryAxis::axisChildren() diff --git a/plugins/declarative/declarativecategoryaxis.h b/plugins/declarative/declarativecategoryaxis.h index f720c97..84aeb25 100644 --- a/plugins/declarative/declarativecategoryaxis.h +++ b/plugins/declarative/declarativecategoryaxis.h @@ -70,6 +70,9 @@ public Q_SLOTS: Q_INVOKABLE void remove(const QString &label); Q_INVOKABLE void replace(const QString& oldLabel, const QString& newLabel); static void appendAxisChildren(QDeclarativeListProperty *list, QObject *element); + +private: + static bool endValueLessThan(const QPair &value1, const QPair &value2); }; QTCOMMERCIALCHART_END_NAMESPACE