Hello community, here is the log from the commit of package kdiagram for openSUSE:Factory checked in at 2020-03-31 17:32:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdiagram (Old) and /work/SRC/openSUSE:Factory/.kdiagram.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdiagram" Tue Mar 31 17:32:11 2020 rev:3 rq:789521 version:2.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kdiagram/kdiagram.changes 2018-04-25 09:55:41.663294894 +0200 +++ /work/SRC/openSUSE:Factory/.kdiagram.new.3160/kdiagram.changes 2020-03-31 17:32:21.168264264 +0200 @@ -1,0 +2,13 @@ +Sun Mar 29 10:51:37 UTC 2020 - wbauer@tmo.at + +- Update to 2.6.2 + * Reimplement Chart::paint() to fix printing issues + The previous implementation did not take the headers and + footers into account when resizing the diagram (kde#405075) + * Fix painting bar diagrams with horizontal bars + * Do not reference private headers in KChart convenience header +- Add full Source URL +- Use %lang_package macro +- Run spec-cleaner + +------------------------------------------------------------------- Old: ---- kdiagram-2.6.1.tar.xz New: ---- kdiagram-2.6.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdiagram.spec ++++++ --- /var/tmp/diff_new_pack.5pn5Ee/_old 2020-03-31 17:32:21.724264589 +0200 +++ /var/tmp/diff_new_pack.5pn5Ee/_new 2020-03-31 17:32:21.724264589 +0200 @@ -1,7 +1,7 @@ # # spec file for package kdiagram # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,30 +12,26 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %bcond_without lang Name: kdiagram -Version: 2.6.1 +Version: 2.6.2 Release: 0 Summary: Powerful libraries (KChart, KGantt) for creating business diagrams -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/KDE -Url: http://www.kde.org/ -Source: %{name}-%{version}.tar.xz +URL: https://www.kde.org/ +Source: https://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: libqt5-linguist-devel >= 5.6.0 -BuildRequires: pkgconfig(Qt5Core) >= 5.6.0 -BuildRequires: pkgconfig(Qt5Gui) >= 5.6.0 -BuildRequires: pkgconfig(Qt5PrintSupport) >= 5.6.0 -BuildRequires: pkgconfig(Qt5Svg) >= 5.6.0 -BuildRequires: pkgconfig(Qt5Test) >= 5.6.0 -BuildRequires: pkgconfig(Qt5Widgets) >= 5.6.0 -BuildRequires: pkgconfig(zlib) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: cmake(Qt5PrintSupport) >= 5.6.0 +BuildRequires: cmake(Qt5Svg) >= 5.6.0 +BuildRequires: cmake(Qt5Test) >= 5.6.0 +BuildRequires: cmake(Qt5Widgets) >= 5.6.0 %description %{summary} @@ -44,6 +40,7 @@ Summary: KChart library for kdiagram Group: System/Libraries Recommends: libkchart-lang = %{version} +Provides: libkchart = %{version} %description -n libKChart2 This package contains the KChart libraries from the kdiagram package. @@ -52,41 +49,24 @@ Summary: Gantt chart implementation for kdiagram Group: System/Libraries Recommends: libkgantt-lang = %{version} +Provides: libkgantt = %{version} %description -n libKGantt2 This package contains the KGantt libraries from the kdiagram package. -%package -n libkgantt-lang -Summary: Translation for the KGantt library -Group: System/Localization -Requires: libKGantt2 = %{version} -Provides: libkgantt-lang-all = %{version} -Supplements: packageand(bundle-lang-other:libKGantt2) -BuildArch: noarch - -%description -n libkgantt-lang -Translatons for the KGantt library - -%package -n libkchart-lang -Summary: Translation for the KChart library -Group: System/Localization -Requires: libKChart2 = %{version} -Provides: libkchart-lang-all = %{version} -Supplements: packageand(bundle-lang-other:libKChart2) -BuildArch: noarch - -%description -n libkchart-lang -Translatons for the KChart library +%lang_package -n libkgantt +%lang_package -n libkchart %package devel Summary: Development package for the KDiagram libraries Group: System/Libraries/KDE Requires: libKChart2 = %{version} Requires: libKGantt2 = %{version} -Requires: pkgconfig(Qt5Core) >= 5.2.0 -Requires: pkgconfig(Qt5Svg) >= 5.2.0 -Requires: pkgconfig(Qt5Widgets) >= 5.2.0 +Requires: cmake(Qt5Core) >= 5.6.0 +Requires: cmake(Qt5PrintSupport) >= 5.6.0 +Requires: cmake(Qt5Svg) >= 5.6.0 +Requires: cmake(Qt5Widgets) >= 5.6.0 %description devel Development package for the KDiagram libraries @@ -100,8 +80,10 @@ %install %kf5_makeinstall -C build - %find_lang kgantt_qt --with-qt --without-mo --all-name - %find_lang kchart_qt --with-qt --without-mo --all-name +%if %{with lang} + %find_lang kgantt --with-qt --without-mo + %find_lang kchart --with-qt --without-mo +%endif %post -n libKChart2 -p /sbin/ldconfig %postun -n libKChart2 -p /sbin/ldconfig @@ -109,23 +91,18 @@ %postun -n libKGantt2 -p /sbin/ldconfig %files -n libKChart2 -%defattr(-,root,root) %{_libdir}/libKChart.so.* %files -n libKGantt2 -%defattr(-,root,root) %{_libdir}/libKGantt.so.* -%files -n libkchart-lang -f kchart_qt.lang -%defattr(-,root,root) -%exclude %{_datadir}/locale/*/LC_MESSAGES/kgantt_qt.qm - -%files -n libkgantt-lang -f kgantt_qt.lang -%defattr(-,root,root) -%exclude %{_datadir}/locale/*/LC_MESSAGES/kchart_qt.qm +%if %{with lang} +%files -n libkchart-lang -f kchart.lang + +%files -n libkgantt-lang -f kgantt.lang +%endif %files devel -%defattr(-,root,root) %{_includedir}/KChart/ %{_includedir}/kchart_version.h %{_includedir}/KGantt/ ++++++ kdiagram-2.6.1.tar.xz -> kdiagram-2.6.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/ca/kchart_qt.po new/kdiagram-2.6.2/po/ca/kchart_qt.po --- old/kdiagram-2.6.1/po/ca/kchart_qt.po 2018-04-18 09:36:42.000000000 +0200 +++ new/kdiagram-2.6.2/po/ca/kchart_qt.po 2020-03-28 13:56:47.000000000 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kchart_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" "PO-Revision-Date: 2015-02-23 13:57+0100\n" "Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n" "Language-Team: Catalan <kde-i18n-ca@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/ca/kgantt_qt.po new/kdiagram-2.6.2/po/ca/kgantt_qt.po --- old/kdiagram-2.6.1/po/ca/kgantt_qt.po 2018-04-18 09:36:42.000000000 +0200 +++ new/kdiagram-2.6.2/po/ca/kgantt_qt.po 2020-03-28 13:56:47.000000000 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kgantt_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" "PO-Revision-Date: 2015-02-23 13:58+0100\n" "Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n" "Language-Team: Catalan <kde-i18n-ca@kde.org>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/ca@valencia/kchart_qt.po new/kdiagram-2.6.2/po/ca@valencia/kchart_qt.po --- old/kdiagram-2.6.1/po/ca@valencia/kchart_qt.po 2018-04-18 09:36:42.000000000 +0200 +++ new/kdiagram-2.6.2/po/ca@valencia/kchart_qt.po 2020-03-28 13:56:47.000000000 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kchart_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" "PO-Revision-Date: 2015-02-23 13:57+0100\n" "Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n" "Language-Team: Catalan <kde-i18n-ca@kde.org>\n" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Qt-Contexts: true\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: &\n" "X-Generator: Lokalize 1.5\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/ca@valencia/kgantt_qt.po new/kdiagram-2.6.2/po/ca@valencia/kgantt_qt.po --- old/kdiagram-2.6.1/po/ca@valencia/kgantt_qt.po 2018-04-18 09:36:42.000000000 +0200 +++ new/kdiagram-2.6.2/po/ca@valencia/kgantt_qt.po 2020-03-28 13:56:47.000000000 +0100 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: kgantt_qt\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" "PO-Revision-Date: 2015-02-23 13:58+0100\n" "Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n" "Language-Team: Catalan <kde-i18n-ca@kde.org>\n" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Qt-Contexts: true\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: &\n" "X-Generator: Lokalize 1.5\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/gl/kchart_qt.po new/kdiagram-2.6.2/po/gl/kchart_qt.po --- old/kdiagram-2.6.1/po/gl/kchart_qt.po 2018-04-18 09:36:50.000000000 +0200 +++ new/kdiagram-2.6.2/po/gl/kchart_qt.po 2020-03-28 13:57:09.000000000 +0100 @@ -9,9 +9,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Qt-Contexts: true\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" +"X-Qt-Contexts: true\n" #: Cartesian/KChartLeveyJenningsAxis.cpp:63 msgctxt "KChart::LeveyJenningsAxis|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/gl/kgantt_qt.po new/kdiagram-2.6.2/po/gl/kgantt_qt.po --- old/kdiagram-2.6.1/po/gl/kgantt_qt.po 2018-04-18 09:36:50.000000000 +0200 +++ new/kdiagram-2.6.2/po/gl/kgantt_qt.po 2020-03-28 13:57:09.000000000 +0100 @@ -9,9 +9,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Qt-Contexts: true\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" +"X-Qt-Contexts: true\n" #: kganttgraphicsview.cpp:97 msgctxt "KGantt::HeaderWidget|@title:menu" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/ja/kchart_qt.po new/kdiagram-2.6.2/po/ja/kchart_qt.po --- old/kdiagram-2.6.1/po/ja/kchart_qt.po 2018-04-18 09:36:54.000000000 +0200 +++ new/kdiagram-2.6.2/po/ja/kchart_qt.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,165 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: kchart_qt\n" -"Language-Team: Japanese <kde-jp@kde.org>\n" -"Language: ja\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: qtrich\n" -"X-Qt-Contexts: true\n" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:63 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "-3sd" -msgstr "" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:63 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "-2sd" -msgstr "" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:63 -#: Cartesian/KChartLeveyJenningsAxis.cpp:175 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "mean" -msgstr "" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:64 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "+2sd" -msgstr "" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:64 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "+3sd" -msgstr "" - -#: KChartDatasetSelector.ui:30 -msgctxt "DatasetSelector|" -msgid "Data Selector" -msgstr "" - -#: KChartDatasetSelector.ui:42 -msgctxt "DatasetSelector|" -msgid "Only display a subset of the model in the chart:" -msgstr "" - -#: KChartDatasetSelector.ui:60 KChartDatasetSelector.ui:126 -msgctxt "DatasetSelector|" -msgid "in reverse order." -msgstr "" - -#: KChartDatasetSelector.ui:67 KChartDatasetSelector.ui:103 -msgctxt "DatasetSelector|" -msgid "..." -msgstr "" - -#: KChartDatasetSelector.ui:80 -msgctxt "DatasetSelector|" -msgid "columns starting at column" -msgstr "" - -#: KChartDatasetSelector.ui:93 KChartDatasetSelector.ui:133 -msgctxt "DatasetSelector|" -msgid "Display" -msgstr "" - -#: KChartDatasetSelector.ui:116 -msgctxt "DatasetSelector|" -msgid "rows starting at row" -msgstr "" - -#: KChartLegend.cpp:53 -msgctxt "QObject|" -msgid "Legend" -msgstr "" - -#: KChartPosition.cpp:40 -msgctxt "Position|" -msgid "Unknown Position" -msgstr "" - -#: KChartPosition.cpp:41 -msgctxt "Position|" -msgid "Center" -msgstr "" - -#: KChartPosition.cpp:42 -msgctxt "Position|" -msgid "NorthWest" -msgstr "" - -#: KChartPosition.cpp:43 -msgctxt "Position|" -msgid "North" -msgstr "" - -#: KChartPosition.cpp:44 -msgctxt "Position|" -msgid "NorthEast" -msgstr "" - -#: KChartPosition.cpp:45 -msgctxt "Position|" -msgid "East" -msgstr "" - -#: KChartPosition.cpp:46 -msgctxt "Position|" -msgid "SouthEast" -msgstr "" - -#: KChartPosition.cpp:47 -msgctxt "Position|" -msgid "South" -msgstr "" - -#: KChartPosition.cpp:48 -msgctxt "Position|" -msgid "SouthWest" -msgstr "" - -#: KChartPosition.cpp:49 -msgctxt "Position|" -msgid "West" -msgstr "" - -#: KChartPosition.cpp:50 -msgctxt "Position|" -msgid "Floating" -msgstr "" - -#: Ternary/KChartTernaryAxis.cpp:48 -msgctxt "QObject|" -msgid "50%" -msgstr "" - -#: Ternary/KChartTernaryAxis.cpp:146 -msgctxt "KChart::TernaryAxis|" -msgid "A" -msgstr "" - -#: Ternary/KChartTernaryAxis.cpp:149 -msgctxt "KChart::TernaryAxis|" -msgid "C" -msgstr "" - -#: Ternary/KChartTernaryAxis.cpp:152 -msgctxt "KChart::TernaryAxis|" -msgid "B" -msgstr "" - -#: Ternary/KChartTernaryLineDiagram.cpp:133 -#, qt-format -msgctxt "KChart::TernaryLineDiagram|(x, y, z) values of the data point" -msgid "(%1, %2, %3)" -msgstr "" - -#: Ternary/KChartTernaryPointDiagram.cpp:116 -#, qt-format -msgctxt "KChart::TernaryPointDiagram|(x, y, z) values of the data point" -msgid "(%1, %2, %3)" -msgstr "" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/ja/kgantt_qt.po new/kdiagram-2.6.2/po/ja/kgantt_qt.po --- old/kdiagram-2.6.1/po/ja/kgantt_qt.po 2018-04-18 09:36:54.000000000 +0200 +++ new/kdiagram-2.6.2/po/ja/kgantt_qt.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: kgantt_qt\n" -"Language-Team: Japanese <kde-jp@kde.org>\n" -"Language: ja\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: qtrich\n" -"X-Qt-Contexts: true\n" - -#: kganttgraphicsview.cpp:97 -msgctxt "KGantt::HeaderWidget|@title:menu" -msgid "Scale" -msgstr "" - -#: kganttgraphicsview.cpp:101 -msgctxt "KGantt::HeaderWidget|@item:inmenu Automatic scale" -msgid "Auto" -msgstr "" - -#: kganttgraphicsview.cpp:104 -msgctxt "KGantt::HeaderWidget|@item:inmenu" -msgid "Month" -msgstr "" - -#: kganttgraphicsview.cpp:107 -msgctxt "KGantt::HeaderWidget|@item:inmenu" -msgid "Week" -msgstr "" - -#: kganttgraphicsview.cpp:110 -msgctxt "KGantt::HeaderWidget|@item:inmenu" -msgid "Day" -msgstr "" - -#: kganttgraphicsview.cpp:113 -msgctxt "KGantt::HeaderWidget|@item:inmenu" -msgid "Hour" -msgstr "" - -#: kganttgraphicsview.cpp:136 -msgctxt "KGantt::HeaderWidget|@action:inmenu" -msgid "Zoom In" -msgstr "" - -#: kganttgraphicsview.cpp:138 -msgctxt "KGantt::HeaderWidget|@action:inmenu" -msgid "Zoom Out" -msgstr "" - -#: kganttitemdelegate.cpp:183 -#, qt-format -msgctxt "KGantt::ItemDelegate|start time -> end time: item name" -msgid "%1 -> %2: %3" -msgstr "" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/ko/kchart_qt.po new/kdiagram-2.6.2/po/ko/kchart_qt.po --- old/kdiagram-2.6.1/po/ko/kchart_qt.po 2018-04-18 09:36:56.000000000 +0200 +++ new/kdiagram-2.6.2/po/ko/kchart_qt.po 2020-03-28 13:57:26.000000000 +0100 @@ -4,7 +4,7 @@ "Project-Id-Version: \n" "PO-Revision-Date: 2015-07-30 15:27+0200\n" "Last-Translator: Shinjo Park <kde@peremen.name>\n" -"Language-Team: Korean <kde@peremen.name>\n" +"Language-Team: Korean <kde-kr@kde.org>\n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/ko/kgantt_qt.po new/kdiagram-2.6.2/po/ko/kgantt_qt.po --- old/kdiagram-2.6.1/po/ko/kgantt_qt.po 2018-04-18 09:36:56.000000000 +0200 +++ new/kdiagram-2.6.2/po/ko/kgantt_qt.po 2020-03-28 13:57:26.000000000 +0100 @@ -4,7 +4,7 @@ "Project-Id-Version: \n" "PO-Revision-Date: 2015-07-27 15:55+0200\n" "Last-Translator: Shinjo Park <kde@peremen.name>\n" -"Language-Team: Korean <kde@peremen.name>\n" +"Language-Team: Korean <kde-kr@kde.org>\n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/lt/kchart_qt.po new/kdiagram-2.6.2/po/lt/kchart_qt.po --- old/kdiagram-2.6.1/po/lt/kchart_qt.po 2018-04-18 09:36:57.000000000 +0200 +++ new/kdiagram-2.6.2/po/lt/kchart_qt.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,165 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: trunk-kf 5\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: lt\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Qt-Contexts: true\n" -"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" -"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:63 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "-3sd" -msgstr "" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:63 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "-2sd" -msgstr "" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:63 -#: Cartesian/KChartLeveyJenningsAxis.cpp:175 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "mean" -msgstr "" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:64 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "+2sd" -msgstr "" - -#: Cartesian/KChartLeveyJenningsAxis.cpp:64 -msgctxt "KChart::LeveyJenningsAxis|" -msgid "+3sd" -msgstr "" - -#: KChartDatasetSelector.ui:30 -msgctxt "DatasetSelector|" -msgid "Data Selector" -msgstr "" - -#: KChartDatasetSelector.ui:42 -msgctxt "DatasetSelector|" -msgid "Only display a subset of the model in the chart:" -msgstr "" - -#: KChartDatasetSelector.ui:60 KChartDatasetSelector.ui:126 -msgctxt "DatasetSelector|" -msgid "in reverse order." -msgstr "" - -#: KChartDatasetSelector.ui:67 KChartDatasetSelector.ui:103 -msgctxt "DatasetSelector|" -msgid "..." -msgstr "" - -#: KChartDatasetSelector.ui:80 -msgctxt "DatasetSelector|" -msgid "columns starting at column" -msgstr "" - -#: KChartDatasetSelector.ui:93 KChartDatasetSelector.ui:133 -msgctxt "DatasetSelector|" -msgid "Display" -msgstr "" - -#: KChartDatasetSelector.ui:116 -msgctxt "DatasetSelector|" -msgid "rows starting at row" -msgstr "" - -#: KChartLegend.cpp:53 -msgctxt "QObject|" -msgid "Legend" -msgstr "" - -#: KChartPosition.cpp:40 -msgctxt "Position|" -msgid "Unknown Position" -msgstr "" - -#: KChartPosition.cpp:41 -msgctxt "Position|" -msgid "Center" -msgstr "" - -#: KChartPosition.cpp:42 -msgctxt "Position|" -msgid "NorthWest" -msgstr "" - -#: KChartPosition.cpp:43 -msgctxt "Position|" -msgid "North" -msgstr "" - -#: KChartPosition.cpp:44 -msgctxt "Position|" -msgid "NorthEast" -msgstr "" - -#: KChartPosition.cpp:45 -msgctxt "Position|" -msgid "East" -msgstr "" - -#: KChartPosition.cpp:46 -msgctxt "Position|" -msgid "SouthEast" -msgstr "" - -#: KChartPosition.cpp:47 -msgctxt "Position|" -msgid "South" -msgstr "" - -#: KChartPosition.cpp:48 -msgctxt "Position|" -msgid "SouthWest" -msgstr "" - -#: KChartPosition.cpp:49 -msgctxt "Position|" -msgid "West" -msgstr "" - -#: KChartPosition.cpp:50 -msgctxt "Position|" -msgid "Floating" -msgstr "" - -#: Ternary/KChartTernaryAxis.cpp:48 -msgctxt "QObject|" -msgid "50%" -msgstr "" - -#: Ternary/KChartTernaryAxis.cpp:146 -msgctxt "KChart::TernaryAxis|" -msgid "A" -msgstr "" - -#: Ternary/KChartTernaryAxis.cpp:149 -msgctxt "KChart::TernaryAxis|" -msgid "C" -msgstr "" - -#: Ternary/KChartTernaryAxis.cpp:152 -msgctxt "KChart::TernaryAxis|" -msgid "B" -msgstr "" - -#: Ternary/KChartTernaryLineDiagram.cpp:133 -#, qt-format -msgctxt "KChart::TernaryLineDiagram|(x, y, z) values of the data point" -msgid "(%1, %2, %3)" -msgstr "" - -#: Ternary/KChartTernaryPointDiagram.cpp:116 -#, qt-format -msgctxt "KChart::TernaryPointDiagram|(x, y, z) values of the data point" -msgid "(%1, %2, %3)" -msgstr "" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/lt/kgantt_qt.po new/kdiagram-2.6.2/po/lt/kgantt_qt.po --- old/kdiagram-2.6.1/po/lt/kgantt_qt.po 2018-04-18 09:36:57.000000000 +0200 +++ new/kdiagram-2.6.2/po/lt/kgantt_qt.po 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: trunk-kf 5\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: lt\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Qt-Contexts: true\n" -"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" -"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" - -#: kganttgraphicsview.cpp:97 -msgctxt "KGantt::HeaderWidget|@title:menu" -msgid "Scale" -msgstr "" - -#: kganttgraphicsview.cpp:101 -msgctxt "KGantt::HeaderWidget|@item:inmenu Automatic scale" -msgid "Auto" -msgstr "" - -#: kganttgraphicsview.cpp:104 -msgctxt "KGantt::HeaderWidget|@item:inmenu" -msgid "Month" -msgstr "" - -#: kganttgraphicsview.cpp:107 -msgctxt "KGantt::HeaderWidget|@item:inmenu" -msgid "Week" -msgstr "" - -#: kganttgraphicsview.cpp:110 -msgctxt "KGantt::HeaderWidget|@item:inmenu" -msgid "Day" -msgstr "" - -#: kganttgraphicsview.cpp:113 -msgctxt "KGantt::HeaderWidget|@item:inmenu" -msgid "Hour" -msgstr "" - -#: kganttgraphicsview.cpp:136 -msgctxt "KGantt::HeaderWidget|@action:inmenu" -msgid "Zoom In" -msgstr "" - -#: kganttgraphicsview.cpp:138 -msgctxt "KGantt::HeaderWidget|@action:inmenu" -msgid "Zoom Out" -msgstr "" - -#: kganttitemdelegate.cpp:183 -#, qt-format -msgctxt "KGantt::ItemDelegate|start time -> end time: item name" -msgid "%1 -> %2: %3" -msgstr "" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/ru/kchart_qt.po new/kdiagram-2.6.2/po/ru/kchart_qt.po --- old/kdiagram-2.6.1/po/ru/kchart_qt.po 2018-04-18 09:37:04.000000000 +0200 +++ new/kdiagram-2.6.2/po/ru/kchart_qt.po 2020-03-28 13:57:59.000000000 +0100 @@ -1,9 +1,9 @@ # Alexander Lakhin <exclusion@gmail.com>, 2013. -# Alexander Potashev <aspotashev@gmail.com>, 2015. +# Alexander Potashev <aspotashev@gmail.com>, 2015, 2018. msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2015-10-03 18:38+0300\n" +"PO-Revision-Date: 2018-12-17 14:35+0300\n" "Last-Translator: Alexander Potashev <aspotashev@gmail.com>\n" "Language-Team: Russian <kde-russian@lists.kde.ru>\n" "Language: ru\n" @@ -84,86 +84,86 @@ #: KChartPosition.cpp:40 msgctxt "Position|" msgid "Unknown Position" -msgstr "" +msgstr "Неизвестное расположение" #: KChartPosition.cpp:41 msgctxt "Position|" msgid "Center" -msgstr "" +msgstr "По центру" #: KChartPosition.cpp:42 msgctxt "Position|" msgid "NorthWest" -msgstr "" +msgstr "Слева сверху" #: KChartPosition.cpp:43 msgctxt "Position|" msgid "North" -msgstr "" +msgstr "Сверху" #: KChartPosition.cpp:44 msgctxt "Position|" msgid "NorthEast" -msgstr "" +msgstr "Справа сверху" #: KChartPosition.cpp:45 msgctxt "Position|" msgid "East" -msgstr "" +msgstr "Справа" #: KChartPosition.cpp:46 msgctxt "Position|" msgid "SouthEast" -msgstr "" +msgstr "Справа снизу" #: KChartPosition.cpp:47 msgctxt "Position|" msgid "South" -msgstr "" +msgstr "Снизу" #: KChartPosition.cpp:48 msgctxt "Position|" msgid "SouthWest" -msgstr "" +msgstr "Слева снизу" #: KChartPosition.cpp:49 msgctxt "Position|" msgid "West" -msgstr "" +msgstr "Слева" #: KChartPosition.cpp:50 msgctxt "Position|" msgid "Floating" -msgstr "" +msgstr "Плавающее" #: Ternary/KChartTernaryAxis.cpp:48 msgctxt "QObject|" msgid "50%" -msgstr "" +msgstr "50%" #: Ternary/KChartTernaryAxis.cpp:146 msgctxt "KChart::TernaryAxis|" msgid "A" -msgstr "" +msgstr "A" #: Ternary/KChartTernaryAxis.cpp:149 msgctxt "KChart::TernaryAxis|" msgid "C" -msgstr "" +msgstr "C" #: Ternary/KChartTernaryAxis.cpp:152 msgctxt "KChart::TernaryAxis|" msgid "B" -msgstr "" +msgstr "B" #: Ternary/KChartTernaryLineDiagram.cpp:133 #, qt-format msgctxt "KChart::TernaryLineDiagram|(x, y, z) values of the data point" msgid "(%1, %2, %3)" -msgstr "" +msgstr "(%1; %2; %3)" #: Ternary/KChartTernaryPointDiagram.cpp:116 #, qt-format msgctxt "KChart::TernaryPointDiagram|(x, y, z) values of the data point" msgid "(%1, %2, %3)" -msgstr "" \ No newline at end of file +msgstr "(%1; %2; %3)" \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/zh_CN/kchart_qt.po new/kdiagram-2.6.2/po/zh_CN/kchart_qt.po --- old/kdiagram-2.6.1/po/zh_CN/kchart_qt.po 2018-04-18 09:37:15.000000000 +0200 +++ new/kdiagram-2.6.2/po/zh_CN/kchart_qt.po 2020-03-28 13:58:24.000000000 +0100 @@ -2,8 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-04-17 04:58-0400\n" -"Last-Translator: guoyunhebrave <guoyunhebrave@gmail.com>\n" +"PO-Revision-Date: 2020-03-25 19:57\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -11,7 +10,6 @@ "Content-Transfer-Encoding: 8bit\n" "X-Qt-Contexts: true\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: crowdin.com\n" "X-Crowdin-Project: kdeorg\n" "X-Crowdin-Language: zh-CN\n" "X-Crowdin-File: /kf5-stable/messages/extragear-graphics/kchart_qt.pot\n" @@ -90,7 +88,7 @@ #: KChartPosition.cpp:41 msgctxt "Position|" msgid "Center" -msgstr "中间" +msgstr "居中" #: KChartPosition.cpp:42 msgctxt "Position|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/po/zh_CN/kgantt_qt.po new/kdiagram-2.6.2/po/zh_CN/kgantt_qt.po --- old/kdiagram-2.6.1/po/zh_CN/kgantt_qt.po 2018-04-18 09:37:15.000000000 +0200 +++ new/kdiagram-2.6.2/po/zh_CN/kgantt_qt.po 2020-03-28 13:58:24.000000000 +0100 @@ -2,8 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-04-17 04:58-0400\n" -"Last-Translator: guoyunhebrave <guoyunhebrave@gmail.com>\n" +"PO-Revision-Date: 2020-03-25 19:57\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -11,7 +10,6 @@ "Content-Transfer-Encoding: 8bit\n" "X-Qt-Contexts: true\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: crowdin.com\n" "X-Crowdin-Project: kdeorg\n" "X-Crowdin-Language: zh-CN\n" "X-Crowdin-File: /kf5-stable/messages/extragear-graphics/kgantt_qt.pot\n" @@ -19,7 +17,7 @@ #: kganttgraphicsview.cpp:97 msgctxt "KGantt::HeaderWidget|@title:menu" msgid "Scale" -msgstr "比例" +msgstr "缩放" #: kganttgraphicsview.cpp:101 msgctxt "KGantt::HeaderWidget|@item:inmenu Automatic scale" @@ -39,7 +37,7 @@ #: kganttgraphicsview.cpp:110 msgctxt "KGantt::HeaderWidget|@item:inmenu" msgid "Day" -msgstr "白天" +msgstr "天" #: kganttgraphicsview.cpp:113 msgctxt "KGantt::HeaderWidget|@item:inmenu" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/CMakeLists.txt new/kdiagram-2.6.2/src/KChart/CMakeLists.txt --- old/kdiagram-2.6.1/src/KChart/CMakeLists.txt 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/CMakeLists.txt 2020-03-28 13:56:20.000000000 +0100 @@ -1,4 +1,4 @@ -set( KCHARTLIB_VERSION "2.6.1" ) +set( KCHARTLIB_VERSION "2.6.2" ) ecm_setup_version(${KCHARTLIB_VERSION} VARIABLE_PREFIX KCHART diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp new/kdiagram-2.6.2/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp --- old/kdiagram-2.6.1/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/Cartesian/DiagramFlavors/KChartNormalLyingBarDiagram_p.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -158,13 +158,13 @@ } } - for ( int column = 0; column < colCount; column++ ) { + for ( int column = colCount-1; column >= 0; --column ) { // paint one group const CartesianDiagramDataCompressor::CachePosition position( row, column ); const CartesianDiagramDataCompressor::DataPoint point = compressor().data( position ); const QModelIndex sourceIndex = attributesModel()->mapToSource( point.index ); - QPointF dataPoint( 0, rowCount - ( point.key + 0.5 ) ); + QPointF dataPoint( 0, ( point.key + 0.5 ) ); const QPointF topLeft = ctx->coordinatePlane()->translate( dataPoint ); dataPoint.rx() += point.value; const QPointF bottomRight = ctx->coordinatePlane()->translate( dataPoint ) + @@ -173,6 +173,7 @@ const QRectF rect = QRectF( topLeft, bottomRight ).translated( 1.0, offset ); m_private->addLabel( &lpc, sourceIndex, 0, PositionPoints( rect ), Position::North, Position::South, point.value ); + paintBars( ctx, sourceIndex, rect, maxDepth ); offset += barWidth + spaceBetweenBars; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp new/kdiagram-2.6.2/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp --- old/kdiagram-2.6.1/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/Cartesian/DiagramFlavors/KChartPercentLyingBarDiagram_p.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -192,11 +192,11 @@ QPointF point, previousPoint; if ( sumValuesVector.at( curRow ) != 0 && value > 0 ) { - QPointF dataPoint( ( stackedValues / sumValuesVector.at( curRow ) * maxValue ), rowCount - key ); + QPointF dataPoint( ( stackedValues / sumValuesVector.at( curRow ) * maxValue ), key + 1 ); point = ctx->coordinatePlane()->translate( dataPoint ); point.ry() += offset / 2 + threeDOffset; - previousPoint = ctx->coordinatePlane()->translate( QPointF( ( ( stackedValues - value) / sumValuesVector.at( curRow ) * maxValue ), rowCount - key ) ); + previousPoint = ctx->coordinatePlane()->translate( QPointF( ( ( stackedValues - value) / sumValuesVector.at( curRow ) * maxValue ), key + 1 ) ); } const qreal barHeight = point.x() - previousPoint.x(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp new/kdiagram-2.6.2/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp --- old/kdiagram-2.6.1/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/Cartesian/DiagramFlavors/KChartStackedLyingBarDiagram_p.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -184,9 +184,9 @@ stackedValues += point.value; key = point.key; } - QPointF point = ctx->coordinatePlane()->translate( QPointF( stackedValues, rowCount - key ) ); + QPointF point = ctx->coordinatePlane()->translate( QPointF( stackedValues, key + 1 ) ); point.ry() += offset / 2 + threeDOffset; - const QPointF previousPoint = ctx->coordinatePlane()->translate( QPointF( stackedValues - value, rowCount - key ) ); + const QPointF previousPoint = ctx->coordinatePlane()->translate( QPointF( stackedValues - value, key + 1 ) ); const qreal barHeight = point.x() - previousPoint.x(); point.rx() -= barHeight; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/Cartesian/KChartCartesianAxis.cpp new/kdiagram-2.6.2/src/KChart/Cartesian/KChartCartesianAxis.cpp --- old/kdiagram-2.6.1/src/KChart/Cartesian/KChartCartesianAxis.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/Cartesian/KChartCartesianAxis.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -1157,3 +1157,17 @@ setCachedSizeDirty(); layoutPlanes(); } + +#if !defined(QT_NO_DEBUG_STREAM) +QDebug operator<<(QDebug dbg, KChart::CartesianAxis::Position pos) +{ + switch (pos) { + case KChart::CartesianAxis::Bottom: dbg << "KChart::CartesianAxis::Bottom"; break; + case KChart::CartesianAxis::Top: dbg << "KChart::CartesianAxis::Top"; break; + case KChart::CartesianAxis::Left: dbg << "KChart::CartesianAxis::Left"; break; + case KChart::CartesianAxis::Right: dbg << "KChart::CartesianAxis::Right"; break; + default: dbg << "KChart::CartesianAxis::Invalid"; break; + } + return dbg; +} +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/Cartesian/KChartCartesianAxis.h new/kdiagram-2.6.2/src/KChart/Cartesian/KChartCartesianAxis.h --- old/kdiagram-2.6.1/src/KChart/Cartesian/KChartCartesianAxis.h 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/Cartesian/KChartCartesianAxis.h 2020-03-28 13:56:20.000000000 +0100 @@ -43,6 +43,8 @@ Q_DISABLE_COPY( CartesianAxis ) KCHART_DECLARE_PRIVATE_DERIVED_PARENT( CartesianAxis, AbstractDiagram* ) + Q_ENUMS(Position) + public: enum Position { Bottom, @@ -183,4 +185,8 @@ typedef QList<CartesianAxis*> CartesianAxisList; } +#if !defined(QT_NO_DEBUG_STREAM) +KCHART_EXPORT QDebug operator<<(QDebug dbg, KChart::CartesianAxis::Position pos); +#endif + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/Cartesian/KChartCartesianGrid.cpp new/kdiagram-2.6.2/src/KChart/Cartesian/KChartCartesianGrid.cpp --- old/kdiagram-2.6.1/src/KChart/Cartesian/KChartCartesianGrid.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/Cartesian/KChartCartesianGrid.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -27,6 +27,7 @@ #include "KChartMath_p.h" #include <QPainter> +#include <QPainterPath> using namespace KChart; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/KChartAbstractAreaBase.cpp new/kdiagram-2.6.2/src/KChart/KChartAbstractAreaBase.cpp --- old/kdiagram-2.6.1/src/KChart/KChartAbstractAreaBase.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/KChartAbstractAreaBase.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -28,7 +28,7 @@ #include "KChartMath_p.h" #include <QPainter> - +#include <QPainterPath> using namespace KChart; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/KChartAbstractDiagram.cpp new/kdiagram-2.6.2/src/KChart/KChartAbstractDiagram.cpp --- old/kdiagram-2.6.1/src/KChart/KChartAbstractDiagram.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/KChartAbstractDiagram.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -21,6 +21,7 @@ #include "KChartAbstractDiagram_p.h" #include <QPainter> +#include <QPainterPath> #include <QDebug> #include <QApplication> #include <QAbstractProxyModel> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/KChartAbstractDiagram_p.h new/kdiagram-2.6.2/src/KChart/KChartAbstractDiagram_p.h --- old/kdiagram-2.6.1/src/KChart/KChartAbstractDiagram_p.h 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/KChartAbstractDiagram_p.h 2020-03-28 13:56:20.000000000 +0100 @@ -49,6 +49,7 @@ #include <QFont> #include <QFontMetrics> #include <QPaintDevice> +#include <QPainterPath> #include <QModelIndex> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/KChartChart.cpp new/kdiagram-2.6.2/src/KChart/KChartChart.cpp --- old/kdiagram-2.6.1/src/KChart/KChartChart.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/KChartChart.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -1344,65 +1344,34 @@ return d->globalLeadingBottom; } -void Chart::paint( QPainter* painter, const QRect& target ) +void Chart::paint( QPainter* painter, const QRect& rect ) { - if ( target.isEmpty() || !painter ) { + if ( rect.isEmpty() || !painter ) { return; } QPaintDevice* prevDevice = GlobalMeasureScaling::paintDevice(); GlobalMeasureScaling::setPaintDevice( painter->device() ); + int prevScaleFactor = PrintingParameters::scaleFactor(); - // Output on a widget - if ( dynamic_cast< QWidget* >( painter->device() ) != 0 ) { - GlobalMeasureScaling::setFactors( qreal( target.width() ) / qreal( geometry().size().width() ), - qreal( target.height() ) / qreal( geometry().size().height() ) ); - } else { - // Output onto a QPixmap - PrintingParameters::setScaleFactor( qreal( painter->device()->logicalDpiX() ) / qreal( logicalDpiX() ) ); + // Output onto a QPixmap + PrintingParameters::setScaleFactor( qreal( painter->device()->logicalDpiX() ) / qreal( logicalDpiX() ) ); - const qreal resX = qreal( logicalDpiX() ) / qreal( painter->device()->logicalDpiX() ); - const qreal resY = qreal( logicalDpiY() ) / qreal( painter->device()->logicalDpiY() ); - - GlobalMeasureScaling::setFactors( qreal( target.width() ) / qreal( geometry().size().width() ) * resX, - qreal( target.height() ) / qreal( geometry().size().height() ) * resY ); - } - - const QPoint translation = target.topLeft(); - painter->translate( translation ); - - // the following layout logic has the disadvantage that repeatedly calling this method can - // cause a relayout every time, but since this method's main use seems to be printing, the - // gratuitous relayouts shouldn't be much of a performance problem. - const bool differentSize = target.size() != size(); - QRect oldGeometry; - if ( differentSize ) { - oldGeometry = geometry(); - d->isPlanesLayoutDirty = true; - d->isFloatingLegendsLayoutDirty = true; - invalidateLayoutTree( d->dataAndLegendLayout ); - d->dataAndLegendLayout->setGeometry( QRect( QPoint(), target.size() ) ); - } - - d->overrideSize = target.size(); + const QRect oldGeometry( geometry() ); + if ( oldGeometry != rect ) + setGeometry( rect ); + painter->translate( rect.left(), rect.top() ); d->paintAll( painter ); - d->overrideSize = QSize(); - - if ( differentSize ) { - invalidateLayoutTree( d->dataAndLegendLayout ); - d->dataAndLegendLayout->setGeometry( oldGeometry ); - d->isPlanesLayoutDirty = true; - d->isFloatingLegendsLayoutDirty = true; - } // for debugging // painter->setPen( QPen( Qt::blue, 8 ) ); - // painter->drawRect( target ); + // painter->drawRect( rect ); - painter->translate( -translation.x(), -translation.y() ); + painter->translate( -rect.left(), -rect.top() ); + if ( oldGeometry != rect ) + setGeometry( oldGeometry ); - GlobalMeasureScaling::instance()->resetFactors(); - PrintingParameters::resetScaleFactor(); + PrintingParameters::setScaleFactor( prevScaleFactor ); GlobalMeasureScaling::setPaintDevice( prevDevice ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/KChartChart.h new/kdiagram-2.6.2/src/KChart/KChartChart.h --- old/kdiagram-2.6.1/src/KChart/KChartChart.h 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/KChartChart.h 2020-03-28 13:56:20.000000000 +0100 @@ -434,11 +434,11 @@ * size of the target rectangle. * * \param painter The painter to be drawn into. - * \param target The rectangle to be filled by the Chart's drawing. + * \param rect The rectangle to be filled by the Chart's drawing. * * \sa setGlobalLeading */ - void paint( QPainter* painter, const QRect& target ); + void paint( QPainter* painter, const QRect& rect ); void reLayoutFloatingLegends(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/KChartPrintingParameters.cpp new/kdiagram-2.6.2/src/KChart/KChartPrintingParameters.cpp --- old/kdiagram-2.6.1/src/KChart/KChartPrintingParameters.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/KChartPrintingParameters.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -22,7 +22,7 @@ using namespace KChart; PrintingParameters::PrintingParameters() - : scaleFactor( 1.0 ) + : m_scaleFactor( 1.0 ) { } @@ -32,25 +32,30 @@ return &instance; } +qreal PrintingParameters::scaleFactor() +{ + return instance()->m_scaleFactor; +} + void PrintingParameters::setScaleFactor( const qreal scaleFactor ) { - instance()->scaleFactor = scaleFactor; + instance()->m_scaleFactor = scaleFactor; } void PrintingParameters::resetScaleFactor() { - instance()->scaleFactor = 1.0; + instance()->m_scaleFactor = 1.0; } QPen PrintingParameters::scalePen( const QPen& pen ) { - if ( instance()->scaleFactor == 1.0 ) + if ( instance()->m_scaleFactor == 1.0 ) return pen; QPen resultPen = pen; - resultPen.setWidthF( resultPen.widthF() * instance()->scaleFactor ); + resultPen.setWidthF( resultPen.widthF() * instance()->m_scaleFactor ); if ( resultPen.widthF() == 0.0 ) - resultPen.setWidthF( instance()->scaleFactor ); + resultPen.setWidthF( instance()->m_scaleFactor ); return resultPen; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/KChartPrintingParameters.h new/kdiagram-2.6.2/src/KChart/KChartPrintingParameters.h --- old/kdiagram-2.6.1/src/KChart/KChartPrintingParameters.h 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/KChartPrintingParameters.h 2020-03-28 13:56:20.000000000 +0100 @@ -42,6 +42,7 @@ */ class PrintingParameters { public: + static qreal scaleFactor(); static void setScaleFactor( const qreal scaleFactor ); static void resetScaleFactor(); static QPen scalePen( const QPen& pen ); @@ -50,7 +51,7 @@ PrintingParameters(); static PrintingParameters* instance(); - qreal scaleFactor; + qreal m_scaleFactor; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KChart/include/KChart new/kdiagram-2.6.2/src/KChart/include/KChart --- old/kdiagram-2.6.1/src/KChart/include/KChart 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KChart/include/KChart 2020-03-28 13:56:20.000000000 +0100 @@ -1,18 +1,14 @@ #include "KChartDatasetProxyModel.h" -#include "KChartNullPaintDevice.h" #include "KChartChart.h" #include "KChartHeaderFooter.h" #include "KChartGlobal.h" #include "KChartDataValueAttributes.h" #include "KChartPalette.h" -#include "KChartSignalCompressor.h" #include "KChartDiagramObserver.h" #include "KChartMeasure.h" #include "KChartGridAttributes.h" -#include "KChartPrintingParameters.h" #include "KChartLineAttributes.h" #include "KChartValueTrackerAttributes.h" -#include "KChartAbstractGrid.h" #include "KChartRulerAttributes.h" #include "KChartTextArea.h" #include "KChartAttributesModel.h" @@ -27,12 +23,10 @@ #include "KChartTextAttributes.h" #include "KChartFrameAttributes.h" #include "KChartAbstractThreeDAttributes.h" -#include "KChartTextLabelCache.h" #include "KChartBackgroundAttributes.h" #include "KChartAbstractAreaWidget.h" #include "KChartThreeDLineAttributes.h" #include "KChartPosition.h" -#include "KChartZoomParameters.h" #include "KChartAbstractAreaBase.h" #include "KChartPaintContext.h" #include "KChartAbstractProxyModel.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KGantt/CMakeLists.txt new/kdiagram-2.6.2/src/KGantt/CMakeLists.txt --- old/kdiagram-2.6.1/src/KGantt/CMakeLists.txt 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KGantt/CMakeLists.txt 2020-03-28 13:56:20.000000000 +0100 @@ -1,4 +1,4 @@ -set( KGANTTLIB_VERSION "2.6.1" ) +set( KGANTTLIB_VERSION "2.6.2" ) ecm_setup_version(${KGANTTLIB_VERSION} VARIABLE_PREFIX KGANTT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiagram-2.6.1/src/KGantt/kganttdatetimegrid.cpp new/kdiagram-2.6.2/src/KGantt/kganttdatetimegrid.cpp --- old/kdiagram-2.6.1/src/KGantt/kganttdatetimegrid.cpp 2018-04-18 09:36:24.000000000 +0200 +++ new/kdiagram-2.6.2/src/KGantt/kganttdatetimegrid.cpp 2020-03-28 13:56:20.000000000 +0100 @@ -25,6 +25,7 @@ #include <QApplication> #include <QDateTime> #include <QPainter> +#include <QPainterPath> #include <QStyle> #include <QStyleOptionHeader> #include <QWidget>