Merge pull request #4763 from nyalldawson/algs3

Restore more processing algs

Author: nyalldawson

.ci/travis/linux/blacklist.txt

@@ -10,7 +10,6 @@ PyQgsDBManagerGpkg
 
 # temporary during processing refactoring
 ProcessingParametersTest
-ProcessingModelerTest
 ProcessingGdalAlgorithmsTest
 
 # layout tests are run on separate build

python/core/processing/qgsprocessingoutputs.sip

@@ -38,6 +38,8 @@ class QgsProcessingOutputDefinition
       sipType = sipType_QgsProcessingOutputNumber;
     else if ( sipCpp->type() == "outputString" )
       sipType = sipType_QgsProcessingOutputString;
+    else if ( sipCpp->type() == "outputFolder" )
+      sipType = sipType_QgsProcessingOutputFolder;
 %End
   public:
 
@@ -206,6 +208,25 @@ class QgsProcessingOutputString : QgsProcessingOutputDefinition
     virtual QString type() const;
 };
 
+class QgsProcessingOutputFolder : QgsProcessingOutputDefinition
+{
+%Docstring
+ A folder output for processing algorithms.
+.. versionadded:: 3.0
+%End
+
+%TypeHeaderCode
+#include "qgsprocessingoutputs.h"
+%End
+  public:
+
+    QgsProcessingOutputFolder( const QString &name, const QString &description = QString() );
+%Docstring
+ Constructor for QgsProcessingOutputFolder.
+%End
+
+    virtual QString type() const;
+};
 
 
 

python/core/processing/qgsprocessingparameters.sip

@@ -315,12 +315,29 @@ class QgsProcessingParameterDefinition
  :rtype: bool
 %End
 
+
+    QVariantMap &metadata();
+%Docstring
+ Returns the parameter's freeform metadata. This is mostly used by parameter widget wrappers
+ in order to customise their appearance and behavior.
+.. seealso:: setMetadata()
+ :rtype: QVariantMap
+%End
+
+    void setMetadata( const QVariantMap &metadata );
+%Docstring
+ Sets the parameter's freeform ``metadata``. This is mostly used by parameter widget wrappers
+ in order to customise their appearance and behavior.
+.. seealso:: metadata()
+%End
+
   protected:
 
 
 
 
 
+
 };
 
 QFlags<QgsProcessingParameterDefinition::Flag> operator|(QgsProcessingParameterDefinition::Flag f1, QFlags<QgsProcessingParameterDefinition::Flag> f2);

python/core/qgsvectorlayerexporter.sip

@@ -124,6 +124,13 @@ class QgsVectorLayerExporter : QgsFeatureSink
  Finalizes the export and closes the new created layer.
 %End
 
+    bool flushBuffer();
+%Docstring
+ Flush the buffer writing the features to the new layer.
+.. versionadded:: 3.0
+ :rtype: bool
+%End
+
   private:
     QgsVectorLayerExporter( const QgsVectorLayerExporter &rh );
 };

python/plugins/processing/algs/help/qgis.yaml

@@ -312,7 +312,7 @@ qgis:mergelines: >
 qgis:mergevectorlayers: >
   This algorithm combines multiple vector layers of the same geometry type into a single one.
 
-  If attributes tables are different, the attribute table of the resulting layer will contain the attributes from both input layers.
+  If attributes tables are different, the attribute table of the resulting layer will contain the attributes from all input layers. New attributes will be added for the original layer name and source.
 
   The layers will all be reprojected to match the coordinate reference system of the first input layer.