Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport Qt6 bindings from master to ease backporting #56324

Merged
merged 1 commit into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 12 additions & 0 deletions python/PyQt6/3d/3d.sip.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
%Module(name=qgis._3d,
keyword_arguments="All")

${DEFAULTDOCSTRINGSIGNATURE}

%Import core/core.sip

%Import QtCore/QtCoremod.sip
%Import QtGui/QtGuimod.sip
%Import QtXml/QtXmlmod.sip

%Include ./3d_auto.sip
31 changes: 31 additions & 0 deletions python/PyQt6/3d/3d_auto.sip
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Include auto-generated SIP files
%Include auto_generated/processing/qgs3dalgorithms.sip
%Include auto_generated/qgs3d.sip
%Include auto_generated/qgs3dmapscene.sip
%Include auto_generated/qgs3dmapsettings.sip
%Include auto_generated/qgs3dtypes.sip
%Include auto_generated/qgs3dmapcanvas.sip
%Include auto_generated/qgsabstractvectorlayer3drenderer.sip
%Include auto_generated/qgscameracontroller.sip
%Include auto_generated/qgscamerapose.sip
%Include auto_generated/qgslayoutitem3dmap.sip
%Include auto_generated/qgsrulebased3drenderer.sip
%Include auto_generated/qgstiledscenelayer3drenderer.sip
%Include auto_generated/qgsvectorlayer3drenderer.sip
%Include auto_generated/qgspointcloudlayer3drenderer.sip
%Include auto_generated/lights/qgsdirectionallightsettings.sip
%Include auto_generated/lights/qgslightsource.sip
%Include auto_generated/lights/qgspointlightsettings.sip
%Include auto_generated/materials/qgsabstractmaterialsettings.sip
%Include auto_generated/materials/qgsgoochmaterialsettings.sip
%Include auto_generated/materials/qgsmaterialregistry.sip
%Include auto_generated/materials/qgsmetalroughmaterialsettings.sip
%Include auto_generated/materials/qgsnullmaterialsettings.sip
%Include auto_generated/materials/qgsphongmaterialsettings.sip
%Include auto_generated/materials/qgsphongtexturedmaterialsettings.sip
%Include auto_generated/materials/qgssimplelinematerialsettings.sip
%Include auto_generated/symbols/qgsline3dsymbol.sip
%Include auto_generated/symbols/qgspoint3dsymbol.sip
%Include auto_generated/symbols/qgspolygon3dsymbol.sip
%Include auto_generated/symbols/qgspointcloud3dsymbol.sip
%Include auto_generated/qgs3dmapexportsettings.sip
44 changes: 44 additions & 0 deletions python/PyQt6/3d/__init__.py.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# -*- coding: utf-8 -*-

"""
***************************************************************************
__init__.py
---------------------
Date : May 2014
Copyright : (C) 2014 by Nathan Woodrow
Email : woodrow dot nathan at gmail dot com
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************
"""

__author__ = 'Nathan Woodrow'
__date__ = 'May 2014'
__copyright__ = '(C) 2014, Nathan Woodrow'

from qgis.PyQt import QtCore
from qgis._3d import *

from qgis.core import Qgis

@MONKEYPATCH_INJECTIONS@

# manual monkey patching for old enum values
Qgs3DTypes.AltitudeClamping = Qgis.AltitudeClamping
Qgs3DTypes.AltClampAbsolute = Qgis.AltitudeClamping.Absolute
Qgs3DTypes.AltClampAbsolute.is_monkey_patched = True
Qgs3DTypes.AltClampRelative = Qgis.AltitudeClamping.Relative
Qgs3DTypes.AltClampRelative.is_monkey_patched = True
Qgs3DTypes.AltClampTerrain = Qgis.AltitudeClamping.Terrain
Qgs3DTypes.AltClampTerrain.is_monkey_patched = True

Qgs3DTypes.AltitudeBinding = Qgis.AltitudeBinding
Qgs3DTypes.AltBindVertex = Qgis.AltitudeBinding.Vertex
Qgs3DTypes.AltBindVertex.is_monkey_patched = True
Qgs3DTypes.AltBindCentroid = Qgis.AltitudeBinding.Centroid
Qgs3DTypes.AltBindCentroid.is_monkey_patched = True
4 changes: 4 additions & 0 deletions python/PyQt6/3d/auto_additions/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
"""
This folder is completed using sipify.pl script
It is not aimed to be manually edited
"""
3 changes: 3 additions & 0 deletions python/PyQt6/3d/auto_additions/qgs3dmapscene.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# The following has been generated automatically from src/3d/qgs3dmapscene.h
Qgs3DMapScene.Ready = Qgs3DMapScene.SceneState.Ready
Qgs3DMapScene.Updating = Qgs3DMapScene.SceneState.Updating
7 changes: 7 additions & 0 deletions python/PyQt6/3d/auto_additions/qgs3dtypes.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# The following has been generated automatically from src/3d/qgs3dtypes.h
Qgs3DTypes.NoCulling = Qgs3DTypes.CullingMode.NoCulling
Qgs3DTypes.Front = Qgs3DTypes.CullingMode.Front
Qgs3DTypes.Back = Qgs3DTypes.CullingMode.Back
Qgs3DTypes.FrontAndBack = Qgs3DTypes.CullingMode.FrontAndBack
Qgs3DTypes.Main3DRenderer = Qgs3DTypes.Flag3DRenderer.Main3DRenderer
Qgs3DTypes.Selected3DRenderer = Qgs3DTypes.Flag3DRenderer.Selected3DRenderer
26 changes: 26 additions & 0 deletions python/PyQt6/3d/auto_additions/qgsabstractmaterialsettings.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# The following has been generated automatically from src/3d/materials/qgsabstractmaterialsettings.h
QgsAbstractMaterialSettings.RenderingTechnique = QgsMaterialSettingsRenderingTechnique
# monkey patching scoped based enum
QgsAbstractMaterialSettings.Triangles = QgsMaterialSettingsRenderingTechnique.Triangles
QgsAbstractMaterialSettings.Triangles.is_monkey_patched = True
QgsAbstractMaterialSettings.Triangles.__doc__ = "Triangle based rendering (default)"
QgsAbstractMaterialSettings.Lines = QgsMaterialSettingsRenderingTechnique.Lines
QgsAbstractMaterialSettings.Lines.is_monkey_patched = True
QgsAbstractMaterialSettings.Lines.__doc__ = "Line based rendering, requires line data"
QgsAbstractMaterialSettings.InstancedPoints = QgsMaterialSettingsRenderingTechnique.InstancedPoints
QgsAbstractMaterialSettings.InstancedPoints.is_monkey_patched = True
QgsAbstractMaterialSettings.InstancedPoints.__doc__ = "Instanced based rendering, requiring triangles and point data"
QgsAbstractMaterialSettings.Points = QgsMaterialSettingsRenderingTechnique.Points
QgsAbstractMaterialSettings.Points.is_monkey_patched = True
QgsAbstractMaterialSettings.Points.__doc__ = "Point based rendering, requires point data"
QgsAbstractMaterialSettings.TrianglesWithFixedTexture = QgsMaterialSettingsRenderingTechnique.TrianglesWithFixedTexture
QgsAbstractMaterialSettings.TrianglesWithFixedTexture.is_monkey_patched = True
QgsAbstractMaterialSettings.TrianglesWithFixedTexture.__doc__ = "Triangle based rendering, using a fixed, non-user-configurable texture (e.g. for terrain rendering)"
QgsAbstractMaterialSettings.TrianglesFromModel = QgsMaterialSettingsRenderingTechnique.TrianglesFromModel
QgsAbstractMaterialSettings.TrianglesFromModel.is_monkey_patched = True
QgsAbstractMaterialSettings.TrianglesFromModel.__doc__ = "Triangle based rendering, using a model object source"
QgsAbstractMaterialSettings.TrianglesDataDefined = QgsMaterialSettingsRenderingTechnique.TrianglesDataDefined
QgsAbstractMaterialSettings.TrianglesDataDefined.is_monkey_patched = True
QgsAbstractMaterialSettings.TrianglesDataDefined.__doc__ = "Triangle based rendering with possibility of datadefined color \n.. versionadded:: 3.18"
QgsMaterialSettingsRenderingTechnique.__doc__ = 'Material rendering techniques\n\n.. versionadded:: 3.16\n\n' + '* ``Triangles``: ' + QgsMaterialSettingsRenderingTechnique.Triangles.__doc__ + '\n' + '* ``Lines``: ' + QgsMaterialSettingsRenderingTechnique.Lines.__doc__ + '\n' + '* ``InstancedPoints``: ' + QgsMaterialSettingsRenderingTechnique.InstancedPoints.__doc__ + '\n' + '* ``Points``: ' + QgsMaterialSettingsRenderingTechnique.Points.__doc__ + '\n' + '* ``TrianglesWithFixedTexture``: ' + QgsMaterialSettingsRenderingTechnique.TrianglesWithFixedTexture.__doc__ + '\n' + '* ``TrianglesFromModel``: ' + QgsMaterialSettingsRenderingTechnique.TrianglesFromModel.__doc__ + '\n' + '* ``TrianglesDataDefined``: ' + QgsMaterialSettingsRenderingTechnique.TrianglesDataDefined.__doc__
# --
6 changes: 6 additions & 0 deletions python/PyQt6/3d/auto_additions/qgspointcloud3dsymbol.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# The following has been generated automatically from src/3d/symbols/qgspointcloud3dsymbol.h
QgsPointCloud3DSymbol.NoRendering = QgsPointCloud3DSymbol.RenderingStyle.NoRendering
QgsPointCloud3DSymbol.SingleColor = QgsPointCloud3DSymbol.RenderingStyle.SingleColor
QgsPointCloud3DSymbol.ColorRamp = QgsPointCloud3DSymbol.RenderingStyle.ColorRamp
QgsPointCloud3DSymbol.RgbRendering = QgsPointCloud3DSymbol.RenderingStyle.RgbRendering
QgsPointCloud3DSymbol.Classification = QgsPointCloud3DSymbol.RenderingStyle.Classification
4 changes: 4 additions & 0 deletions python/PyQt6/3d/auto_additions/qgsrulebased3drenderer.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# The following has been generated automatically from src/3d/qgsrulebased3drenderer.h
QgsRuleBased3DRenderer.Rule.Filtered = QgsRuleBased3DRenderer.Rule.RegisterResult.Filtered
QgsRuleBased3DRenderer.Rule.Inactive = QgsRuleBased3DRenderer.Rule.RegisterResult.Inactive
QgsRuleBased3DRenderer.Rule.Registered = QgsRuleBased3DRenderer.Rule.RegisterResult.Registered
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/3d/lights/qgsdirectionallightsettings.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/




class QgsDirectionalLightSettings : QgsLightSource
{
%Docstring(signature="appended")
Definition of a directional light in a 3D map scene

.. versionadded:: 3.16
%End

%TypeHeaderCode
#include "qgsdirectionallightsettings.h"
%End
public:
QgsDirectionalLightSettings();
%Docstring
Construct a directional light with default values
%End

virtual Qgis::LightSourceType type() const;

virtual QgsDirectionalLightSettings *clone() const /Factory/;

virtual QDomElement writeXml( QDomDocument &doc, const QgsReadWriteContext &context = QgsReadWriteContext() ) const;

virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context = QgsReadWriteContext() );


QgsVector3D direction() const;
%Docstring
Returns the direction of the light in degrees
%End
void setDirection( const QgsVector3D &direction );
%Docstring
Sets the direction of the light in degrees
%End

QColor color() const;
%Docstring
Returns color of the light
%End
void setColor( const QColor &color );
%Docstring
Sets color of the light
%End

float intensity() const;
%Docstring
Returns intensity of the light
%End
void setIntensity( float intensity );
%Docstring
Sets intensity of the light
%End

bool operator==( const QgsDirectionalLightSettings &other );

};

/************************************************************************
* This file has been generated automatically from *
* *
* src/3d/lights/qgsdirectionallightsettings.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
73 changes: 73 additions & 0 deletions python/PyQt6/3d/auto_generated/lights/qgslightsource.sip.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/3d/lights/qgslightsource.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/







class QgsLightSource /Abstract/
{
%Docstring(signature="appended")
Base class for light sources in 3d scenes.

.. versionadded:: 3.26
%End

%TypeHeaderCode
#include "qgslightsource.h"
%End
public:

virtual ~QgsLightSource();

virtual Qgis::LightSourceType type() const = 0;
%Docstring
Returns the light source type.
%End

virtual QgsLightSource *clone() const = 0 /Factory/;
%Docstring
Returns a copy of the light source.
%End


virtual QDomElement writeXml( QDomDocument &doc, const QgsReadWriteContext &context = QgsReadWriteContext() ) const = 0;
%Docstring
Writes the light source's configuration to a new DOM element and returns it.

.. seealso:: :py:func:`readXml`
%End

virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context = QgsReadWriteContext() ) = 0;
%Docstring
Reads configuration from a DOM element previously written using :py:func:`~QgsLightSource.writeXml`.

.. seealso:: :py:func:`writeXml`
%End

virtual void resolveReferences( const QgsProject &project );
%Docstring
After reading from XML, resolve references to any layers that have been read as layer IDs.
%End

static QgsLightSource *createFromXml( const QDomElement &element, const QgsReadWriteContext &context ) /Factory/;
%Docstring
Creates a new light source from an XML element.
%End
};


/************************************************************************
* This file has been generated automatically from *
* *
* src/3d/lights/qgslightsource.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
Loading
Loading