Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-PyQt6-Charts for
openSUSE:Factory checked in at 2021-10-11 15:30:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-PyQt6-Charts (Old)
and /work/SRC/openSUSE:Factory/.python-PyQt6-Charts.new.2443 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-PyQt6-Charts"
Mon Oct 11 15:30:58 2021 rev:3 rq:923594 version:6.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-PyQt6-Charts/python-PyQt6-Charts.changes
2021-08-20 16:57:46.342882884 +0200
+++
/work/SRC/openSUSE:Factory/.python-PyQt6-Charts.new.2443/python-PyQt6-Charts.changes
2021-10-11 15:31:40.218850072 +0200
@@ -1,0 +2,6 @@
+Sun Oct 3 13:40:50 UTC 2021 - Ben Greiner <[email protected]>
+
+- Update to version 6.2.0
+ * Added support for Qt v6.2.
+
+-------------------------------------------------------------------
Old:
----
PyQt6_Charts-6.1.1.tar.gz
New:
----
PyQt6_Charts-6.2.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-PyQt6-Charts.spec ++++++
--- /var/tmp/diff_new_pack.GYAnrt/_old 2021-10-11 15:31:40.802851008 +0200
+++ /var/tmp/diff_new_pack.GYAnrt/_new 2021-10-11 15:31:40.802851008 +0200
@@ -22,16 +22,16 @@
%define skip_python2 1
%define pyqt_build_for_qt6 1
Name: python-%{mname}
-Version: 6.1.1
+Version: 6.2.0
Release: 0
Summary: Python bindings for the Qt Charts library
License: GPL-3.0-only
Group: Development/Libraries/Python
URL: https://www.riverbankcomputing.com/software/pyqtchart
Source:
https://files.pythonhosted.org/packages/source/P/PyQt6-%{qtlib}/PyQt6_%{qtlib}-%{version}.tar.gz
-BuildRequires: %{python_module PyQt6-devel}
+BuildRequires: %{python_module PyQt6-devel >= %{version}}
BuildRequires: %{python_module devel}
-BuildRequires: %{python_module pyqt-builder >= 1.8}
+BuildRequires: %{python_module pyqt-builder >= 1.10}
BuildRequires: %{python_module sip-devel >= 6}
BuildRequires: fdupes
BuildRequires: python-pyqt-rpm-macros
++++++ PyQt6_Charts-6.1.1.tar.gz -> PyQt6_Charts-6.2.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6_Charts-6.1.1/ChangeLog
new/PyQt6_Charts-6.2.0/ChangeLog
--- old/PyQt6_Charts-6.1.1/ChangeLog 2021-06-08 15:36:06.363601000 +0200
+++ new/PyQt6_Charts-6.2.0/ChangeLog 2021-09-30 18:09:26.661147000 +0200
@@ -1,5 +1,34 @@
+2021-09-30 Phil Thompson <[email protected]>
+
+ * NEWS:
+ Updated for Qt v6.2.0.
+ [121d91686411] [6.2.0]
+
+2021-07-13 Phil Thompson <[email protected]>
+
+ * rb-product.toml:
+ Update the minimum PyQt version.
+ [8c242496b33d]
+
+ * PyQt6-Charts.msp, sip/qhash.sip:
+ Completed the support for Qt v6.2.0beta1.
+ [48f42df9a0c7]
+
+2021-07-12 Phil Thompson <[email protected]>
+
+ * NEWS, PyQt6-Charts.msp, mksccode/QtCharts.versions:
+ First pass at updating for Qt v6.2.0beta1.
+ [f96bb99955da]
+
+ * Merged the 6.1-maint branch.
+ [85668d23635b]
+
2021-06-08 Phil Thompson <[email protected]>
+ * .hgtags:
+ Added tag 6.1.1 for changeset e54bff705222
+ [83e5ec425119] <6.1-maint>
+
* NEWS:
Updated the NEWS file.
[e54bff705222] [6.1.1] <6.1-maint>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6_Charts-6.1.1/NEWS new/PyQt6_Charts-6.2.0/NEWS
--- old/PyQt6_Charts-6.1.1/NEWS 2021-06-08 15:35:32.904882000 +0200
+++ new/PyQt6_Charts-6.2.0/NEWS 2021-09-30 18:08:50.232725000 +0200
@@ -1,3 +1,6 @@
+v6.2.0 30th September 2021
+ - Added support for Qt v6.2.
+
v6.1.1 8th June 2021
- Bug fixes.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6_Charts-6.1.1/PKG-INFO
new/PyQt6_Charts-6.2.0/PKG-INFO
--- old/PyQt6_Charts-6.1.1/PKG-INFO 2021-06-08 15:36:07.498029500 +0200
+++ new/PyQt6_Charts-6.2.0/PKG-INFO 2021-09-30 18:09:27.860118600 +0200
@@ -1,13 +1,13 @@
Metadata-Version: 2.1
Name: PyQt6-Charts
-Version: 6.1.1
+Version: 6.2.0
Requires-Python: >=3.6
Summary: Python bindings for the Qt Charts library
Home-Page: https://www.riverbankcomputing.com/software/pyqtchart/
Author: Riverbank Computing Limited
Author-Email: [email protected]
License: GPL v3
-Requires-Dist: PyQt6 (>=6.1.0)
+Requires-Dist: PyQt6 (>=6.2.0)
PyQt6-Charts - Python Bindings for the Qt Charts Library
========================================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6_Charts-6.1.1/pyproject.toml
new/PyQt6_Charts-6.2.0/pyproject.toml
--- old/PyQt6_Charts-6.1.1/pyproject.toml 2021-06-08 15:36:06.365896000
+0200
+++ new/PyQt6_Charts-6.2.0/pyproject.toml 2021-09-30 18:09:26.663048000
+0200
@@ -6,14 +6,14 @@
# Specify the PEP 566 metadata for the project.
[tool.sip.metadata]
name = "PyQt6-Charts"
-version = "6.1.1"
+version = "6.2.0"
summary = "Python bindings for the Qt Charts library"
home-page = "https://www.riverbankcomputing.com/software/pyqtchart/";
author = "Riverbank Computing Limited"
author-email = "[email protected]"
license = "GPL v3"
description-file = "README"
-requires-dist = "PyQt6 (>=6.1.0)"
+requires-dist = "PyQt6 (>=6.2.0)"
# Specify a PyQt-based project.
[tool.sip]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6_Charts-6.1.1/sip/QtCharts/QtChartsmod.sip
new/PyQt6_Charts-6.2.0/sip/QtCharts/QtChartsmod.sip
--- old/PyQt6_Charts-6.1.1/sip/QtCharts/QtChartsmod.sip 2021-06-08
15:36:07.046578000 +0200
+++ new/PyQt6_Charts-6.2.0/sip/QtCharts/QtChartsmod.sip 2021-09-30
18:09:27.352766000 +0200
@@ -25,7 +25,7 @@
%Import QtGui/QtGuimod.sip
%Import QtWidgets/QtWidgetsmod.sip
-%Timeline {QtCharts_6_1_0}
+%Timeline {QtCharts_6_1_0 QtCharts_6_2_0}
%Copying
Copyright (c) 2021 Riverbank Computing Limited <[email protected]>
@@ -52,8 +52,8 @@
const char *PYQT_CHART_VERSION_STR;
%ModuleCode
-static int PYQT_CHART_VERSION = 0x060101;
-static const char *PYQT_CHART_VERSION_STR = "6.1.1";
+static int PYQT_CHART_VERSION = 0x060200;
+static const char *PYQT_CHART_VERSION_STR = "6.2.0";
%End
%Include qabstractaxis.sip
@@ -75,6 +75,7 @@
%Include qcategoryaxis.sip
%Include qchart.sip
%Include qchartview.sip
+%Include qcoloraxis.sip
%Include qdatetimeaxis.sip
%Include qhbarmodelmapper.sip
%Include qhboxplotmodelmapper.sip
@@ -104,3 +105,4 @@
%Include qvxymodelmapper.sip
%Include qxylegendmarker.sip
%Include qxyseries.sip
+%Include qhash.sip
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6_Charts-6.1.1/sip/QtCharts/qabstractaxis.sip
new/PyQt6_Charts-6.2.0/sip/QtCharts/qabstractaxis.sip
--- old/PyQt6_Charts-6.1.1/sip/QtCharts/qabstractaxis.sip 2021-06-08
15:36:07.065195000 +0200
+++ new/PyQt6_Charts-6.2.0/sip/QtCharts/qabstractaxis.sip 2021-09-30
18:09:27.364117000 +0200
@@ -35,6 +35,9 @@
AxisTypeCategory,
AxisTypeDateTime,
AxisTypeLogValue,
+%If (QtCharts_6_2_0 -)
+ AxisTypeColor,
+%End
};
typedef QFlags<QAbstractAxis::AxisType> AxisTypes;
@@ -139,4 +142,23 @@
signals:
void labelsEditableChanged(bool editable);
+
+public:
+%If (QtCharts_6_2_0 -)
+ bool labelsTruncated() const;
+%End
+%If (QtCharts_6_2_0 -)
+ void setTruncateLabels(bool truncateLabels = true);
+%End
+%If (QtCharts_6_2_0 -)
+ bool truncateLabels() const;
+%End
+
+signals:
+%If (QtCharts_6_2_0 -)
+ void labelsTruncatedChanged(bool labelsTruncated);
+%End
+%If (QtCharts_6_2_0 -)
+ void truncateLabelsChanged(bool truncateLabels);
+%End
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6_Charts-6.1.1/sip/QtCharts/qabstractseries.sip
new/PyQt6_Charts-6.2.0/sip/QtCharts/qabstractseries.sip
--- old/PyQt6_Charts-6.1.1/sip/QtCharts/qabstractseries.sip 2021-06-08
15:36:07.045414000 +0200
+++ new/PyQt6_Charts-6.2.0/sip/QtCharts/qabstractseries.sip 2021-09-30
18:09:27.351754000 +0200
@@ -33,13 +33,13 @@
int yes, no;
} graph[] = {
{sipName_QAbstractAxis, &sipType_QAbstractAxis, 19, 1},
- {sipName_QAbstractSeries, &sipType_QAbstractSeries, 24, 2},
- {sipName_QLegendMarker, &sipType_QLegendMarker, 39, 3},
+ {sipName_QAbstractSeries, &sipType_QAbstractSeries, 25, 2},
+ {sipName_QLegendMarker, &sipType_QLegendMarker, 40, 3},
{sipName_QBarSet, &sipType_QBarSet, -1, 4},
{sipName_QBoxSet, &sipType_QBoxSet, -1, 5},
- {sipName_QCandlestickModelMapper, &sipType_QCandlestickModelMapper,
45, 6},
+ {sipName_QCandlestickModelMapper, &sipType_QCandlestickModelMapper,
46, 6},
{sipName_QCandlestickSet, &sipType_QCandlestickSet, -1, 7},
- {sipName_QChart, &sipType_QChart, 47, 8},
+ {sipName_QChart, &sipType_QChart, 48, 8},
{sipName_QChartView, &sipType_QChartView, -1, 9},
{sipName_QHBarModelMapper, &sipType_QHBarModelMapper, -1, 10},
{sipName_QHBoxPlotModelMapper, &sipType_QHBoxPlotModelMapper, -1, 11},
@@ -52,32 +52,37 @@
{sipName_QVPieModelMapper, &sipType_QVPieModelMapper, -1, 18},
{sipName_QVXYModelMapper, &sipType_QVXYModelMapper, -1, -1},
{sipName_QBarCategoryAxis, &sipType_QBarCategoryAxis, -1, 20},
- {sipName_QValueAxis, &sipType_QValueAxis, 23, 21},
- {sipName_QDateTimeAxis, &sipType_QDateTimeAxis, -1, 22},
+ {sipName_QValueAxis, &sipType_QValueAxis, 24, 21},
+ #if QT_VERSION >= 0x060200
+ {sipName_QColorAxis, &sipType_QColorAxis, -1, 22},
+ #else
+ {0, 0, -1, 22},
+ #endif
+ {sipName_QDateTimeAxis, &sipType_QDateTimeAxis, -1, 23},
{sipName_QLogValueAxis, &sipType_QLogValueAxis, -1, -1},
{sipName_QCategoryAxis, &sipType_QCategoryAxis, -1, -1},
- {sipName_QAbstractBarSeries, &sipType_QAbstractBarSeries, 30, 25},
- {sipName_QAreaSeries, &sipType_QAreaSeries, -1, 26},
- {sipName_QBoxPlotSeries, &sipType_QBoxPlotSeries, -1, 27},
- {sipName_QCandlestickSeries, &sipType_QCandlestickSeries, -1, 28},
- {sipName_QXYSeries, &sipType_QXYSeries, 36, 29},
+ {sipName_QAbstractBarSeries, &sipType_QAbstractBarSeries, 31, 26},
+ {sipName_QAreaSeries, &sipType_QAreaSeries, -1, 27},
+ {sipName_QBoxPlotSeries, &sipType_QBoxPlotSeries, -1, 28},
+ {sipName_QCandlestickSeries, &sipType_QCandlestickSeries, -1, 29},
+ {sipName_QXYSeries, &sipType_QXYSeries, 37, 30},
{sipName_QPieSeries, &sipType_QPieSeries, -1, -1},
- {sipName_QBarSeries, &sipType_QBarSeries, -1, 31},
- {sipName_QHorizontalBarSeries, &sipType_QHorizontalBarSeries, -1, 32},
- {sipName_QHorizontalPercentBarSeries,
&sipType_QHorizontalPercentBarSeries, -1, 33},
- {sipName_QHorizontalStackedBarSeries,
&sipType_QHorizontalStackedBarSeries, -1, 34},
- {sipName_QPercentBarSeries, &sipType_QPercentBarSeries, -1, 35},
+ {sipName_QBarSeries, &sipType_QBarSeries, -1, 32},
+ {sipName_QHorizontalBarSeries, &sipType_QHorizontalBarSeries, -1, 33},
+ {sipName_QHorizontalPercentBarSeries,
&sipType_QHorizontalPercentBarSeries, -1, 34},
+ {sipName_QHorizontalStackedBarSeries,
&sipType_QHorizontalStackedBarSeries, -1, 35},
+ {sipName_QPercentBarSeries, &sipType_QPercentBarSeries, -1, 36},
{sipName_QStackedBarSeries, &sipType_QStackedBarSeries, -1, -1},
- {sipName_QLineSeries, &sipType_QLineSeries, 38, 37},
+ {sipName_QLineSeries, &sipType_QLineSeries, 39, 38},
{sipName_QScatterSeries, &sipType_QScatterSeries, -1, -1},
{sipName_QSplineSeries, &sipType_QSplineSeries, -1, -1},
- {sipName_QAreaLegendMarker, &sipType_QAreaLegendMarker, -1, 40},
- {sipName_QBarLegendMarker, &sipType_QBarLegendMarker, -1, 41},
- {sipName_QBoxPlotLegendMarker, &sipType_QBoxPlotLegendMarker, -1, 42},
- {sipName_QCandlestickLegendMarker, &sipType_QCandlestickLegendMarker,
-1, 43},
- {sipName_QPieLegendMarker, &sipType_QPieLegendMarker, -1, 44},
+ {sipName_QAreaLegendMarker, &sipType_QAreaLegendMarker, -1, 41},
+ {sipName_QBarLegendMarker, &sipType_QBarLegendMarker, -1, 42},
+ {sipName_QBoxPlotLegendMarker, &sipType_QBoxPlotLegendMarker, -1, 43},
+ {sipName_QCandlestickLegendMarker, &sipType_QCandlestickLegendMarker,
-1, 44},
+ {sipName_QPieLegendMarker, &sipType_QPieLegendMarker, -1, 45},
{sipName_QXYLegendMarker, &sipType_QXYLegendMarker, -1, -1},
- {sipName_QHCandlestickModelMapper, &sipType_QHCandlestickModelMapper,
-1, 46},
+ {sipName_QHCandlestickModelMapper, &sipType_QHCandlestickModelMapper,
-1, 47},
{sipName_QVCandlestickModelMapper, &sipType_QVCandlestickModelMapper,
-1, -1},
{sipName_QPolarChart, &sipType_QPolarChart, -1, -1},
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6_Charts-6.1.1/sip/QtCharts/qbarset.sip
new/PyQt6_Charts-6.2.0/sip/QtCharts/qbarset.sip
--- old/PyQt6_Charts-6.1.1/sip/QtCharts/qbarset.sip 2021-06-08
15:36:07.115762000 +0200
+++ new/PyQt6_Charts-6.2.0/sip/QtCharts/qbarset.sip 2021-09-30
18:09:27.415344000 +0200
@@ -82,4 +82,50 @@
void pressed(int index);
void released(int index);
void doubleClicked(int index);
+
+public:
+%If (QtCharts_6_2_0 -)
+ QColor selectedColor() const;
+%End
+%If (QtCharts_6_2_0 -)
+ void setSelectedColor(const QColor &color);
+%End
+%If (QtCharts_6_2_0 -)
+ bool isBarSelected(int index) const;
+%End
+%If (QtCharts_6_2_0 -)
+ void selectBar(int index);
+%End
+%If (QtCharts_6_2_0 -)
+ void deselectBar(int index);
+%End
+%If (QtCharts_6_2_0 -)
+ void setBarSelected(int index, bool selected);
+%End
+%If (QtCharts_6_2_0 -)
+ void selectAllBars();
+%End
+%If (QtCharts_6_2_0 -)
+ void deselectAllBars();
+%End
+%If (QtCharts_6_2_0 -)
+ void selectBars(const QList<int> &indexes);
+%End
+%If (QtCharts_6_2_0 -)
+ void deselectBars(const QList<int> &indexes);
+%End
+%If (QtCharts_6_2_0 -)
+ void toggleSelection(const QList<int> &indexes);
+%End
+%If (QtCharts_6_2_0 -)
+ QList<int> selectedBars() const;
+%End
+
+signals:
+%If (QtCharts_6_2_0 -)
+ void selectedColorChanged(const QColor &color);
+%End
+%If (QtCharts_6_2_0 -)
+ void selectedBarsChanged(const QList<int> &indexes);
+%End
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6_Charts-6.1.1/sip/QtCharts/qchartview.sip
new/PyQt6_Charts-6.2.0/sip/QtCharts/qchartview.sip
--- old/PyQt6_Charts-6.1.1/sip/QtCharts/qchartview.sip 2021-06-08
15:36:07.089503000 +0200
+++ new/PyQt6_Charts-6.2.0/sip/QtCharts/qchartview.sip 2021-09-30
18:09:27.386118000 +0200
@@ -33,6 +33,9 @@
VerticalRubberBand,
HorizontalRubberBand,
RectangleRubberBand,
+%If (QtCharts_6_2_0 -)
+ ClickThroughRubberBand,
+%End
};
typedef QFlags<QChartView::RubberBand> RubberBands;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6_Charts-6.1.1/sip/QtCharts/qcoloraxis.sip
new/PyQt6_Charts-6.2.0/sip/QtCharts/qcoloraxis.sip
--- old/PyQt6_Charts-6.1.1/sip/QtCharts/qcoloraxis.sip 1970-01-01
01:00:00.000000000 +0100
+++ new/PyQt6_Charts-6.2.0/sip/QtCharts/qcoloraxis.sip 2021-09-30
18:09:27.385061000 +0200
@@ -0,0 +1,59 @@
+// qcoloraxis.sip generated by MetaSIP
+//
+// This file is part of the QtCharts Python extension module.
+//
+// Copyright (c) 2021 Riverbank Computing Limited <[email protected]>
+//
+// This file is part of PyQt6-Charts.
+//
+// This file may be used under the terms of the GNU General Public License
+// version 3.0 as published by the Free Software Foundation and appearing in
+// the file LICENSE included in the packaging of this file. Please review the
+// following information to ensure the GNU General Public License version 3.0
+// requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+//
+// If you do not wish to use this file under the terms of the GPL version 3.0
+// then you may purchase a commercial license. For more information contact
+// [email protected].
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+
+%If (QtCharts_6_2_0 -)
+
+class QColorAxis : QAbstractAxis
+{
+%TypeHeaderCode
+#include <qcoloraxis.h>
+%End
+
+public:
+ explicit QColorAxis(QObject *parent /TransferThis/ = 0);
+ virtual ~QColorAxis();
+ virtual QAbstractAxis::AxisType type() const;
+ void setMin(qreal min);
+ qreal min() const;
+ void setMax(qreal max);
+ qreal max() const;
+ void setRange(qreal min, qreal max);
+ void setTickCount(int count);
+ int tickCount() const;
+ void setSize(const qreal size);
+ qreal size() const;
+ void setGradient(const QLinearGradient &gradient);
+ QLinearGradient gradient() const;
+ void setAutoRange(bool autoRange);
+ bool autoRange() const;
+
+signals:
+ void minChanged(qreal min);
+ void maxChanged(qreal max);
+ void rangeChanged(qreal min, qreal max);
+ void tickCountChanged(int tickCount);
+ void gradientChanged(const QLinearGradient &gradient);
+ void sizeChanged(const qreal size);
+ void autoRangeChanged(bool autoRange);
+};
+
+%End
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6_Charts-6.1.1/sip/QtCharts/qhash.sip
new/PyQt6_Charts-6.2.0/sip/QtCharts/qhash.sip
--- old/PyQt6_Charts-6.1.1/sip/QtCharts/qhash.sip 1970-01-01
01:00:00.000000000 +0100
+++ new/PyQt6_Charts-6.2.0/sip/QtCharts/qhash.sip 2021-09-30
18:09:27.380817000 +0200
@@ -0,0 +1,268 @@
+// This is the SIP interface definition for the QHash based mapped types
+// specific to the QtCharts module.
+//
+// Copyright (c) 2021 Riverbank Computing Limited <[email protected]>
+//
+// This file is part of PyQt6-Charts.
+//
+// This file may be used under the terms of the GNU General Public License
+// version 3.0 as published by the Free Software Foundation and appearing in
+// the file LICENSE included in the packaging of this file. Please review the
+// following information to ensure the GNU General Public License version 3.0
+// requirements will be met: http://www.gnu.org/copyleft/gpl.html.
+//
+// If you do not wish to use this file under the terms of the GPL version 3.0
+// then you may purchase a commercial license. For more information contact
+// [email protected].
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+
+%If (QtCharts_6_2_0 -)
+
+
+%MappedType QHash<QXYSeries::PointConfiguration, QVariant>
+ /TypeHint="Dict[QXYSeries.PointConfiguration, QVariant]",
+ TypeHintValue="{}"/
+{
+%TypeHeaderCode
+#include <qhash.h>
+#include <qvariant.h>
+#include <qxyseries.h>
+%End
+
+%ConvertFromTypeCode
+ PyObject *d = PyDict_New();
+
+ if (!d)
+ return 0;
+
+ QHash<QXYSeries::PointConfiguration, QVariant>::const_iterator it =
sipCpp->constBegin();
+ QHash<QXYSeries::PointConfiguration, QVariant>::const_iterator end =
sipCpp->constEnd();
+
+ while (it != end)
+ {
+ PyObject *kobj = sipConvertFromEnum(static_cast<int>(it.key()),
+ sipType_QXYSeries_PointConfiguration);
+
+ if (!kobj)
+ {
+ Py_DECREF(d);
+
+ return 0;
+ }
+
+ QVariant *v = new QVariant(it.value());
+ PyObject *vobj = sipConvertFromNewType(v, sipType_QVariant,
+ sipTransferObj);
+
+ if (!vobj)
+ {
+ delete v;
+ Py_DECREF(kobj);
+ Py_DECREF(d);
+
+ return 0;
+ }
+
+ int rc = PyDict_SetItem(d, kobj, vobj);
+
+ Py_DECREF(vobj);
+ Py_DECREF(kobj);
+
+ if (rc < 0)
+ {
+ Py_DECREF(d);
+
+ return 0;
+ }
+
+ ++it;
+ }
+
+ return d;
+%End
+
+%ConvertToTypeCode
+ if (!sipIsErr)
+ return PyDict_Check(sipPy);
+
+ QHash<QXYSeries::PointConfiguration, QVariant> *qh = new
QHash<QXYSeries::PointConfiguration, QVariant>;
+
+ Py_ssize_t pos = 0;
+ PyObject *kobj, *vobj;
+
+ while (PyDict_Next(sipPy, &pos, &kobj, &vobj))
+ {
+ int k = sipConvertToEnum(kobj, sipType_QXYSeries_PointConfiguration);
+
+ if (PyErr_Occurred())
+ {
+ PyErr_Format(PyExc_TypeError,
+ "a key has type '%s' but 'QXYSeries.PointConfiguration' is
expected",
+ sipPyTypeName(Py_TYPE(kobj)));
+
+ delete qh;
+ *sipIsErr = 1;
+
+ return 0;
+ }
+
+ int vstate;
+ QVariant *v = reinterpret_cast<QVariant *>(
+ sipForceConvertToType(vobj, sipType_QVariant, sipTransferObj,
+ SIP_NOT_NONE, &vstate, sipIsErr));
+
+ if (*sipIsErr)
+ {
+ // Any error must be internal, so leave the exception as it is.
+
+ delete qh;
+
+ return 0;
+ }
+
+ qh->insert(static_cast<QXYSeries::PointConfiguration>(k), *v);
+
+ sipReleaseType(v, sipType_QVariant, vstate);
+ }
+
+ *sipCppPtr = qh;
+
+ return sipGetState(sipTransferObj);
+%End
+};
+
+
+%MappedType QHash<int, QHash<QXYSeries::PointConfiguration, QVariant> >
+ /TypeHint="Dict[int, Dict[QXYSeries.PointConfiguration, QVariant]]",
+ TypeHintValue="{}"/
+{
+%TypeHeaderCode
+#include <qhash.h>
+#include <qvariant.h>
+#include <qxyseries.h>
+%End
+
+%ConvertFromTypeCode
+ static const sipTypeDef *value_td = SIP_NULLPTR;
+
+ if (!value_td)
+ {
+ value_td = sipFindType(
+ "QHash<QXYSeries::PointConfiguration,QVariant>");
+ Q_ASSERT(value_td);
+ }
+
+ PyObject *d = PyDict_New();
+
+ if (!d)
+ return 0;
+
+ QHash<int, QHash<QXYSeries::PointConfiguration, QVariant>
>::const_iterator it = sipCpp->constBegin();
+ QHash<int, QHash<QXYSeries::PointConfiguration, QVariant>
>::const_iterator end = sipCpp->constEnd();
+
+ while (it != end)
+ {
+ PyObject *kobj = PyLong_FromLong(it.key());
+
+ if (!kobj)
+ {
+ Py_DECREF(d);
+
+ return 0;
+ }
+
+ QHash<QXYSeries::PointConfiguration, QVariant> v = it.value();
+ PyObject *vobj = sipConvertFromType(&v, value_td, sipTransferObj);
+
+ if (!vobj)
+ {
+ Py_DECREF(kobj);
+ Py_DECREF(d);
+
+ return 0;
+ }
+
+ int rc = PyDict_SetItem(d, kobj, vobj);
+
+ Py_DECREF(vobj);
+ Py_DECREF(kobj);
+
+ if (rc < 0)
+ {
+ Py_DECREF(d);
+
+ return 0;
+ }
+
+ ++it;
+ }
+
+ return d;
+%End
+
+%ConvertToTypeCode
+ if (!sipIsErr)
+ return PyDict_Check(sipPy);
+
+ static const sipTypeDef *value_td = SIP_NULLPTR;
+
+ if (!value_td)
+ {
+ value_td = sipFindType(
+ "QHash<QXYSeries::PointConfiguration,QVariant>");
+ Q_ASSERT(value_td);
+ }
+
+ QHash<int, QHash<QXYSeries::PointConfiguration, QVariant> > *qh = new
QHash<int, QHash<QXYSeries::PointConfiguration, QVariant> >;
+
+ Py_ssize_t pos = 0;
+ PyObject *kobj, *vobj;
+
+ while (PyDict_Next(sipPy, &pos, &kobj, &vobj))
+ {
+ int k = sipLong_AsInt(kobj);
+
+ if (PyErr_Occurred())
+ {
+ PyErr_Format(PyExc_TypeError,
+ "a key has type '%s' but 'int' is expected",
+ sipPyTypeName(Py_TYPE(kobj)));
+
+ delete qh;
+ *sipIsErr = 1;
+
+ return 0;
+ }
+
+ int vstate;
+ QHash<QXYSeries::PointConfiguration, QVariant> *v =
reinterpret_cast<QHash<QXYSeries::PointConfiguration, QVariant>*>(
+ sipForceConvertToType(vobj, value_td, sipTransferObj,
+ SIP_NOT_NONE, &vstate, sipIsErr));
+
+ if (*sipIsErr)
+ {
+ PyErr_Format(PyExc_TypeError,
+ "a dict value has type '%s' but 'dict' is expected",
+ sipPyTypeName(Py_TYPE(vobj)));
+
+ delete qh;
+
+ return 0;
+ }
+
+ qh->insert(k, *v);
+
+ sipReleaseType(v, value_td, vstate);
+ }
+
+ *sipCppPtr = qh;
+
+ return sipGetState(sipTransferObj);
+%End
+};
+
+
+%End
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6_Charts-6.1.1/sip/QtCharts/qlegend.sip
new/PyQt6_Charts-6.2.0/sip/QtCharts/qlegend.sip
--- old/PyQt6_Charts-6.1.1/sip/QtCharts/qlegend.sip 2021-06-08
15:36:07.076484000 +0200
+++ new/PyQt6_Charts-6.2.0/sip/QtCharts/qlegend.sip 2021-09-30
18:09:27.372125000 +0200
@@ -84,6 +84,18 @@
MarkerShapeRectangle,
MarkerShapeCircle,
MarkerShapeFromSeries,
+%If (QtCharts_6_2_0 -)
+ MarkerShapeRotatedRectangle,
+%End
+%If (QtCharts_6_2_0 -)
+ MarkerShapeTriangle,
+%End
+%If (QtCharts_6_2_0 -)
+ MarkerShapeStar,
+%End
+%If (QtCharts_6_2_0 -)
+ MarkerShapePentagon,
+%End
};
QLegend::MarkerShape markerShape() const;
@@ -92,6 +104,22 @@
signals:
void markerShapeChanged(QLegend::MarkerShape shape);
+public:
+%If (QtCharts_6_2_0 -)
+ bool isInteractive() const;
+%End
+%If (QtCharts_6_2_0 -)
+ void setInteractive(bool interactive);
+%End
+
+signals:
+%If (QtCharts_6_2_0 -)
+ void attachedToChartChanged(bool attachedToChart);
+%End
+%If (QtCharts_6_2_0 -)
+ void interactiveChanged(bool interactive);
+%End
+
private:
explicit QLegend(QChart *chart);
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6_Charts-6.1.1/sip/QtCharts/qscatterseries.sip
new/PyQt6_Charts-6.2.0/sip/QtCharts/qscatterseries.sip
--- old/PyQt6_Charts-6.1.1/sip/QtCharts/qscatterseries.sip 2021-06-08
15:36:07.109033000 +0200
+++ new/PyQt6_Charts-6.2.0/sip/QtCharts/qscatterseries.sip 2021-09-30
18:09:27.388386000 +0200
@@ -31,6 +31,18 @@
{
MarkerShapeCircle,
MarkerShapeRectangle,
+%If (QtCharts_6_2_0 -)
+ MarkerShapeRotatedRectangle,
+%End
+%If (QtCharts_6_2_0 -)
+ MarkerShapeTriangle,
+%End
+%If (QtCharts_6_2_0 -)
+ MarkerShapeStar,
+%End
+%If (QtCharts_6_2_0 -)
+ MarkerShapePentagon,
+%End
};
explicit QScatterSeries(QObject *parent /TransferThis/ = 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/PyQt6_Charts-6.1.1/sip/QtCharts/qxyseries.sip
new/PyQt6_Charts-6.2.0/sip/QtCharts/qxyseries.sip
--- old/PyQt6_Charts-6.1.1/sip/QtCharts/qxyseries.sip 2021-06-08
15:36:07.054314000 +0200
+++ new/PyQt6_Charts-6.2.0/sip/QtCharts/qxyseries.sip 2021-09-30
18:09:27.359192000 +0200
@@ -91,4 +91,154 @@
void pointLabelsClippingChanged(bool clipping);
void pointsRemoved(int index, int count);
void penChanged(const QPen &pen);
+
+public:
+%If (QtCharts_6_2_0 -)
+
+ enum class PointConfiguration
+ {
+ Color,
+ Size,
+ Visibility,
+ LabelVisibility,
+ };
+
+%End
+%If (QtCharts_6_2_0 -)
+ void setSelectedColor(const QColor &color);
+%End
+%If (QtCharts_6_2_0 -)
+ QColor selectedColor() const;
+%End
+%If (QtCharts_6_2_0 -)
+ bool isPointSelected(int index);
+%End
+%If (QtCharts_6_2_0 -)
+ void selectPoint(int index);
+%End
+%If (QtCharts_6_2_0 -)
+ void deselectPoint(int index);
+%End
+%If (QtCharts_6_2_0 -)
+ void setPointSelected(int index, bool selected);
+%End
+%If (QtCharts_6_2_0 -)
+ void selectAllPoints();
+%End
+%If (QtCharts_6_2_0 -)
+ void deselectAllPoints();
+%End
+%If (QtCharts_6_2_0 -)
+ void selectPoints(const QList<int> &indexes);
+%End
+%If (QtCharts_6_2_0 -)
+ void deselectPoints(const QList<int> &indexes);
+%End
+%If (QtCharts_6_2_0 -)
+ void toggleSelection(const QList<int> &indexes);
+%End
+%If (QtCharts_6_2_0 -)
+ QList<int> selectedPoints() const;
+%End
+%If (QtCharts_6_2_0 -)
+ void setLightMarker(const QImage &lightMarker);
+%End
+%If (QtCharts_6_2_0 -)
+ const QImage &lightMarker() const;
+%End
+%If (QtCharts_6_2_0 -)
+ void setSelectedLightMarker(const QImage &selectedLightMarker);
+%End
+%If (QtCharts_6_2_0 -)
+ const QImage &selectedLightMarker() const;
+%End
+%If (QtCharts_6_2_0 -)
+ void setMarkerSize(qreal size);
+%End
+%If (QtCharts_6_2_0 -)
+ qreal markerSize() const;
+%End
+%If (QtCharts_6_2_0 -)
+ void setBestFitLineVisible(bool visible = true);
+%End
+%If (QtCharts_6_2_0 -)
+ bool bestFitLineVisible() const;
+%End
+%If (QtCharts_6_2_0 -)
+ std::pair<qreal, qreal> bestFitLineEquation(bool &ok) const;
+%End
+%If (QtCharts_6_2_0 -)
+ void setBestFitLinePen(const QPen &pen);
+%End
+%If (QtCharts_6_2_0 -)
+ QPen bestFitLinePen() const;
+%End
+%If (QtCharts_6_2_0 -)
+ void setBestFitLineColor(const QColor &color);
+%End
+%If (QtCharts_6_2_0 -)
+ QColor bestFitLineColor() const;
+%End
+%If (QtCharts_6_2_0 -)
+ void clearPointConfiguration(const int index, const
QXYSeries::PointConfiguration key);
+%End
+%If (QtCharts_6_2_0 -)
+ void clearPointConfiguration(const int index);
+%End
+%If (QtCharts_6_2_0 -)
+ void clearPointsConfiguration(const QXYSeries::PointConfiguration key);
+%End
+%If (QtCharts_6_2_0 -)
+ void clearPointsConfiguration();
+%End
+%If (QtCharts_6_2_0 -)
+ void setPointConfiguration(const int index, const
QXYSeries::PointConfiguration key, const QVariant &value);
+%End
+%If (QtCharts_6_2_0 -)
+ void setPointConfiguration(const int index, const
QHash<QXYSeries::PointConfiguration, QVariant> &configuration);
+%End
+%If (QtCharts_6_2_0 -)
+ void setPointsConfiguration(const QHash<int,
QHash<QXYSeries::PointConfiguration, QVariant>> &pointsConfiguration);
+%End
+%If (QtCharts_6_2_0 -)
+ QHash<QXYSeries::PointConfiguration, QVariant> pointConfiguration(const
int index) const;
+%End
+%If (QtCharts_6_2_0 -)
+ QHash<int, QHash<QXYSeries::PointConfiguration, QVariant>>
pointsConfiguration() const;
+%End
+%If (QtCharts_6_2_0 -)
+ void sizeBy(const QList<qreal> &sourceData, const qreal minSize, const
qreal maxSize);
+%End
+%If (QtCharts_6_2_0 -)
+ void colorBy(const QList<qreal> &sourceData, const QLinearGradient
&gradient = QLinearGradient());
+%End
+
+signals:
+%If (QtCharts_6_2_0 -)
+ void selectedColorChanged(const QColor &color);
+%End
+%If (QtCharts_6_2_0 -)
+ void selectedPointsChanged();
+%End
+%If (QtCharts_6_2_0 -)
+ void lightMarkerChanged(const QImage &lightMarker);
+%End
+%If (QtCharts_6_2_0 -)
+ void selectedLightMarkerChanged(const QImage &selectedLightMarker);
+%End
+%If (QtCharts_6_2_0 -)
+ void bestFitLineVisibilityChanged(bool visible);
+%End
+%If (QtCharts_6_2_0 -)
+ void bestFitLinePenChanged(const QPen &pen);
+%End
+%If (QtCharts_6_2_0 -)
+ void bestFitLineColorChanged(const QColor &color);
+%End
+%If (QtCharts_6_2_0 -)
+ void pointsConfigurationChanged(const QHash<int,
QHash<QXYSeries::PointConfiguration, QVariant>> &configuration);
+%End
+%If (QtCharts_6_2_0 -)
+ void markerSizeChanged(qreal size);
+%End
};
