diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-01-28 13:26:42 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-01-28 15:50:42 +0000 |
| commit | cbab8f6c9e963b4657fa0485bb3c02c61eaf682b (patch) | |
| tree | bd70fa4c05b18acb69473abcc90ac6f58ca57886 /sources/pyside6 | |
| parent | b3a69f4fcb4fbf6353012d22e512eb7e797973b4 (diff) | |
PySide6: Remove namespace from QtDataVisualization
Adapt to qtdatavis3d/587d44e8077196ed4aa3df1484e69adcba2dc268.
Task-number: QTBUG-90400
Task-number: PYSIDE-1482
Change-Id: I2a5ad5212cf349805937a32caa90e383c8b533d6
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside6')
3 files changed, 417 insertions, 418 deletions
diff --git a/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt b/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt index afdddf4b8..d50ab1f6c 100644 --- a/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtDataVisualization/CMakeLists.txt @@ -1,42 +1,41 @@ project(QtDataVisualization) set(QtDataVisualization_SRC -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qabstract3daxis_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qcategory3daxis_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qlogvalue3daxisformatter_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qvalue3daxis_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qvalue3daxisformatter_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qabstract3dseries_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qabstractdataproxy_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qbar3dseries_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qbardataitem_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qbardataproxy_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qcustom3ditem_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qcustom3dlabel_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qcustom3dvolume_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qheightmapsurfacedataproxy_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qitemmodelbardataproxy_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qitemmodelscatterdataproxy_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qitemmodelsurfacedataproxy_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qscatter3dseries_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qscatterdataitem_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qscatterdataproxy_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qsurface3dseries_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qsurfacedataitem_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qsurfacedataproxy_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dbars_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dcamera_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dlight_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dobject_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dscatter_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dscene_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dsurface_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qabstract3dgraph_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dinputhandler_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qabstract3dinputhandler_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_qtouch3dinputhandler_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_q3dtheme_wrapper.cpp -${QtDataVisualization_GEN_DIR}/qtdatavisualization_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qabstract3daxis_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qcategory3daxis_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qlogvalue3daxisformatter_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qvalue3daxis_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qvalue3daxisformatter_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qabstract3dseries_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qabstractdataproxy_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qbar3dseries_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qbardataitem_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qbardataproxy_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qcustom3ditem_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qcustom3dlabel_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qcustom3dvolume_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qheightmapsurfacedataproxy_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qitemmodelbardataproxy_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qitemmodelscatterdataproxy_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qitemmodelsurfacedataproxy_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qscatter3dseries_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qscatterdataitem_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qscatterdataproxy_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qsurface3dseries_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qsurfacedataitem_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qsurfacedataproxy_wrapper.cpp +${QtDataVisualization_GEN_DIR}/q3dbars_wrapper.cpp +${QtDataVisualization_GEN_DIR}/q3dcamera_wrapper.cpp +${QtDataVisualization_GEN_DIR}/q3dlight_wrapper.cpp +${QtDataVisualization_GEN_DIR}/q3dobject_wrapper.cpp +${QtDataVisualization_GEN_DIR}/q3dscatter_wrapper.cpp +${QtDataVisualization_GEN_DIR}/q3dscene_wrapper.cpp +${QtDataVisualization_GEN_DIR}/q3dsurface_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qabstract3dgraph_wrapper.cpp +${QtDataVisualization_GEN_DIR}/q3dinputhandler_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qabstract3dinputhandler_wrapper.cpp +${QtDataVisualization_GEN_DIR}/qtouch3dinputhandler_wrapper.cpp +${QtDataVisualization_GEN_DIR}/q3dtheme_wrapper.cpp # module is always needed ${QtDataVisualization_GEN_DIR}/qtdatavisualization_module_wrapper.cpp ) diff --git a/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml b/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml index 08576f2fb..e2396d975 100644 --- a/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml +++ b/sources/pyside6/PySide6/QtDataVisualization/typesystem_datavisualization.xml @@ -43,380 +43,378 @@ <load-typesystem name="templates/datavisualization_common.xml" generate="no" /> <load-typesystem name="QtGui/typesystem_gui.xml" generate="no" /> - <namespace-type name="QtDataVisualization"> - <primitive-type name="QBarDataArray"> - <include file-name="qbardataproxy.h" location="global"/> - <conversion-rule> - <native-to-target> - <insert-template name="cppqlistofptrtoqvectors_to_py_conversion"> - <replace from="%INTYPE_0" to="QtDataVisualization::QBarDataItem"/> - </insert-template> - </native-to-target> - <target-to-native> - <add-conversion type="PySequence"> - <insert-template name="py_to_cppqlistofptrtoqvectors_conversion"> - <replace from="%OUTTYPE_0" to="QtDataVisualization::QBarDataItem"/> - </insert-template> - </add-conversion> - </target-to-native> - </conversion-rule> - </primitive-type> - <primitive-type name="QSurfaceDataArray"> - <include file-name="qsurfacedataproxy.h" location="global"/> - <conversion-rule> - <native-to-target> - <insert-template name="cppqlistofptrtoqvectors_to_py_conversion"> - <replace from="%INTYPE_0" to="QtDataVisualization::QSurfaceDataItem"/> - </insert-template> - </native-to-target> - <target-to-native> - <add-conversion type="PySequence"> - <insert-template name="py_to_cppqlistofptrtoqvectors_conversion"> - <replace from="%OUTTYPE_0" to="QtDataVisualization::QSurfaceDataItem"/> - </insert-template> - </add-conversion> - </target-to-native> - </conversion-rule> - </primitive-type> + <primitive-type name="QBarDataArray"> + <include file-name="qbardataproxy.h" location="global"/> + <conversion-rule> + <native-to-target> + <insert-template name="cppqlistofptrtoqvectors_to_py_conversion"> + <replace from="%INTYPE_0" to="QBarDataItem"/> + </insert-template> + </native-to-target> + <target-to-native> + <add-conversion type="PySequence"> + <insert-template name="py_to_cppqlistofptrtoqvectors_conversion"> + <replace from="%OUTTYPE_0" to="QBarDataItem"/> + </insert-template> + </add-conversion> + </target-to-native> + </conversion-rule> + </primitive-type> + <primitive-type name="QSurfaceDataArray"> + <include file-name="qsurfacedataproxy.h" location="global"/> + <conversion-rule> + <native-to-target> + <insert-template name="cppqlistofptrtoqvectors_to_py_conversion"> + <replace from="%INTYPE_0" to="QSurfaceDataItem"/> + </insert-template> + </native-to-target> + <target-to-native> + <add-conversion type="PySequence"> + <insert-template name="py_to_cppqlistofptrtoqvectors_conversion"> + <replace from="%OUTTYPE_0" to="QSurfaceDataItem"/> + </insert-template> + </add-conversion> + </target-to-native> + </conversion-rule> + </primitive-type> - <object-type name="QAbstract3DAxis"> - <enum-type name="AxisOrientation"/> - <enum-type name="AxisType"/> - </object-type> - <object-type name="QCategory3DAxis"/> - <object-type name="QLogValue3DAxisFormatter"/> - <object-type name="QValue3DAxis"/> - <object-type name="QValue3DAxisFormatter"> - <modify-function signature="populateCopy(QtDataVisualization::QValue3DAxisFormatter&)const"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - </object-type> - <object-type name="QAbstract3DSeries"> - <enum-type name="Mesh"/> - <enum-type name="SeriesType"/> - </object-type> - <object-type name="QAbstractDataProxy"> - <enum-type name="DataType"/> - </object-type> - <object-type name="QBar3DSeries"> - <modify-function signature="setDataProxy(QtDataVisualization::QBarDataProxy*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - </object-type> - <value-type name="QBarDataItem"/> - <object-type name="QBarDataProxy"> - <modify-function signature="resetArray(QtDataVisualization::QBarDataArray*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="resetArray(QtDataVisualization::QBarDataArray*,const QStringList&,const QStringList&)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="addRow(QVector<QtDataVisualization::QBarDataItem>*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="addRow(QVector<QtDataVisualization::QBarDataItem>*, const QString&)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="addRows(const QtDataVisualization::QBarDataArray&)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="addRows(const QtDataVisualization::QBarDataArray&, const QStringList&)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="insertRow(int, QVector<QtDataVisualization::QBarDataItem>*)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="insertRow(int, QVector<QtDataVisualization::QBarDataItem>*, const QString&)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="insertRows(int, const QtDataVisualization::QBarDataArray&)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="insertRows(int, const QtDataVisualization::QBarDataArray&, const QStringList&)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="setRow(int, QVector<QtDataVisualization::QBarDataItem>*)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="setRow(int, QVector<QtDataVisualization::QBarDataItem>*, const QString&)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="setRows(int, const QtDataVisualization::QBarDataArray&)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="setRows(int, const QtDataVisualization::QBarDataArray&, const QStringList&)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - </object-type> - <object-type name="QCustom3DItem"/> - <object-type name="QCustom3DLabel"/> - <object-type name="QCustom3DVolume"/> - <object-type name="QHeightMapSurfaceDataProxy"/> - <object-type name="QItemModelBarDataProxy"> - <enum-type name="MultiMatchBehavior"/> - </object-type> - <object-type name="QItemModelScatterDataProxy"/> - <object-type name="QItemModelSurfaceDataProxy"> - <enum-type name="MultiMatchBehavior"/> - </object-type> - <object-type name="QScatter3DSeries"> - <modify-function signature="setDataProxy(QtDataVisualization::QScatterDataProxy*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - </object-type> - <value-type name="QScatterDataItem"/> - <object-type name="QScatterDataProxy"> - <modify-function signature="resetArray(QVector<QtDataVisualization::QScatterDataItem>*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="addItem(const QtDataVisualization::QScatterDataItem&)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="addItems(const QVector<QtDataVisualization::QScatterDataItem>&)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="insertItem(int, const QtDataVisualization::QScatterDataItem&)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="insertItems(int, const QVector<QtDataVisualization::QScatterDataItem>&)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="setItem(int, const QtDataVisualization::QScatterDataItem&)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="setItems(int, const QVector<QtDataVisualization::QScatterDataItem>&)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - </object-type> - <object-type name="QSurface3DSeries"> - <enum-type name="DrawFlag" flags="DrawFlags"/> - <modify-function signature="QSurface3DSeries(QtDataVisualization::QSurfaceDataProxy*,QObject*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="setDataProxy(QtDataVisualization::QSurfaceDataProxy*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - </object-type> - <value-type name="QSurfaceDataItem"/> - <object-type name="QSurfaceDataProxy"> - <modify-function signature="addRow(QVector<QtDataVisualization::QSurfaceDataItem>*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="insertRow(int, QVector<QtDataVisualization::QSurfaceDataItem>*)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="setRow(int, QVector<QtDataVisualization::QSurfaceDataItem>*)"> - <modify-argument index="2"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="resetArray(QtDataVisualization::QSurfaceDataArray*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - </object-type> - <object-type name="Q3DBars"> - <modify-function signature="addAxis(QtDataVisualization::QAbstract3DAxis*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="releaseAxis(QtDataVisualization::QAbstract3DAxis*)"> - <modify-argument index="1"> - <reference-count action="set"/> - </modify-argument> - <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> - </modify-function> - <modify-function signature="setColumnAxis(QtDataVisualization::QCategory3DAxis*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="setRowAxis(QtDataVisualization::QCategory3DAxis*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - </object-type> - <object-type name="Q3DCamera"> - <enum-type name="CameraPreset"/> - </object-type> - <object-type name="Q3DLight"/> - <object-type name="Q3DObject"/> - <object-type name="Q3DScatter"> - <modify-function signature="addAxis(QtDataVisualization::QValue3DAxis*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="releaseAxis(QtDataVisualization::QValue3DAxis*)"> - <modify-argument index="1"> - <reference-count action="set"/> - </modify-argument> - <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> - </modify-function> - <modify-function signature="setAxisX(QtDataVisualization::QValue3DAxis*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="setAxisY(QtDataVisualization::QValue3DAxis*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="setAxisZ(QtDataVisualization::QValue3DAxis*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - </object-type> - <object-type name="Q3DScene"/> - <object-type name="Q3DSurface"> - <modify-function signature="addAxis(QtDataVisualization::QValue3DAxis*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="releaseAxis(QtDataVisualization::QValue3DAxis*)"> - <modify-argument index="1"> - <reference-count action="set"/> - </modify-argument> - <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> - </modify-function> - <modify-function signature="setAxisX(QtDataVisualization::QValue3DAxis*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="setAxisY(QtDataVisualization::QValue3DAxis*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="setAxisZ(QtDataVisualization::QValue3DAxis*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - </object-type> - <object-type name="QAbstract3DGraph"> - <enum-type name="ElementType"/> - <enum-type name="OptimizationHint" flags="OptimizationHints"/> - <enum-type name="SelectionFlag" flags="SelectionFlags"/> - <enum-type name="ShadowQuality"/> - <modify-function signature="addCustomItem(QtDataVisualization::QCustom3DItem*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="addInputHandler(QtDataVisualization::QAbstract3DInputHandler*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="addTheme(QtDataVisualization::Q3DTheme*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="releaseCustomItem(QtDataVisualization::QCustom3DItem*)"> - <modify-argument index="1"> - <reference-count action="set"/> - </modify-argument> - <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> - </modify-function> - <modify-function signature="releaseInputHandler(QtDataVisualization::QAbstract3DInputHandler*)"> - <modify-argument index="1"> - <reference-count action="set"/> - </modify-argument> - <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> - </modify-function> - <modify-function signature="releaseTheme(QtDataVisualization::Q3DTheme*)"> - <modify-argument index="1"> - <reference-count action="set"/> - </modify-argument> - <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> - </modify-function> - <modify-function signature="setActiveInputHandler(QtDataVisualization::QAbstract3DInputHandler*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - <modify-function signature="setActiveTheme(QtDataVisualization::Q3DTheme*)"> - <modify-argument index="1"> - <parent index="this" action="add"/> - </modify-argument> - </modify-function> - </object-type> - <object-type name="Q3DInputHandler"/> - <object-type name="QAbstract3DInputHandler"> - <enum-type name="InputView"/> - </object-type> - <object-type name="QTouch3DInputHandler"/> - <object-type name="Q3DTheme"> - <enum-type name="ColorStyle"/> - <enum-type name="Theme"/> - </object-type> - <extra-includes> - <include file-name="qutils.h" location="global"/> - </extra-includes> - </namespace-type> + <object-type name="QAbstract3DAxis"> + <enum-type name="AxisOrientation"/> + <enum-type name="AxisType"/> + </object-type> + <object-type name="QCategory3DAxis"/> + <object-type name="QLogValue3DAxisFormatter"/> + <object-type name="QValue3DAxis"/> + <object-type name="QValue3DAxisFormatter"> + <modify-function signature="populateCopy(QValue3DAxisFormatter&)const"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <object-type name="QAbstract3DSeries"> + <enum-type name="Mesh"/> + <enum-type name="SeriesType"/> + </object-type> + <object-type name="QAbstractDataProxy"> + <enum-type name="DataType"/> + </object-type> + <object-type name="QBar3DSeries"> + <modify-function signature="setDataProxy(QBarDataProxy*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <value-type name="QBarDataItem"/> + <object-type name="QBarDataProxy"> + <modify-function signature="resetArray(QBarDataArray*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="resetArray(QBarDataArray*,const QStringList&,const QStringList&)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="addRow(QVector<QBarDataItem>*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="addRow(QVector<QBarDataItem>*, const QString&)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="addRows(const QBarDataArray&)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="addRows(const QBarDataArray&, const QStringList&)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="insertRow(int, QVector<QBarDataItem>*)"> + <modify-argument index="2"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="insertRow(int, QVector<QBarDataItem>*, const QString&)"> + <modify-argument index="2"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="insertRows(int, const QBarDataArray&)"> + <modify-argument index="2"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="insertRows(int, const QBarDataArray&, const QStringList&)"> + <modify-argument index="2"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setRow(int, QVector<QBarDataItem>*)"> + <modify-argument index="2"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setRow(int, QVector<QBarDataItem>*, const QString&)"> + <modify-argument index="2"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setRows(int, const QBarDataArray&)"> + <modify-argument index="2"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setRows(int, const QBarDataArray&, const QStringList&)"> + <modify-argument index="2"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <object-type name="QCustom3DItem"/> + <object-type name="QCustom3DLabel"/> + <object-type name="QCustom3DVolume"/> + <object-type name="QHeightMapSurfaceDataProxy"/> + <object-type name="QItemModelBarDataProxy"> + <enum-type name="MultiMatchBehavior"/> + </object-type> + <object-type name="QItemModelScatterDataProxy"/> + <object-type name="QItemModelSurfaceDataProxy"> + <enum-type name="MultiMatchBehavior"/> + </object-type> + <object-type name="QScatter3DSeries"> + <modify-function signature="setDataProxy(QScatterDataProxy*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <value-type name="QScatterDataItem"/> + <object-type name="QScatterDataProxy"> + <modify-function signature="resetArray(QVector<QScatterDataItem>*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="addItem(const QScatterDataItem&)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="addItems(const QVector<QScatterDataItem>&)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="insertItem(int, const QScatterDataItem&)"> + <modify-argument index="2"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="insertItems(int, const QVector<QScatterDataItem>&)"> + <modify-argument index="2"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setItem(int, const QScatterDataItem&)"> + <modify-argument index="2"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setItems(int, const QVector<QScatterDataItem>&)"> + <modify-argument index="2"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <object-type name="QSurface3DSeries"> + <enum-type name="DrawFlag" flags="DrawFlags"/> + <modify-function signature="QSurface3DSeries(QSurfaceDataProxy*,QObject*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setDataProxy(QSurfaceDataProxy*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <value-type name="QSurfaceDataItem"/> + <object-type name="QSurfaceDataProxy"> + <modify-function signature="addRow(QVector<QSurfaceDataItem>*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="insertRow(int, QVector<QSurfaceDataItem>*)"> + <modify-argument index="2"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setRow(int, QVector<QSurfaceDataItem>*)"> + <modify-argument index="2"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="resetArray(QSurfaceDataArray*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <object-type name="Q3DBars"> + <modify-function signature="addAxis(QAbstract3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="releaseAxis(QAbstract3DAxis*)"> + <modify-argument index="1"> + <reference-count action="set"/> + </modify-argument> + <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> + </modify-function> + <modify-function signature="setColumnAxis(QCategory3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setRowAxis(QCategory3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <object-type name="Q3DCamera"> + <enum-type name="CameraPreset"/> + </object-type> + <object-type name="Q3DLight"/> + <object-type name="Q3DObject"/> + <object-type name="Q3DScatter"> + <modify-function signature="addAxis(QValue3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="releaseAxis(QValue3DAxis*)"> + <modify-argument index="1"> + <reference-count action="set"/> + </modify-argument> + <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> + </modify-function> + <modify-function signature="setAxisX(QValue3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setAxisY(QValue3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setAxisZ(QValue3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <object-type name="Q3DScene"/> + <object-type name="Q3DSurface"> + <modify-function signature="addAxis(QValue3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="releaseAxis(QValue3DAxis*)"> + <modify-argument index="1"> + <reference-count action="set"/> + </modify-argument> + <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> + </modify-function> + <modify-function signature="setAxisX(QValue3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setAxisY(QValue3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setAxisZ(QValue3DAxis*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <object-type name="QAbstract3DGraph"> + <enum-type name="ElementType"/> + <enum-type name="OptimizationHint" flags="OptimizationHints"/> + <enum-type name="SelectionFlag" flags="SelectionFlags"/> + <enum-type name="ShadowQuality"/> + <modify-function signature="addCustomItem(QCustom3DItem*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="addInputHandler(QAbstract3DInputHandler*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="addTheme(Q3DTheme*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="releaseCustomItem(QCustom3DItem*)"> + <modify-argument index="1"> + <reference-count action="set"/> + </modify-argument> + <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> + </modify-function> + <modify-function signature="releaseInputHandler(QAbstract3DInputHandler*)"> + <modify-argument index="1"> + <reference-count action="set"/> + </modify-argument> + <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> + </modify-function> + <modify-function signature="releaseTheme(Q3DTheme*)"> + <modify-argument index="1"> + <reference-count action="set"/> + </modify-argument> + <inject-code file="../glue/qtdatavisualization.cpp" snippet="releaseownership"/> + </modify-function> + <modify-function signature="setActiveInputHandler(QAbstract3DInputHandler*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + <modify-function signature="setActiveTheme(Q3DTheme*)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> + <object-type name="Q3DInputHandler"/> + <object-type name="QAbstract3DInputHandler"> + <enum-type name="InputView"/> + </object-type> + <object-type name="QTouch3DInputHandler"/> + <object-type name="Q3DTheme"> + <enum-type name="ColorStyle"/> + <enum-type name="Theme"/> + </object-type> + <extra-includes> + <include file-name="qutils.h" location="global"/> + </extra-includes> </typesystem> diff --git a/sources/pyside6/tests/QtDataVisualization/datavisualization_test.py b/sources/pyside6/tests/QtDataVisualization/datavisualization_test.py index c368f6cff..5e2be8d1e 100644 --- a/sources/pyside6/tests/QtDataVisualization/datavisualization_test.py +++ b/sources/pyside6/tests/QtDataVisualization/datavisualization_test.py @@ -40,12 +40,14 @@ init_test_paths(False) from helper.usesqguiapplication import UsesQGuiApplication from PySide6.QtCore import QTimer -from PySide6.QtDataVisualization import QtDataVisualization +from PySide6.QtDataVisualization import (Q3DBars, QBar3DSeries, QBarDataItem, + QCategory3DAxis, QValue3DAxis) + def dataToBarDataRow(data): result = [] for d in data: - result.append(QtDataVisualization.QBarDataItem(d)) + result.append(QBarDataItem(d)) return result def dataToBarDataArray(data): @@ -58,18 +60,18 @@ class QtDataVisualizationTestCase(UsesQGuiApplication): '''Tests related to QtDataVisualization''' def testBars(self): - self.bars = QtDataVisualization.Q3DBars() - self.columnAxis = QtDataVisualization.QCategory3DAxis() + self.bars = Q3DBars() + self.columnAxis = QCategory3DAxis() self.columnAxis.setTitle('Columns') self.columnAxis.setTitleVisible(True) self.columnAxis.setLabels(['Column1', 'Column2']) - self.rowAxis = QtDataVisualization.QCategory3DAxis() + self.rowAxis = QCategory3DAxis() self.rowAxis.setTitle('Rows') self.rowAxis.setTitleVisible(True) self.rowAxis.setLabels(['Row1', 'Row2']) - self.valueAxis = QtDataVisualization.QValue3DAxis() + self.valueAxis = QValue3DAxis() self.valueAxis.setTitle('Values') self.valueAxis.setTitleVisible(True) self.valueAxis.setRange(0, 5); @@ -78,7 +80,7 @@ class QtDataVisualizationTestCase(UsesQGuiApplication): self.bars.setColumnAxis(self.columnAxis) self.bars.setValueAxis(self.valueAxis) - self.series = QtDataVisualization.QBar3DSeries() + self.series = QBar3DSeries() self.arrayData = [[1, 2], [3, 4]] self.series.dataProxy().addRows(dataToBarDataArray(self.arrayData)) |