Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kquickcharts for openSUSE:Factory checked in at 2022-08-15 19:57:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kquickcharts (Old) and /work/SRC/openSUSE:Factory/.kquickcharts.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kquickcharts" Mon Aug 15 19:57:37 2022 rev:33 rq:994998 version:5.97.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kquickcharts/kquickcharts.changes 2022-07-11 19:10:26.363699466 +0200 +++ /work/SRC/openSUSE:Factory/.kquickcharts.new.1521/kquickcharts.changes 2022-08-15 19:59:41.345305854 +0200 @@ -1,0 +2,12 @@ +Sun Aug 7 22:27:37 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.97.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.97.0 +- Changes since 5.96.0: + * Remove arcconfig + * BarChart: de-duplicate some code + * Remove an unused method + +------------------------------------------------------------------- Old: ---- kquickcharts-5.96.0.tar.xz kquickcharts-5.96.0.tar.xz.sig New: ---- kquickcharts-5.97.0.tar.xz kquickcharts-5.97.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kquickcharts.spec ++++++ --- /var/tmp/diff_new_pack.AgELlU/_old 2022-08-15 19:59:41.773307047 +0200 +++ /var/tmp/diff_new_pack.AgELlU/_new 2022-08-15 19:59:41.777307058 +0200 @@ -16,14 +16,14 @@ # -%define _tar_path 5.96 +%define _tar_path 5.97 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kquickcharts -Version: 5.96.0 +Version: 5.97.0 Release: 0 Summary: Set of charts for QtQuick applications License: LGPL-2.1-or-later ++++++ kquickcharts-5.96.0.tar.xz -> kquickcharts-5.97.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.96.0/.arcconfig new/kquickcharts-5.97.0/.arcconfig --- old/kquickcharts-5.96.0/.arcconfig 2022-07-02 16:37:22.000000000 +0200 +++ new/kquickcharts-5.97.0/.arcconfig 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -{ - "phabricator.uri" : "https://phabricator.kde.org/"; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.96.0/CMakeLists.txt new/kquickcharts-5.97.0/CMakeLists.txt --- old/kquickcharts-5.96.0/CMakeLists.txt 2022-07-02 16:37:22.000000000 +0200 +++ new/kquickcharts-5.97.0/CMakeLists.txt 2022-08-07 14:21:53.000000000 +0200 @@ -1,12 +1,12 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.96.0") # handled by release scripts -set(KF_DEP_VERSION "5.96.0") # handled by release scripts +set(KF_VERSION "5.97.0") # handled by release scripts +set(KF_DEP_VERSION "5.97.0") # handled by release scripts project(KQuickCharts VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.96.0 NO_MODULE) +find_package(ECM 5.97.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.96.0/src/BarChart.cpp new/kquickcharts-5.97.0/src/BarChart.cpp --- old/kquickcharts-5.96.0/src/BarChart.cpp 2022-07-02 16:37:22.000000000 +0200 +++ new/kquickcharts-5.97.0/src/BarChart.cpp 2022-08-07 14:21:53.000000000 +0200 @@ -154,7 +154,7 @@ return; } - m_values.clear(); + m_barDataItems.clear(); updateComputedRange(); @@ -164,14 +164,14 @@ auto indexMode = indexingMode(); auto colorIndex = 0; - m_values.fill(QVector<QPair<qreal, QColor>>{}, range.distanceX); + m_barDataItems.fill(QVector<BarData>{}, range.distanceX); - auto generator = [&, i = range.startX]() mutable -> QVector<QPair<qreal, QColor>> { - QVector<QPair<qreal, QColor>> values; + auto generator = [&, this, i = range.startX]() mutable -> QVector<BarData> { + QVector<BarData> colorInfos; for (int j = 0; j < sources.count(); ++j) { auto value = (sources.at(j)->item(i).toReal() - range.startY) / range.distanceY; - values << QPair<qreal, QColor>(value, colors->item(colorIndex).value<QColor>()); + colorInfos << BarData{value, colors->item(colorIndex).value<QColor>()}; if (indexMode != Chart::IndexSourceValues) { colorIndex++; @@ -180,9 +180,9 @@ if (stacked()) { auto previous = 0.0; - for (auto &value : values) { - value.first += previous; - previous = value.first; + for (auto &[colorVal, _] : colorInfos) { + colorVal += previous; + previous = colorVal; } } @@ -193,13 +193,13 @@ } i++; - return values; + return colorInfos; }; if (direction() == Direction::ZeroAtStart) { - std::generate_n(m_values.begin(), range.distanceX, generator); + std::generate_n(m_barDataItems.begin(), range.distanceX, generator); } else { - std::generate_n(m_values.rbegin(), range.distanceX, generator); + std::generate_n(m_barDataItems.rbegin(), range.distanceX, generator); } update(); @@ -215,55 +215,51 @@ float w = m_barWidth; if (w < 0.0) { - auto totalItemCount = stacked() ? m_values.size() : m_values.size() * valueSources().count(); + const auto totalItemCount = stacked() ? m_barDataItems.size() : m_barDataItems.size() * valueSources().count(); - if (stacked()) { - w = targetWidth / totalItemCount - m_spacing; + w = targetWidth / totalItemCount - m_spacing; - auto x = float(m_spacing / 2); - auto itemSpacing = w + m_spacing; + auto x = float(m_spacing / 2); + const auto itemSpacing = w + m_spacing; - for (const auto &items : qAsConst(m_values)) { - for (int i = items.count() - 1; i >= 0; --i) { - auto entry = items.at(i); - result << Bar{x, w, float(entry.first), entry.second}; - } + for (const auto &items : qAsConst(m_barDataItems)) { + result.reserve(result.size() + items.size()); + if (stacked()) { + std::transform(items.crbegin(), items.crend(), std::back_inserter(result), [x, w](const BarData &entry) { + return Bar{x, w, float(entry.value), entry.color}; + }); x += itemSpacing; - } - } else { - w = targetWidth / totalItemCount - m_spacing; - - auto x = float(m_spacing / 2); - auto itemSpacing = w + m_spacing; - - for (const auto &items : qAsConst(m_values)) { - for (const auto &entry : items) { - result << Bar{x, w, float(entry.first), entry.second}; + } else { + std::transform(items.cbegin(), items.cend(), std::back_inserter(result), [&x, itemSpacing, w](const BarData &entry) { + Bar bar{x, w, float(entry.value), entry.color}; x += itemSpacing; - } + return bar; + }); } } } else { - auto itemSpacing = targetWidth / m_values.size(); + const auto itemSpacing = targetWidth / m_barDataItems.size(); if (stacked()) { auto x = float(itemSpacing / 2 - m_barWidth / 2); - for (const auto &items : qAsConst(m_values)) { - for (int i = items.count() - 1; i >= 0; --i) { - auto entry = items.at(i); - result << Bar{x, w, float(entry.first), entry.second}; - } + for (const auto &items : qAsConst(m_barDataItems)) { + result.reserve(result.size() + items.size()); + std::transform(items.crbegin(), items.crend(), std::back_inserter(result), [x, w](const BarData &entry) { + return Bar{x, w, float(entry.value), entry.color}; + }); + x += itemSpacing; } } else { - auto totalWidth = m_barWidth * valueSources().count() + m_spacing * (valueSources().count() - 1); + const auto totalWidth = m_barWidth * valueSources().count() + m_spacing * (valueSources().count() - 1); auto x = float(itemSpacing / 2 - totalWidth / 2); - for (const auto &items : qAsConst(m_values)) { + for (const auto &items : qAsConst(m_barDataItems)) { + result.reserve(result.size() + items.size()); for (int i = 0; i < items.count(); ++i) { auto entry = items.at(i); - result << Bar{float(x + i * (m_barWidth + m_spacing)), w, float(entry.first), entry.second}; + result << Bar{float(x + i * (m_barWidth + m_spacing)), w, float(entry.value), entry.color}; } x += itemSpacing; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.96.0/src/BarChart.h new/kquickcharts-5.97.0/src/BarChart.h --- old/kquickcharts-5.96.0/src/BarChart.h 2022-07-02 16:37:22.000000000 +0200 +++ new/kquickcharts-5.97.0/src/BarChart.h 2022-08-07 14:21:53.000000000 +0200 @@ -113,7 +113,11 @@ qreal m_radius = 0.0; Orientation m_orientation = VerticalOrientation; bool m_orientationChanged = false; - QVector<QVector<QPair<qreal, QColor>>> m_values; + struct BarData { + qreal value = 0; + QColor color; + }; + QVector<QVector<BarData>> m_barDataItems; QColor m_backgroundColor = Qt::transparent; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kquickcharts-5.96.0/src/scenegraph/BarChartNode.cpp new/kquickcharts-5.97.0/src/scenegraph/BarChartNode.cpp --- old/kquickcharts-5.96.0/src/scenegraph/BarChartNode.cpp 2022-07-02 16:37:22.000000000 +0200 +++ new/kquickcharts-5.97.0/src/scenegraph/BarChartNode.cpp 2022-08-07 14:21:53.000000000 +0200 @@ -94,11 +94,6 @@ float value; }; -bool compareCount(const QVector<QPair<qreal, QColor>> &first, const QVector<QPair<qreal, QColor>> &second) -{ - return first.count() < second.count(); -} - BarChartNode::BarChartNode() { }
