aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside6
diff options
context:
space:
mode:
authorFriedemann Kleint <[email protected]>2021-01-19 08:09:39 +0100
committerFriedemann Kleint <[email protected]>2021-01-20 10:11:11 +0000
commit76dbc2b4ec6e5c797ab333b176e019e1f9b14ca2 (patch)
tree2a178eac7a6e48245ca50c70c13dd1302c74058f /sources/pyside6
parent63614c3085fa8105e9f8ced6b2d166c2a7a2c6e6 (diff)
QtCharts: Remove namespace
Adapt to 227020b118fa38ada1d8bd579593dae61f6e3881. Task-number: PYSIDE-904 Task-number: PYSIDE-1482 Change-Id: I9adb78cfe60efd0df73be52132b4ea029986ea18 Reviewed-by: Cristian Maureira-Fredes <[email protected]>
Diffstat (limited to 'sources/pyside6')
-rw-r--r--sources/pyside6/PySide6/QtCharts/CMakeLists.txt105
-rw-r--r--sources/pyside6/PySide6/QtCharts/typesystem_charts.xml442
-rw-r--r--sources/pyside6/tests/QtCharts/qcharts_test.py10
3 files changed, 277 insertions, 280 deletions
diff --git a/sources/pyside6/PySide6/QtCharts/CMakeLists.txt b/sources/pyside6/PySide6/QtCharts/CMakeLists.txt
index f43efbc01..94c39f656 100644
--- a/sources/pyside6/PySide6/QtCharts/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtCharts/CMakeLists.txt
@@ -1,59 +1,58 @@
project(QtCharts)
set(QtCharts_SRC
-${QtCharts_GEN_DIR}/qtcharts_qabstractaxis_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qabstractbarseries_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qabstractseries_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qarealegendmarker_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qareaseries_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qbarcategoryaxis_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qbarlegendmarker_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qbarmodelmapper_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qbarseries_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qbarset_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qboxplotlegendmarker_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qboxplotmodelmapper_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qboxplotseries_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qboxset_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qcandlesticklegendmarker_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qcandlestickmodelmapper_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qcandlestickseries_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qcandlestickset_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qcategoryaxis_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qchart_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qchartview_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qdatetimeaxis_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qhbarmodelmapper_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qhboxplotmodelmapper_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qhcandlestickmodelmapper_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qhorizontalbarseries_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qhorizontalpercentbarseries_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qhorizontalstackedbarseries_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qhpiemodelmapper_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qhxymodelmapper_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qlegend_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qlegendmarker_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qlineseries_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qlogvalueaxis_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qpercentbarseries_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qpielegendmarker_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qpiemodelmapper_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qpieseries_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qpieslice_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qpolarchart_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qscatterseries_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qsplineseries_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qstackedbarseries_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qvalueaxis_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qvbarmodelmapper_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qvboxplotmodelmapper_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qvcandlestickmodelmapper_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qvpiemodelmapper_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qvxymodelmapper_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qxylegendmarker_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qxymodelmapper_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_qxyseries_wrapper.cpp
-${QtCharts_GEN_DIR}/qtcharts_wrapper.cpp
+${QtCharts_GEN_DIR}/qabstractaxis_wrapper.cpp
+${QtCharts_GEN_DIR}/qabstractbarseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qabstractseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qarealegendmarker_wrapper.cpp
+${QtCharts_GEN_DIR}/qareaseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qbarcategoryaxis_wrapper.cpp
+${QtCharts_GEN_DIR}/qbarlegendmarker_wrapper.cpp
+${QtCharts_GEN_DIR}/qbarmodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qbarseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qbarset_wrapper.cpp
+${QtCharts_GEN_DIR}/qboxplotlegendmarker_wrapper.cpp
+${QtCharts_GEN_DIR}/qboxplotmodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qboxplotseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qboxset_wrapper.cpp
+${QtCharts_GEN_DIR}/qcandlesticklegendmarker_wrapper.cpp
+${QtCharts_GEN_DIR}/qcandlestickmodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qcandlestickseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qcandlestickset_wrapper.cpp
+${QtCharts_GEN_DIR}/qcategoryaxis_wrapper.cpp
+${QtCharts_GEN_DIR}/qchart_wrapper.cpp
+${QtCharts_GEN_DIR}/qchartview_wrapper.cpp
+${QtCharts_GEN_DIR}/qdatetimeaxis_wrapper.cpp
+${QtCharts_GEN_DIR}/qhbarmodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qhboxplotmodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qhcandlestickmodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qhorizontalbarseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qhorizontalpercentbarseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qhorizontalstackedbarseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qhpiemodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qhxymodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qlegend_wrapper.cpp
+${QtCharts_GEN_DIR}/qlegendmarker_wrapper.cpp
+${QtCharts_GEN_DIR}/qlineseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qlogvalueaxis_wrapper.cpp
+${QtCharts_GEN_DIR}/qpercentbarseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qpielegendmarker_wrapper.cpp
+${QtCharts_GEN_DIR}/qpiemodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qpieseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qpieslice_wrapper.cpp
+${QtCharts_GEN_DIR}/qpolarchart_wrapper.cpp
+${QtCharts_GEN_DIR}/qscatterseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qsplineseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qstackedbarseries_wrapper.cpp
+${QtCharts_GEN_DIR}/qvalueaxis_wrapper.cpp
+${QtCharts_GEN_DIR}/qvbarmodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qvboxplotmodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qvcandlestickmodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qvpiemodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qvxymodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qxylegendmarker_wrapper.cpp
+${QtCharts_GEN_DIR}/qxymodelmapper_wrapper.cpp
+${QtCharts_GEN_DIR}/qxyseries_wrapper.cpp
# module is always needed
${QtCharts_GEN_DIR}/qtcharts_module_wrapper.cpp
)
diff --git a/sources/pyside6/PySide6/QtCharts/typesystem_charts.xml b/sources/pyside6/PySide6/QtCharts/typesystem_charts.xml
index 82853b857..643201f6d 100644
--- a/sources/pyside6/PySide6/QtCharts/typesystem_charts.xml
+++ b/sources/pyside6/PySide6/QtCharts/typesystem_charts.xml
@@ -2,7 +2,7 @@
<!--
/****************************************************************************
**
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt for Python.
@@ -44,229 +44,227 @@
<!-- PYSIDE-1101 Removing inherited method to avoid argument conflict
on the QChart::scroll overload -->
<rejection class="QGraphicsItem" function-name="scroll"/>
- <namespace-type name="QtCharts">
- <object-type name="QAbstractAxis" since="5.7">
- <enum-type name="AxisType"/>
- </object-type>
- <object-type name="QAbstractBarSeries" since="5.7">
- <enum-type name="LabelsPosition"/>
- <modify-function signature="append(QtCharts::QBarSet*)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- <modify-function signature="append(QList&lt;QtCharts::QBarSet*&gt;)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- <modify-function signature="insert(int,QtCharts::QBarSet*)">
- <modify-argument index="2">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- <modify-function signature="take(QtCharts::QBarSet*)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- </object-type>
- <object-type name="QAbstractSeries" since="5.7">
- <enum-type name="SeriesType"/>
- </object-type>
- <object-type name="QAreaLegendMarker" since="5.7"/>
- <object-type name="QAreaSeries" since="5.7">
- <modify-function signature="setUpperSeries(QtCharts::QLineSeries*)">
+ <object-type name="QAbstractAxis">
+ <enum-type name="AxisType"/>
+ </object-type>
+ <object-type name="QAbstractBarSeries">
+ <enum-type name="LabelsPosition"/>
+ <modify-function signature="append(QBarSet*)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ <modify-function signature="append(QList&lt;QBarSet*&gt;)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ <modify-function signature="insert(int,QBarSet*)">
+ <modify-argument index="2">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ <modify-function signature="take(QBarSet*)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ </object-type>
+ <object-type name="QAbstractSeries">
+ <enum-type name="SeriesType"/>
+ </object-type>
+ <object-type name="QAreaLegendMarker"/>
+ <object-type name="QAreaSeries">
+ <modify-function signature="setUpperSeries(QLineSeries*)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ <modify-function signature="setLowerSeries(QLineSeries*)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ </object-type>
+ <object-type name="QBarCategoryAxis"/>
+ <object-type name="QBarLegendMarker"/>
+ <object-type name="QBarModelMapper"/>
+ <object-type name="QBarSeries"/>
+ <object-type name="QBarSet"/>
+ <object-type name="QBoxPlotLegendMarker"/>
+ <object-type name="QBoxPlotModelMapper"/>
+ <object-type name="QBoxPlotSeries">
+ <modify-function signature="append(QBoxSet*)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ <modify-function signature="append(QList&lt;QBoxSet*&gt;)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ <modify-function signature="insert(int,QBoxSet*)">
+ <modify-argument index="2">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ <modify-function signature="take(QBoxSet*)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ </object-type>
+ <object-type name="QBoxSet">
+ <enum-type name="ValuePositions"/>
+ </object-type>
+ <object-type name="QCandlestickLegendMarker"/>
+ <object-type name="QCandlestickModelMapper"/>
+ <object-type name="QCandlestickSeries">
+ <modify-function signature="append(QCandlestickSet*)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ <modify-function signature="append(QList&lt;QCandlestickSet*&gt;)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ <modify-function signature="insert(int,QCandlestickSet*)">
+ <modify-argument index="2">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ <modify-function signature="take(QCandlestickSet*)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ </object-type>
+ <object-type name="QCandlestickSet"/>
+ <object-type name="QCategoryAxis">
+ <enum-type name="AxisLabelsPosition"/>
+ </object-type>
+ <object-type name="QChart">
+ <enum-type name="ChartType"/>
+ <enum-type name="ChartTheme"/>
+ <enum-type name="AnimationOption" flags="AnimationOptions"/>
+ <modify-function signature="addAxis(QAbstractAxis*,QFlags&lt;Qt::AlignmentFlag&gt;)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ <modify-function signature="addSeries(QAbstractSeries*)">
<modify-argument index="1">
- <parent index="this" action="add"/>
+ <parent index="this" action="add"/>
</modify-argument>
- </modify-function>
- <modify-function signature="setLowerSeries(QtCharts::QLineSeries*)">
+ </modify-function>
+ <modify-function signature="setAxisX(QAbstractAxis*,QAbstractSeries*)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ <modify-argument index="2">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ <modify-function signature="setAxisY(QAbstractAxis*,QAbstractSeries*)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ <modify-argument index="2">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ <modify-function signature="removeAxis(QAbstractAxis*)">
+ <inject-code file="../glue/qtcharts.cpp" snippet="qchart-releaseownership"/>
+ </modify-function>
+ <modify-function signature="removeSeries(QAbstractSeries*)">
+ <inject-code file="../glue/qtcharts.cpp" snippet="qchart-releaseownership"/>
+ </modify-function>
+ </object-type>
+ <object-type name="QChartView">
+ <enum-type name="RubberBand" flags="RubberBands"/>
+ <modify-function signature="QChartView(QChart*,QWidget*)">
<modify-argument index="1">
- <parent index="this" action="add"/>
+ <parent index="this" action="add"/>
</modify-argument>
- </modify-function>
- </object-type>
- <object-type name="QBarCategoryAxis" since="5.7"/>
- <object-type name="QBarLegendMarker" since="5.7"/>
- <object-type name="QBarModelMapper" since="5.7"/>
- <object-type name="QBarSeries" since="5.7"/>
- <object-type name="QBarSet" since="5.7"/>
- <object-type name="QBoxPlotLegendMarker" since="5.7"/>
- <object-type name="QBoxPlotModelMapper" since="5.7"/>
- <object-type name="QBoxPlotSeries" since="5.7">
- <modify-function signature="append(QtCharts::QBoxSet*)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- <modify-function signature="append(QList&lt;QtCharts::QBoxSet*&gt;)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- <modify-function signature="insert(int,QtCharts::QBoxSet*)">
- <modify-argument index="2">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- <modify-function signature="take(QtCharts::QBoxSet*)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- </object-type>
- <object-type name="QBoxSet" since="5.7">
- <enum-type name="ValuePositions"/>
- </object-type>
- <object-type name="QCandlestickLegendMarker" since="5.7"/>
- <object-type name="QCandlestickModelMapper" since="5.7"/>
- <object-type name="QCandlestickSeries" since="5.7">
- <modify-function signature="append(QtCharts::QCandlestickSet*)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- <modify-function signature="append(QList&lt;QtCharts::QCandlestickSet*&gt;)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- <modify-function signature="insert(int,QtCharts::QCandlestickSet*)">
- <modify-argument index="2">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- <modify-function signature="take(QtCharts::QCandlestickSet*)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- </object-type>
- <object-type name="QCandlestickSet" since="5.7"/>
- <object-type name="QCategoryAxis" since="5.7">
- <enum-type name="AxisLabelsPosition"/>
- </object-type>
- <object-type name="QChart" since="5.7">
- <enum-type name="ChartType"/>
- <enum-type name="ChartTheme"/>
- <enum-type name="AnimationOption" flags="AnimationOptions"/>
- <modify-function signature="addAxis(QtCharts::QAbstractAxis*,QFlags&lt;Qt::AlignmentFlag&gt;)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- <modify-function signature="addSeries(QtCharts::QAbstractSeries*)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- <modify-function signature="setAxisX(QtCharts::QAbstractAxis*,QtCharts::QAbstractSeries*)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- <modify-argument index="2">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- <modify-function signature="setAxisY(QtCharts::QAbstractAxis*,QtCharts::QAbstractSeries*)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- <modify-argument index="2">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- <modify-function signature="removeAxis(QtCharts::QAbstractAxis*)">
- <inject-code file="../glue/qtcharts.cpp" snippet="qchart-releaseownership"/>
- </modify-function>
- <modify-function signature="removeSeries(QtCharts::QAbstractSeries*)">
- <inject-code file="../glue/qtcharts.cpp" snippet="qchart-releaseownership"/>
- </modify-function>
- </object-type>
- <object-type name="QChartView" since="5.7">
- <enum-type name="RubberBand" flags="RubberBands"/>
- <modify-function signature="QChartView(QtCharts::QChart*,QWidget*)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- <modify-function signature="setChart(QtCharts::QChart*)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- </object-type>
- <object-type name="QDateTimeAxis" since="5.7"/>
- <object-type name="QHBarModelMapper" since="5.7"/>
- <object-type name="QHBoxPlotModelMapper" since="5.7"/>
- <object-type name="QHCandlestickModelMapper" since="5.7"/>
- <object-type name="QHorizontalBarSeries" since="5.7"/>
- <object-type name="QHorizontalPercentBarSeries" since="5.7"/>
- <object-type name="QHorizontalStackedBarSeries" since="5.7"/>
- <object-type name="QHPieModelMapper" since="5.7"/>
- <object-type name="QHXYModelMapper" since="5.7"/>
- <object-type name="QLegend" since="5.7">
- <enum-type name="MarkerShape"/>
- </object-type>
- <object-type name="QLegendMarker" since="5.7">
- <enum-type name="LegendMarkerType"/>
- </object-type>
- <object-type name="QLineSeries" since="5.7"/>
- <object-type name="QLogValueAxis" since="5.7"/>
- <object-type name="QPercentBarSeries" since="5.7"/>
- <object-type name="QPieLegendMarker" since="5.7"/>
- <object-type name="QPieModelMapper" since="5.7"/>
- <object-type name="QPieSlice" since="5.7">
- <enum-type name="LabelPosition"/>
- </object-type>
- <object-type name="QPieSeries" since="5.7">
- <modify-function signature="append(QtCharts::QPieSlice*)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- <modify-function signature="append(QList&lt;QtCharts::QPieSlice*&gt;)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- <modify-function signature="insert(int,QtCharts::QPieSlice*)">
- <modify-argument index="2">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- <modify-function signature="take(QtCharts::QPieSlice*)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- </object-type>
- <object-type name="QPolarChart" since="5.7">
- <enum-type name="PolarOrientation" flags="PolarOrientations"/>
- <modify-function signature="addAxis(QtCharts::QAbstractAxis*,QtCharts::QPolarChart::PolarOrientation)">
- <modify-argument index="1">
- <parent index="this" action="add"/>
- </modify-argument>
- </modify-function>
- <!-- Compile error assigning default flags value -->
- <modify-function signature="axes(QFlags&lt;QtCharts::QPolarChart::PolarOrientation&gt;,QtCharts::QAbstractSeries*)const" remove="all"/>
- </object-type>
- <object-type name="QScatterSeries" since="5.7">
- <enum-type name="MarkerShape"/>
- </object-type>
- <object-type name="QSplineSeries" since="5.7"/>
- <object-type name="QStackedBarSeries" since="5.7"/>
- <object-type name="QValueAxis" since="5.7">
- <enum-type name="TickType"/>
- </object-type>
- <object-type name="QVBarModelMapper" since="5.7"/>
- <object-type name="QVBoxPlotModelMapper" since="5.7"/>
- <object-type name="QVCandlestickModelMapper" since="5.7"/>
- <object-type name="QVPieModelMapper" since="5.7"/>
- <object-type name="QVXYModelMapper" since="5.7"/>
- <object-type name="QXYLegendMarker" since="5.7"/>
- <object-type name="QXYModelMapper" since="5.7"/>
- <object-type name="QXYSeries" since="5.7"/>
- </namespace-type>
+ </modify-function>
+ <modify-function signature="setChart(QChart*)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ </object-type>
+ <object-type name="QDateTimeAxis"/>
+ <object-type name="QHBarModelMapper"/>
+ <object-type name="QHBoxPlotModelMapper"/>
+ <object-type name="QHCandlestickModelMapper"/>
+ <object-type name="QHorizontalBarSeries"/>
+ <object-type name="QHorizontalPercentBarSeries"/>
+ <object-type name="QHorizontalStackedBarSeries"/>
+ <object-type name="QHPieModelMapper"/>
+ <object-type name="QHXYModelMapper"/>
+ <object-type name="QLegend">
+ <enum-type name="MarkerShape"/>
+ </object-type>
+ <object-type name="QLegendMarker">
+ <enum-type name="LegendMarkerType"/>
+ </object-type>
+ <object-type name="QLineSeries"/>
+ <object-type name="QLogValueAxis"/>
+ <object-type name="QPercentBarSeries"/>
+ <object-type name="QPieLegendMarker"/>
+ <object-type name="QPieModelMapper"/>
+ <object-type name="QPieSlice">
+ <enum-type name="LabelPosition"/>
+ </object-type>
+ <object-type name="QPieSeries">
+ <modify-function signature="append(QPieSlice*)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ <modify-function signature="append(QList&lt;QPieSlice*&gt;)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ <modify-function signature="insert(int,QPieSlice*)">
+ <modify-argument index="2">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ <modify-function signature="take(QPieSlice*)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ </object-type>
+ <object-type name="QPolarChart">
+ <enum-type name="PolarOrientation" flags="PolarOrientations"/>
+ <modify-function signature="addAxis(QAbstractAxis*,QPolarChart::PolarOrientation)">
+ <modify-argument index="1">
+ <parent index="this" action="add"/>
+ </modify-argument>
+ </modify-function>
+ <!-- Compile error assigning default flags value -->
+ <modify-function signature="axes(QFlags&lt;QPolarChart::PolarOrientation&gt;,QAbstractSeries*)const" remove="all"/>
+ </object-type>
+ <object-type name="QScatterSeries">
+ <enum-type name="MarkerShape"/>
+ </object-type>
+ <object-type name="QSplineSeries"/>
+ <object-type name="QStackedBarSeries"/>
+ <object-type name="QValueAxis">
+ <enum-type name="TickType"/>
+ </object-type>
+ <object-type name="QVBarModelMapper"/>
+ <object-type name="QVBoxPlotModelMapper"/>
+ <object-type name="QVCandlestickModelMapper"/>
+ <object-type name="QVPieModelMapper"/>
+ <object-type name="QVXYModelMapper"/>
+ <object-type name="QXYLegendMarker"/>
+ <object-type name="QXYModelMapper"/>
+ <object-type name="QXYSeries"/>
</typesystem>
diff --git a/sources/pyside6/tests/QtCharts/qcharts_test.py b/sources/pyside6/tests/QtCharts/qcharts_test.py
index a8660d8a3..7ce355f75 100644
--- a/sources/pyside6/tests/QtCharts/qcharts_test.py
+++ b/sources/pyside6/tests/QtCharts/qcharts_test.py
@@ -2,7 +2,7 @@
#############################################################################
##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the test suite of Qt for Python.
@@ -41,13 +41,13 @@ init_test_paths(False)
from helper.usesqapplication import UsesQApplication
from PySide6.QtCore import QRect, QSize, QTimer
from PySide6.QtGui import QGuiApplication, QScreen
-from PySide6.QtCharts import QtCharts
+from PySide6.QtCharts import QChart, QChartView, QPieSeries
class QChartsTestCase(UsesQApplication):
'''Tests related to QCharts'''
def testCharts(self):
- self.series = QtCharts.QPieSeries()
+ self.series = QPieSeries()
self.series.append("Jane", 1);
self.series.append("Joe", 2);
self.series.append("Andy", 3);
@@ -56,9 +56,9 @@ class QChartsTestCase(UsesQApplication):
slice = self.series.slices()[1]
slice.setExploded();
slice.setLabelVisible();
- self.chart = QtCharts.QChart()
+ self.chart = QChart()
self.chart.addSeries(self.series);
- chartView = QtCharts.QChartView(self.chart)
+ chartView = QChartView(self.chart)
screenSize = QGuiApplication.primaryScreen().geometry().size()
chartView.resize(screenSize / 2)
chartView.show()