Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kf6-kquickcharts for
openSUSE:Factory checked in at 2024-04-15 20:12:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kf6-kquickcharts (Old)
and /work/SRC/openSUSE:Factory/.kf6-kquickcharts.new.26366 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kf6-kquickcharts"
Mon Apr 15 20:12:17 2024 rev:2 rq:1167207 version:6.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kf6-kquickcharts/kf6-kquickcharts.changes
2024-03-11 15:26:40.798411321 +0100
+++
/work/SRC/openSUSE:Factory/.kf6-kquickcharts.new.26366/kf6-kquickcharts.changes
2024-04-15 20:15:40.382400696 +0200
@@ -1,0 +2,17 @@
+Fri Apr 5 12:52:54 UTC 2024 - Christophe Marin <[email protected]>
+
+- Update to 6.1.0
+ * New feature release
+- Changes since 6.0.0:
+ * update version for new release
+ * Declare QML module dependencies
+ * Generate default set of GLSL shaders (kde#482988)
+ * examples: Remove separator from main page list items
+ * piechartnode: Rename updateTriangles to updateSegments
+ * piechartnode: Remove some unused stuff
+ * examples: Change "smooth" to "interpolate"
+ * piechart: Use the right amount of thickness for the chart
+ * linechart: Use fwidth of the point instead of sdf to avoid conditional
fwidth (kde#434462)
+ * sdf: Allow specifying fwidth() to sdf_render()
+
+-------------------------------------------------------------------
Old:
----
kquickcharts-6.0.0.tar.xz
kquickcharts-6.0.0.tar.xz.sig
New:
----
kquickcharts-6.1.0.tar.xz
kquickcharts-6.1.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kf6-kquickcharts.spec ++++++
--- /var/tmp/diff_new_pack.t19O0i/_old 2024-04-15 20:15:42.186467093 +0200
+++ /var/tmp/diff_new_pack.t19O0i/_new 2024-04-15 20:15:42.186467093 +0200
@@ -1,7 +1,7 @@
#
# spec file for package kf6-kquickcharts
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,13 @@
%define qt6_version 6.6.0
%define rname kquickcharts
-# Full KF6 version (e.g. 6.0.0)
+# Full KF6 version (e.g. 6.1.0)
%{!?_kf6_version: %global _kf6_version %{version}}
# Last major and minor KF6 version (e.g. 6.0)
%{!?_kf6_bugfix_version: %define _kf6_bugfix_version %(echo %{_kf6_version} |
awk -F. '{print $1"."$2}')}
%bcond_without released
Name: kf6-kquickcharts
-Version: 6.0.0
+Version: 6.1.0
Release: 0
Summary: Set of charts for QtQuick applications
License: LGPL-2.1-or-later
++++++ kquickcharts-6.0.0.tar.xz -> kquickcharts-6.1.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kquickcharts-6.0.0/CMakeLists.txt
new/kquickcharts-6.1.0/CMakeLists.txt
--- old/kquickcharts-6.0.0/CMakeLists.txt 2024-02-21 12:26:59.000000000
+0100
+++ new/kquickcharts-6.1.0/CMakeLists.txt 2024-04-05 12:58:27.000000000
+0200
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 3.16)
-set(KF_VERSION "6.0.0") # handled by release scripts
-set(KF_DEP_VERSION "6.0.0") # handled by release scripts
+set(KF_VERSION "6.1.0") # handled by release scripts
+set(KF_DEP_VERSION "6.1.0") # handled by release scripts
project(KQuickCharts VERSION ${KF_VERSION})
include(FeatureSummary)
-find_package(ECM 6.0.0 NO_MODULE)
+find_package(ECM 6.1.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-6.0.0/controls/CMakeLists.txt
new/kquickcharts-6.1.0/controls/CMakeLists.txt
--- old/kquickcharts-6.0.0/controls/CMakeLists.txt 2024-02-21
12:26:59.000000000 +0100
+++ new/kquickcharts-6.1.0/controls/CMakeLists.txt 2024-04-05
12:58:27.000000000 +0200
@@ -5,7 +5,7 @@
VERSION ${KF6QuickCharts_VERSION}
)
-ecm_add_qml_module(QuickChartsControls URI "org.kde.quickcharts.controls"
VERSION 1.0 GENERATE_PLUGIN_SOURCE)
+ecm_add_qml_module(QuickChartsControls URI "org.kde.quickcharts.controls"
VERSION 1.0 DEPENDENCIES QtCore QtQuick GENERATE_PLUGIN_SOURCE)
target_sources(QuickChartsControls PRIVATE
AxisLabels.cpp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kquickcharts-6.0.0/examples/charts/HistoryProxySource.qml
new/kquickcharts-6.1.0/examples/charts/HistoryProxySource.qml
--- old/kquickcharts-6.0.0/examples/charts/HistoryProxySource.qml
2024-02-21 12:26:59.000000000 +0100
+++ new/kquickcharts-6.1.0/examples/charts/HistoryProxySource.qml
2024-04-05 12:58:27.000000000 +0200
@@ -83,9 +83,9 @@
onValueModified: historySource.maximumHistory = value
}
CheckBox {
- text: "Smooth"
- checked: chart.smooth
- onToggled: chart.smooth = checked
+ text: "Interpolate"
+ checked: chart.interpolate
+ onToggled: chart.interpolate = checked
}
Label { text : "Interval" }
SpinBox {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kquickcharts-6.0.0/examples/charts/LineChart.qml
new/kquickcharts-6.1.0/examples/charts/LineChart.qml
--- old/kquickcharts-6.0.0/examples/charts/LineChart.qml 2024-02-21
12:26:59.000000000 +0100
+++ new/kquickcharts-6.1.0/examples/charts/LineChart.qml 2024-04-05
12:58:27.000000000 +0200
@@ -86,7 +86,7 @@
Label { text: "Fill Opacity" }
SpinBox { from: 0; to: 100; value: lineChart.fillOpacity * 100;
onValueModified: lineChart.fillOpacity = value / 100; }
CheckBox { text: "Stacked"; checked: lineChart.stacked; onToggled:
lineChart.stacked = checked }
- CheckBox { text: "Smooth"; checked: lineChart.chart.smooth;
onToggled: lineChart.chart.smooth = checked }
+ CheckBox { text: "Interpolate"; checked:
lineChart.chart.interpolate; onToggled: lineChart.chart.interpolate = checked }
}
Frame {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kquickcharts-6.0.0/examples/charts/main.qml
new/kquickcharts-6.1.0/examples/charts/main.qml
--- old/kquickcharts-6.0.0/examples/charts/main.qml 2024-02-21
12:26:59.000000000 +0100
+++ new/kquickcharts-6.1.0/examples/charts/main.qml 2024-04-05
12:58:27.000000000 +0200
@@ -33,8 +33,6 @@
text: model.label
onClicked: applicationWindow().pageStack.push(model.file);
-
- Kirigami.Separator { width: parent.width }
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kquickcharts-6.0.0/src/CMakeLists.txt
new/kquickcharts-6.1.0/src/CMakeLists.txt
--- old/kquickcharts-6.0.0/src/CMakeLists.txt 2024-02-21 12:26:59.000000000
+0100
+++ new/kquickcharts-6.1.0/src/CMakeLists.txt 2024-04-05 12:58:27.000000000
+0200
@@ -5,7 +5,7 @@
VERSION ${KF6QuickCharts_VERSION}
)
-ecm_add_qml_module(QuickCharts URI "org.kde.quickcharts" VERSION 1.0
GENERATE_PLUGIN_SOURCE)
+ecm_add_qml_module(QuickCharts URI "org.kde.quickcharts" VERSION 1.0
DEPENDENCIES QtQuick GENERATE_PLUGIN_SOURCE)
target_sources(QuickCharts PRIVATE
BarChart.cpp
@@ -104,7 +104,6 @@
ZORDER_LOC 6
PRECOMPILE
PREFIX "/qt/qml/org/kde/quickcharts/shaders/"
- GLSL "300es,130"
FILES
shaders/barchart.vert
shaders/barchart.frag
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kquickcharts-6.0.0/src/PieChart.cpp
new/kquickcharts-6.1.0/src/PieChart.cpp
--- old/kquickcharts-6.0.0/src/PieChart.cpp 2024-02-21 12:26:59.000000000
+0100
+++ new/kquickcharts-6.1.0/src/PieChart.cpp 2024-04-05 12:58:27.000000000
+0200
@@ -155,7 +155,7 @@
float outerRadius = minDimension;
for (int i = 0; i < sourceCount; ++i) {
- float innerRadius = i == sourceCount - 1 && m_filled ? 0.0 :
outerRadius - m_thickness;
+ float innerRadius = i == sourceCount - 1 && m_filled ? 0.0 :
outerRadius - m_thickness * 2.0;
if (node->childCount() <= i) {
node->appendChildNode(new PieChartNode{});
@@ -172,7 +172,7 @@
pieNode->setToAngle(m_toAngle);
pieNode->setSmoothEnds(m_smoothEnds);
- outerRadius = outerRadius - m_thickness - m_spacing;
+ outerRadius = innerRadius - m_spacing * 2.0;
}
while (node->childCount() > sourceCount) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kquickcharts-6.0.0/src/scenegraph/PieChartMaterial.cpp
new/kquickcharts-6.1.0/src/scenegraph/PieChartMaterial.cpp
--- old/kquickcharts-6.0.0/src/scenegraph/PieChartMaterial.cpp 2024-02-21
12:26:59.000000000 +0100
+++ new/kquickcharts-6.1.0/src/scenegraph/PieChartMaterial.cpp 2024-04-05
12:58:27.000000000 +0200
@@ -152,7 +152,7 @@
const auto material = static_cast<PieChartMaterial *>(newMaterial);
uniformData << material->aspectRatio() << material->innerRadius() <<
material->outerRadius() << material->backgroundColor() //
- << material->smoothEnds() << material->fromAngle() <<
material->toAngle();
+ << int(material->smoothEnds()) << material->fromAngle() <<
material->toAngle();
const auto segmentCount = uint(material->segments().size());
uniformData << segmentCount;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kquickcharts-6.0.0/src/scenegraph/PieChartNode.cpp
new/kquickcharts-6.1.0/src/scenegraph/PieChartNode.cpp
--- old/kquickcharts-6.0.0/src/scenegraph/PieChartNode.cpp 2024-02-21
12:26:59.000000000 +0100
+++ new/kquickcharts-6.1.0/src/scenegraph/PieChartNode.cpp 2024-04-05
12:58:27.000000000 +0200
@@ -16,7 +16,6 @@
#include "PieChartMaterial.h"
static const qreal pi = std::acos(-1.0);
-static const qreal sectionSize = pi * 0.5;
inline QVector4D colorToVec4(const QColor &color)
{
@@ -28,13 +27,6 @@
return (deg / 180.0) * pi;
}
-inline QVector2D rotated(const QVector2D vector, qreal angle)
-{
- auto newX = vector.x() * std::cos(angle) - vector.y() * std::sin(angle);
- auto newY = vector.x() * std::sin(angle) + vector.y() * std::cos(angle);
- return QVector2D(newX, newY);
-}
-
PieChartNode::PieChartNode()
: PieChartNode(QRectF{})
{
@@ -110,13 +102,13 @@
void PieChartNode::setColors(const QList<QColor> &colors)
{
m_colors = colors;
- updateTriangles();
+ updateSegments();
}
void PieChartNode::setSections(const QList<qreal> §ions)
{
m_sections = sections;
- updateTriangles();
+ updateSegments();
}
void PieChartNode::setBackgroundColor(const QColor &color)
@@ -138,7 +130,7 @@
m_fromAngle = angle;
m_material->setFromAngle(degToRad(angle));
- updateTriangles();
+ updateSegments();
}
void PieChartNode::setToAngle(qreal angle)
@@ -149,7 +141,7 @@
m_toAngle = angle;
m_material->setToAngle(degToRad(angle));
- updateTriangles();
+ updateSegments();
}
void PieChartNode::setSmoothEnds(bool smooth)
@@ -163,7 +155,7 @@
markDirty(QSGNode::DirtyMaterial);
}
-void PieChartNode::updateTriangles()
+void PieChartNode::updateSegments()
{
if (m_sections.isEmpty() || m_sections.size() != m_colors.size()) {
return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kquickcharts-6.0.0/src/scenegraph/PieChartNode.h
new/kquickcharts-6.1.0/src/scenegraph/PieChartNode.h
--- old/kquickcharts-6.0.0/src/scenegraph/PieChartNode.h 2024-02-21
12:26:59.000000000 +0100
+++ new/kquickcharts-6.1.0/src/scenegraph/PieChartNode.h 2024-04-05
12:58:27.000000000 +0200
@@ -43,7 +43,7 @@
void setSmoothEnds(bool smooth);
private:
- void updateTriangles();
+ void updateSegments();
QRectF m_rect;
qreal m_innerRadius = 0.0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kquickcharts-6.0.0/src/shaders/linechart.frag
new/kquickcharts-6.1.0/src/shaders/linechart.frag
--- old/kquickcharts-6.0.0/src/shaders/linechart.frag 2024-02-21
12:26:59.000000000 +0100
+++ new/kquickcharts-6.1.0/src/shaders/linechart.frag 2024-04-05
12:58:27.000000000 +0200
@@ -10,6 +10,7 @@
#extension GL_GOOGLE_include_directive: enable
#include "sdf.glsl"
+#line 13
layout(std140, binding = 0) uniform buf {
highp mat4 matrix;
@@ -70,6 +71,7 @@
void main()
{
lowp vec2 point = uv;
+ lowp float fwidthPoint = fwidth(point.x + point.y);
lowp vec4 color = vec4(0.0, 0.0, 0.0, 0.0);
@@ -78,8 +80,7 @@
// bounds.y contains the line segment's maximum value. If we are a bit
above
// that, we will never render anything, so just discard the pixel.
if (point.y > bounds.y + bounds_range) {
- out_color = vec4(0.0);
- return;
+ discard;
}
// bounds.x contains the line segment's minimum value. If we are a bit
below
@@ -92,7 +93,7 @@
lowp float polygon = sdf_polygon(point, int(pointCount));
- color = sdf_render(polygon, color, fillColor);
+ color = sdf_render(polygon, fwidthPoint, color, fillColor, 1.0,
ubuf.smoothing);
if (ubuf.lineWidth > 0.0) {
color = mix(color, lineColor, 1.0 - smoothstep(-ubuf.smoothing,
ubuf.smoothing, sdf_annular(polygon, ubuf.lineWidth)));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kquickcharts-6.0.0/src/shaders/piechart.frag
new/kquickcharts-6.1.0/src/shaders/piechart.frag
--- old/kquickcharts-6.0.0/src/shaders/piechart.frag 2024-02-21
12:26:59.000000000 +0100
+++ new/kquickcharts-6.1.0/src/shaders/piechart.frag 2024-04-05
12:58:27.000000000 +0200
@@ -25,7 +25,7 @@
lowp float innerRadius;
lowp float outerRadius;
lowp vec4 backgroundColor;
- bool smoothEnds;
+ int smoothEnds;
lowp float fromAngle;
lowp float toAngle;
@@ -50,7 +50,7 @@
lowp vec4 color = vec4(0.0);
lowp float thickness = (ubuf.outerRadius - ubuf.innerRadius) / 2.0;
- lowp float rounding = ubuf.smoothEnds ? thickness : 0.0;
+ lowp float rounding = ubuf.smoothEnds > 0 ? thickness : 0.0;
// Background first, slightly smaller than the actual pie to avoid
antialiasing artifacts.
lowp float background_rounding = (ubuf.toAngle - ubuf.fromAngle) >= 2.0 *
pi ? 0.001 : rounding + 0.001;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kquickcharts-6.0.0/src/shaders/piechart.vert
new/kquickcharts-6.1.0/src/shaders/piechart.vert
--- old/kquickcharts-6.0.0/src/shaders/piechart.vert 2024-02-21
12:26:59.000000000 +0100
+++ new/kquickcharts-6.1.0/src/shaders/piechart.vert 2024-04-05
12:58:27.000000000 +0200
@@ -15,7 +15,7 @@
lowp float innerRadius;
lowp float outerRadius;
lowp vec4 backgroundColor;
- bool smoothEnds;
+ int smoothEnds;
lowp float fromAngle;
lowp float toAngle;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kquickcharts-6.0.0/src/shaders/sdf.glsl
new/kquickcharts-6.1.0/src/shaders/sdf.glsl
--- old/kquickcharts-6.0.0/src/shaders/sdf.glsl 2024-02-21 12:26:59.000000000
+0100
+++ new/kquickcharts-6.1.0/src/shaders/sdf.glsl 2024-04-05 12:58:27.000000000
+0200
@@ -238,45 +238,43 @@
// A constant for a default level of smoothing when rendering an sdf.
const lowp float sdf_default_smoothing = 0.625;
-// Render an sdf shape.
-//
-// This will render the sdf shape on top of whatever source color is input,
-// making sure to apply smoothing if desired.
-//
-// \param sdf The sdf shape to render.
-// \param sourceColor The source color to render on top of.
-// \param sdfColor The color to use for rendering the sdf shape.
-//
-// \return sourceColor with the sdf shape rendered on top.
-lowp vec4 sdf_render(in lowp float sdf, in lowp vec4 sourceColor, in lowp vec4
sdfColor)
+/**
+ * Render an sdf shape alpha-blended onto an existing color.
+ *
+ * \param sdf The sdf shape to render.
+ * \param fwidthSdf fwidth() of the sdf. This is a separte argument because
+ * fwidth() cannot be used in conditional contexts.
+ * \param sourceColor The source color to render on top of.
+ * \param sdfColor The color to use for rendering the sdf shape.
+ * \param alpha The alpha to use for blending.
+ * \param smoothing The amount of smoothing to apply to the sdf.
+ *
+ * \return sourceColor with the sdf shape rendered on top.
+ */
+lowp vec4 sdf_render(in lowp float sdf, in lowp float fwidthSdf, in lowp vec4
sourceColor, in lowp vec4 sdfColor, in lowp float alpha, in lowp float
smoothing)
{
- lowp float g = fwidth(sdf);
- return mix(sourceColor, sdfColor, 1.0 - smoothstep(-sdf_default_smoothing
* g, sdf_default_smoothing * g, sdf));
+ lowp float g = smoothing * fwidthSdf;
+ return mix(sourceColor, sdfColor, alpha * (1.0 - smoothstep(-g, g, sdf)));
}
-// Render an sdf shape.
-//
-// This is an overload of sdf_render(float, vec4, vec4) that allows specifying
a
-// smoothing amount.
-//
-// \param smoothing The amount of smoothing to apply to the sdf.
-//
-lowp vec4 sdf_render(in lowp float sdf, in lowp vec4 sourceColor, in lowp vec4
sdfColor, in lowp float smoothing)
+/**
+ * Render an sdf shape.
+ *
+ * This is an overload of sdf_render(float, vec4, vec4, float, float) that uses
+ * 1.0 for blending value and sdf_default_smoothing for smoothing.
+ */
+lowp vec4 sdf_render(in lowp float sdf, in lowp vec4 sourceColor, in lowp vec4
sdfColor)
{
- lowp float g = fwidth(sdf);
- return mix(sourceColor, sdfColor, 1.0 - smoothstep(-smoothing * g,
smoothing * g, sdf));
+ return sdf_render(sdf, fwidth(sdf), sourceColor, sdfColor, 1.0,
sdf_default_smoothing);
}
-// Render an sdf shape alpha-blended onto an existing color.
-//
-// This is an overload of sdf_render(float, vec4, vec4) that allows specifying
a
-// blending amount and a smoothing amount.
-//
-// \param alpha The alpha to use for blending.
-// \param smoothing The amount of smoothing to apply to the sdf.
-//
-lowp vec4 sdf_render(in lowp float sdf, in lowp vec4 sourceColor, in lowp vec4
sdfColor, in lowp float alpha, in lowp float smoothing)
+/**
+ * Render an sdf shape.
+ *
+ * This is an overload of sdf_render(float, vec4, vec4, float, float) that uses
+ * 1.0 for blending value but allows specifying a smoothing amount.
+ */
+lowp vec4 sdf_render(in lowp float sdf, in lowp vec4 sourceColor, in lowp vec4
sdfColor, in lowp float smoothing)
{
- lowp float g = fwidth(sdf);
- return mix(sourceColor, sdfColor, alpha * (1.0 - smoothstep(-smoothing *
g, smoothing * g, sdf)));
+ return sdf_render(sdf, fwidth(sdf), sourceColor, sdfColor, 1.0, smoothing);
}
