Merge branch 'master' into stac-core

qgis · Oct 2, 2024 · 3ebb704 · 3ebb704
2 parents 485c44d + aeec9d5
commit 3ebb704
Show file tree

Hide file tree

Showing 104 changed files with 1,334 additions and 527 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -1009,6 +1009,7 @@
         <file>themes/default/mActionTextInsideRect.svg</file>
         <file>themes/default/mIconLabelingRules.svg</file>
         <file>themes/default/mIconStac.svg</file>
+        <file>themes/default/stacked-diagram.svg</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

diff --git a/images/themes/default/propertyicons/meshvectors.svg b/images/themes/default/propertyicons/meshvectors.svg
diff --git a/images/themes/default/stacked-diagram.svg b/images/themes/default/stacked-diagram.svg
diff --git a/python/PyQt6/core/auto_additions/qgis.py b/python/PyQt6/core/auto_additions/qgis.py
@@ -6228,6 +6228,9 @@
 QgsProcessingAlgorithm.Flag.FlagRequiresProject = Qgis.ProcessingAlgorithmFlag.RequiresProject
 QgsProcessingAlgorithm.FlagRequiresProject.is_monkey_patched = True
 QgsProcessingAlgorithm.FlagRequiresProject.__doc__ = "The algorithm requires that a valid QgsProject is available from the processing context in order to execute"
+QgsProcessingAlgorithm.SecurityRisk = Qgis.ProcessingAlgorithmFlag.SecurityRisk
+QgsProcessingAlgorithm.SecurityRisk.is_monkey_patched = True
+QgsProcessingAlgorithm.SecurityRisk.__doc__ = "The algorithm represents a potential security risk if executed with untrusted inputs. \n.. versionadded:: 3.40"
 QgsProcessingAlgorithm.FlagDeprecated = Qgis.ProcessingAlgorithmFlag.Deprecated
 QgsProcessingAlgorithm.Flag.FlagDeprecated = Qgis.ProcessingAlgorithmFlag.Deprecated
 QgsProcessingAlgorithm.FlagDeprecated.is_monkey_patched = True
@@ -6296,6 +6299,10 @@
 
   Available as ``QgsProcessingAlgorithm.FlagRequiresProject`` in older QGIS releases.
 
+* ``SecurityRisk``: The algorithm represents a potential security risk if executed with untrusted inputs.
+
+  .. versionadded:: 3.40
+
 * ``Deprecated``: Algorithm is deprecated
 
   Available as ``QgsProcessingAlgorithm.FlagDeprecated`` in older QGIS releases.

diff --git a/python/PyQt6/core/auto_generated/diagram/qgsdiagram.sip.in b/python/PyQt6/core/auto_generated/diagram/qgsdiagram.sip.in
@@ -27,9 +27,9 @@ Base class for all diagram types.
       sipType = sipType_QgsHistogramDiagram;
     else if ( sipCpp->diagramName() == QLatin1String( "Text" ) )
       sipType = sipType_QgsTextDiagram;
-    else if ( sipCpp->diagramName() == QLatin1String( "StackedBar" ) )
-      sipType = sipType_QgsStackedBarDiagram;
     else if ( sipCpp->diagramName() == QLatin1String( "Stacked" ) )
+      sipType = sipType_QgsStackedBarDiagram;
+    else if ( sipCpp->diagramName() == QLatin1String( "StackedDiagram" ) )
       sipType = sipType_QgsStackedDiagram;
     else
       sipType = NULL;

diff --git a/python/PyQt6/core/auto_generated/layertree/qgscolorramplegendnode.sip.in b/python/PyQt6/core/auto_generated/layertree/qgscolorramplegendnode.sip.in
@@ -23,7 +23,8 @@ A legend node which renders a color ramp.
   public:
 
     QgsColorRampLegendNode( QgsLayerTreeLayer *nodeLayer, QgsColorRamp *ramp /Transfer/,
-                            const QString &minimumLabel, const QString &maximumLabel, QObject *parent /TransferThis/ = 0 );
+                            const QString &minimumLabel, const QString &maximumLabel, QObject *parent /TransferThis/ = 0,
+                            const QString &key = QString(), const QString &parentKey = QString() );
 %Docstring
 Constructor for QgsColorRampLegendNode.
 
@@ -32,11 +33,14 @@ Constructor for QgsColorRampLegendNode.
 :param minimumLabel: label text to render for the minimum value in the ramp
 :param maximumLabel: label text to render for the maximum value in the ramp
 :param parent: attach a parent QObject to the legend node.
+:param key: rule key. optional identifier to allow a unique ID to be assigned to the node by a renderer (since QGIS 3.40)
+:param parentKey: rule key of parent (since QGIS 3.40)
 %End
 
     QgsColorRampLegendNode( QgsLayerTreeLayer *nodeLayer, QgsColorRamp *ramp /Transfer/,
                             const QgsColorRampLegendNodeSettings &settings, double minimumValue,
-                            double maximumValue, QObject *parent /TransferThis/ = 0 );
+                            double maximumValue, QObject *parent /TransferThis/ = 0,
+                            const QString &key = QString(), const QString &parentKey = QString() );
 %Docstring
 Constructor for QgsColorRampLegendNode.
 
@@ -46,6 +50,8 @@ Constructor for QgsColorRampLegendNode.
 :param minimumValue: value associated with minimum of ramp
 :param maximumValue: value associated with maximum of ramp
 :param parent: attach a parent QObject to the legend node.
+:param key: rule key. optional identifier to allow a unique ID to be assigned to the node by a renderer (since QGIS 3.40)
+:param parentKey: rule key of parent (since QGIS 3.40)
 %End
 
 

diff --git a/python/PyQt6/core/auto_generated/layertree/qgslayertreemodellegendnode.sip.in b/python/PyQt6/core/auto_generated/layertree/qgslayertreemodellegendnode.sip.in
@@ -582,7 +582,8 @@ Implementation of legend node interface for displaying raster legend entries
 %End
   public:
 
-    QgsRasterSymbolLegendNode( QgsLayerTreeLayer *nodeLayer, const QColor &color, const QString &label, QObject *parent /TransferThis/ = 0, bool isCheckable = false, const QString &ruleKey = QString() );
+    QgsRasterSymbolLegendNode( QgsLayerTreeLayer *nodeLayer, const QColor &color, const QString &label, QObject *parent /TransferThis/ = 0,
+                               bool isCheckable = false, const QString &ruleKey = QString(), const QString &parentRuleKey = QString() );
 %Docstring
 Constructor for QgsRasterSymbolLegendNode.
 
@@ -592,6 +593,7 @@ Constructor for QgsRasterSymbolLegendNode.
 :param parent: attach a parent QObject to the legend node.
 :param isCheckable: set to ``True`` to enable the checkbox for the node (since QGIS 3.18)
 :param ruleKey: optional identifier to allow a unique ID to be assigned to the node by a renderer (since QGIS 3.18)
+:param parentRuleKey: rule key of parent (since QGIS 3.40)
 %End
 
     virtual Qt::ItemFlags flags() const;

diff --git a/python/PyQt6/core/auto_generated/processing/models/qgsprocessingmodelalgorithm.sip.in b/python/PyQt6/core/auto_generated/processing/models/qgsprocessingmodelalgorithm.sip.in
@@ -32,6 +32,8 @@ Constructor for QgsProcessingModelAlgorithm.
     virtual void initAlgorithm( const QVariantMap &configuration = QVariantMap() );  //#spellok
 
 
+    virtual Qgis::ProcessingAlgorithmFlags flags() const;
+
     virtual QString name() const;
 
     virtual QString displayName() const;

diff --git a/python/PyQt6/core/auto_generated/qgis.sip.in b/python/PyQt6/core/auto_generated/qgis.sip.in
@@ -1922,6 +1922,7 @@ The development version
       SkipGenericModelLogging,
       NotAvailableInStandaloneTool,
       RequiresProject,
+      SecurityRisk,
       Deprecated,
     };