Fix merge conflict

qgis · Aug 2, 2020 · 8501959 · 8501959
2 parents 737143d + 46a9153
commit 8501959
Show file tree

Hide file tree

Showing 281 changed files with 7,032 additions and 1,028 deletions.
diff --git a/python/3d/auto_generated/qgsphongmaterialsettings.sip.in b/python/3d/auto_generated/qgsphongmaterialsettings.sip.in
@@ -62,6 +62,9 @@ Returns specular color component
 Returns shininess of the surface
 %End
 
+    virtual QMap<QString, QString> toExportParameters() const;
+
+
     bool diffuseTextureEnabled() const;
 %Docstring
 Returns whether the diffuse texture is used.

diff --git a/python/3d/auto_generated/symbols/qgsline3dsymbol.sip.in b/python/3d/auto_generated/symbols/qgsline3dsymbol.sip.in
@@ -48,6 +48,8 @@ Caller takes ownership of the returned symbol.
 
     virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context );
 
+    virtual QList< QgsWkbTypes::GeometryType > compatibleGeometryTypes() const;
+
 
     Qgs3DTypes::AltitudeClamping altitudeClamping() const;
 %Docstring
@@ -115,6 +117,7 @@ Sets the ``material`` settings used for shading of the symbol.
 Ownership of ``material`` is transferred to the symbol.
 %End
 
+
 };
 
 

diff --git a/python/3d/auto_generated/symbols/qgspoint3dsymbol.sip.in b/python/3d/auto_generated/symbols/qgspoint3dsymbol.sip.in
@@ -53,6 +53,8 @@ Caller takes ownership of the returned symbol.
 
     virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context );
 
+    virtual QList< QgsWkbTypes::GeometryType > compatibleGeometryTypes() const;
+
 
     Qgs3DTypes::AltitudeClamping altitudeClamping() const;
 %Docstring

diff --git a/python/3d/auto_generated/symbols/qgspolygon3dsymbol.sip.in b/python/3d/auto_generated/symbols/qgspolygon3dsymbol.sip.in
@@ -42,6 +42,8 @@ Constructor for QgsPolygon3DSymbol
 
     virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context );
 
+    virtual QList< QgsWkbTypes::GeometryType > compatibleGeometryTypes() const;
+
 
     static QgsAbstract3DSymbol *create() /Factory/;
 %Docstring
@@ -186,6 +188,7 @@ Returns which facade of the buildings is rendered (0 for None, 1 for Walls, 2 fo
 .. versionadded:: 3.16
 %End
 
+
 };
 
 

diff --git a/python/core/auto_generated/3d/qgsabstract3dsymbol.sip.in b/python/core/auto_generated/3d/qgsabstract3dsymbol.sip.in
@@ -54,6 +54,13 @@ Writes symbol configuration to the given DOM element
     virtual void readXml( const QDomElement &elem, const QgsReadWriteContext &context ) = 0;
 %Docstring
 Reads symbol configuration from the given DOM element
+%End
+
+    virtual QList< QgsWkbTypes::GeometryType > compatibleGeometryTypes() const;
+%Docstring
+Returns the list of the vector layer geometry types which are compatible with this symbol.
+
+.. versionadded:: 3.16
 %End
 
     enum Property
@@ -78,6 +85,7 @@ Returns a reference to the symbol layer's property collection, used for data def
 Sets the symbol layer's property collection, used for data defined overrides.
 %End
 
+
   protected:
 
     void copyBaseSettings( QgsAbstract3DSymbol *destination ) const;

diff --git a/python/core/auto_generated/layout/qgslayoutmodel.sip.in b/python/core/auto_generated/layout/qgslayoutmodel.sip.in
@@ -178,6 +178,28 @@ Returns ``True`` if the model includes the empty item choice.
 .. seealso:: :py:func:`setAllowEmptyItem`
 
 .. versionadded:: 3.8
+%End
+
+    void setItemFlags( QgsLayoutItem::Flags flags );
+%Docstring
+Sets layout item flags to use for filtering the available items.
+
+Set ``flags`` to ``None`` to clear the flag based filtering.
+
+.. seealso:: :py:func:`itemFlags`
+
+.. versionadded:: 3.16
+%End
+
+    QgsLayoutItem::Flags itemFlags() const;
+%Docstring
+Returns the layout item flags used for filtering the available items.
+
+Returns ``None`` if no flag based filtering is occurring.
+
+.. seealso:: :py:func:`setItemFlags`
+
+.. versionadded:: 3.16
 %End
 
   protected:

diff --git a/python/core/auto_generated/processing/qgsprocessingalgorithm.sip.in b/python/core/auto_generated/processing/qgsprocessingalgorithm.sip.in
@@ -49,6 +49,8 @@ Abstract base class for processing algorithms.
       FlagCustomException,
       FlagPruneModelBranchesBasedOnAlgorithmResults,
       FlagSkipGenericModelLogging,
+      FlagNotAvailableInStandaloneTool,
+      FlagRequiresProject,
       FlagDeprecated,
     };
     typedef QFlags<QgsProcessingAlgorithm::Flag> Flags;

diff --git a/python/core/auto_generated/processing/qgsprocessingcontext.sip.in b/python/core/auto_generated/processing/qgsprocessingcontext.sip.in
@@ -73,8 +73,8 @@ Returns the project in which the algorithm is being executed.
 %Docstring
 Sets the ``project`` in which the algorithm will be executed.
 
-This also automatically sets the :py:func:`~QgsProcessingContext.transformContext` to match
-the project's transform context.
+This also automatically sets the :py:func:`~QgsProcessingContext.transformContext`, :py:func:`~QgsProcessingContext.ellipsoid`, :py:func:`~QgsProcessingContext.distanceUnit` and
+:py:func:`~QgsProcessingContext.areaUnit` to match the project's settings.
 
 .. seealso:: :py:func:`project`
 %End
@@ -105,6 +105,74 @@ Note that setting a project for the context will automatically set the coordinat
 context.
 
 .. seealso:: :py:func:`transformContext`
+%End
+
+    QString ellipsoid() const;
+%Docstring
+Returns the ellipsoid to use for distance and area calculations.
+
+.. seealso:: :py:func:`setEllipsoid`
+
+.. versionadded:: 3.16
+%End
+
+    void setEllipsoid( const QString &ellipsoid );
+%Docstring
+Sets a specified ``ellipsoid`` to use for distance and area calculations.
+
+If not explicitly set, the ellipsoid will default to the :py:func:`~QgsProcessingContext.project`'s ellipsoid setting.
+
+.. seealso:: :py:func:`ellipsoid`
+
+.. versionadded:: 3.16
+%End
+
+    QgsUnitTypes::DistanceUnit distanceUnit() const;
+%Docstring
+Returns the distance unit to use for distance calculations.
+
+.. seealso:: :py:func:`setDistanceUnit`
+
+.. seealso:: :py:func:`areaUnit`
+
+.. versionadded:: 3.16
+%End
+
+    void setDistanceUnit( QgsUnitTypes::DistanceUnit unit );
+%Docstring
+Sets the ``unit`` to use for distance calculations.
+
+If not explicitly set, the unit will default to the :py:func:`~QgsProcessingContext.project`'s distance unit setting.
+
+.. seealso:: :py:func:`distanceUnit`
+
+.. seealso:: :py:func:`setAreaUnit`
+
+.. versionadded:: 3.16
+%End
+
+    QgsUnitTypes::AreaUnit areaUnit() const;
+%Docstring
+Returns the area unit to use for area calculations.
+
+.. seealso:: :py:func:`setAreaUnit`
+
+.. seealso:: :py:func:`distanceUnit`
+
+.. versionadded:: 3.16
+%End
+
+    void setAreaUnit( QgsUnitTypes::AreaUnit areaUnit );
+%Docstring
+Sets the ``unit`` to use for area calculations.
+
+If not explicitly set, the unit will default to the :py:func:`~QgsProcessingContext.project`'s area unit setting.
+
+.. seealso:: :py:func:`areaUnit`
+
+.. seealso:: :py:func:`setDistanceUnit`
+
+.. versionadded:: 3.16
 %End
 
     QgsMapLayerStore *temporaryLayerStore();
@@ -138,6 +206,8 @@ Default constructor
 
         QString name;
 
+        bool forceName;
+
         QString outputName;
 
         QgsProcessingUtils::LayerHint layerTypeHint;

diff --git a/python/core/auto_generated/qgsmapsettings.sip.in b/python/core/auto_generated/qgsmapsettings.sip.in
@@ -346,6 +346,7 @@ Gets color that is used for drawing of selected vector features
       RenderPreviewJob,
       RenderBlocking,
       LosslessImageRendering,
+      Render3DMap,
       // TODO: ignore scale-based visibility (overview)
     };
     typedef QFlags<QgsMapSettings::Flag> Flags;

diff --git a/python/core/auto_generated/qgsrendercontext.sip.in b/python/core/auto_generated/qgsrendercontext.sip.in
@@ -46,6 +46,7 @@ to be rendered etc.
       RenderSymbolPreview,
       LosslessImageRendering,
       ApplyScalingWorkaroundForTextRendering,
+      Render3DMap,
     };
     typedef QFlags<QgsRenderContext::Flag> Flags;
 

diff --git a/python/core/auto_generated/symbology/qgsstyle.sip.in b/python/core/auto_generated/symbology/qgsstyle.sip.in
@@ -96,6 +96,7 @@ Constructor for QgsStyle.
       TextFormatEntity,
       LabelSettingsEntity,
       LegendPatchShapeEntity,
+      Symbol3DEntity,
     };
 
     bool addEntity( const QString &name, const QgsStyleEntityInterface *entity, bool update = false );
@@ -186,6 +187,21 @@ Returns ``True`` if the operation was successful.
    Adding legend patch shapes with the name of existing ones replaces them.
 
 .. versionadded:: 3.14
+%End
+
+    bool addSymbol3D( const QString &name, QgsAbstract3DSymbol *symbol /Transfer/, bool update = false );
+%Docstring
+Adds a 3d ``symbol`` with the specified ``name`` to the style. Ownership of ``symbol`` is transferred.
+
+If ``update`` is set to ``True``, the style database will be automatically updated with the new legend patch shape.
+
+Returns ``True`` if the operation was successful.
+
+.. note::
+
+   Adding 3d symbols with the name of existing ones replaces them.
+
+.. versionadded:: 3.16
 %End
 
     int addTag( const QString &tagName );
@@ -311,6 +327,28 @@ with the specified ``name``, or QgsSymbol.Hybrid
 if a matching legend patch shape is not present.
 
 .. versionadded:: 3.14
+%End
+
+    QgsAbstract3DSymbol *symbol3D( const QString &name ) const /Factory/;
+%Docstring
+Returns a new copy of the 3D symbol with the specified ``name``.
+
+.. versionadded:: 3.16
+%End
+
+    int symbol3DCount() const;
+%Docstring
+Returns count of 3D symbols in the style.
+
+.. versionadded:: 3.16
+%End
+
+    QList< QgsWkbTypes::GeometryType > symbol3DCompatibleGeometryTypes( const QString &name ) const;
+%Docstring
+Returns the list of the vector layer geometry types which are compatible with the 3D symbol
+with the specified ``name``, or an empty list if a matching 3d symbol is not present.
+
+.. versionadded:: 3.16
 %End
 
     QgsWkbTypes::GeometryType labelSettingsLayerType( const QString &name ) const;
@@ -663,6 +701,34 @@ Returns the default patch geometry for the given symbol ``type`` and ``size`` as
 .. seealso:: :py:func:`defaultPatch`
 
 .. versionadded:: 3.14
+%End
+
+    bool saveSymbol3D( const QString &name, QgsAbstract3DSymbol *symbol /Transfer/, bool favorite, const QStringList &tags );
+%Docstring
+Adds a 3d ``symbol`` to the database.
+
+:param name: is the name of the 3d symbol
+:param symbol: 3d symbol to save. Ownership is transferred.
+:param favorite: is a boolean value to specify whether the 3d symbol should be added to favorites
+:param tags: is a list of tags that are associated with the 3d symbol
+
+:return: returns the success state of the save operation
+
+.. versionadded:: 3.16
+%End
+
+    bool renameSymbol3D( const QString &oldName, const QString &newName );
+%Docstring
+Changes a 3d symbol's name.
+
+.. versionadded:: 3.16
+%End
+
+    QStringList symbol3DNames() const;
+%Docstring
+Returns a list of names of 3d symbols in the style.
+
+.. versionadded:: 3.16
 %End
 
     bool createDatabase( const QString &filename );
@@ -1241,6 +1307,36 @@ Returns the entity's legend patch shape.
 
 };
 
+class QgsStyleSymbol3DEntity : QgsStyleEntityInterface
+{
+%Docstring
+A 3d symbol entity for QgsStyle databases.
+
+.. versionadded:: 3.16
+%End
+
+%TypeHeaderCode
+#include "qgsstyle.h"
+%End
+  public:
+
+    QgsStyleSymbol3DEntity( const QgsAbstract3DSymbol *symbol );
+%Docstring
+Constructor for QgsStyleSymbol3DEntity, with the specified ``symbol``.
+
+Ownership of ``symbol`` is NOT transferred.
+%End
+
+    virtual QgsStyle::StyleEntity type() const;
+
+
+    const QgsAbstract3DSymbol *symbol() const;
+%Docstring
+Returns the entity's symbol.
+%End
+
+};
+
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *

diff --git a/python/core/auto_generated/symbology/qgsstylemodel.sip.in b/python/core/auto_generated/symbology/qgsstylemodel.sip.in
@@ -9,6 +9,7 @@
 
 
 
+
 class QgsStyleModel: QAbstractItemModel
 {
 %Docstring
@@ -43,6 +44,7 @@ instead.
       SymbolTypeRole,
       IsFavoriteRole,
       LayerTypeRole,
+      CompatibleGeometryTypesRole,
     };
 
     explicit QgsStyleModel( QgsStyle *style, QObject *parent /TransferThis/ = 0 );
@@ -84,6 +86,7 @@ This allows style icons to be generated at an icon size which
 corresponds exactly to the view's icon size in which this model is used.
 %End
 
+
 };
 
 class QgsStyleProxyModel: QSortFilterProxyModel
@@ -217,7 +220,7 @@ no effect on non-symbol entities (i.e. color ramps).
 Returns the layer type filter, or QgsWkbTypes.UnknownGeometry if no
 layer type filter is present.
 
-This setting has no effect on non-label settings entities (i.e. color ramps).
+This setting has an effect on label settings entities and 3d symbols only.
 
 .. seealso:: :py:func:`setLayerType`
 %End