Merge branch 'processing_parameters_refactoring' of https://github.com/volaya/QGIS into processing_parameters_refactoring

Author: alexbruy

python/plugins/processing/algs/gdal/GdalAlgorithmDialog.py

@@ -41,8 +41,7 @@ def __init__(self, alg):
 
         self.alg = alg
 
-        self.mainWidget = GdalParametersPanel(self, alg)
-        self.setMainWidget()
+        self.setMainWidget(GdalParametersPanel(self, alg))
 
         cornerWidget = QWidget()
         layout = QVBoxLayout()
@@ -56,9 +55,6 @@ def __init__(self, alg):
 
         self.mainWidget.parametersHaveChanged()
 
-        QgsMapLayerRegistry.instance().layerWasAdded.connect(self.mainWidget.layerAdded)
-        QgsMapLayerRegistry.instance().layersWillBeRemoved.connect(self.mainWidget.layersWillBeRemoved)
-
 
 class GdalParametersPanel(ParametersPanel):
 

python/plugins/processing/algs/gdal/GdalUtils.py

@@ -155,7 +155,7 @@ def getVectorDriverFromFileName(filename):
             return 'ESRI Shapefile'
 
         formats = QgsVectorFileWriter.supportedFiltersAndFormats()
-        for k, v in formats.items():
+        for k, v in list(formats.items()):
             if ext in k:
                 return v
         return 'ESRI Shapefile'

python/plugins/processing/algs/gdal/gdal2tiles.py

@@ -168,7 +168,7 @@ def getConsoleCommands(self):
 
         parameters = {self.TITLE: '-t', self.COPYRIGHT: '-c',
                       self.GOOGLEKEY: '-g', self.BINGKEY: '-b'}
-        for arg, parameter in parameters.items():
+        for arg, parameter in list(parameters.items()):
             if self.getParameterValue(arg):
                 arguments.append(parameter)
                 arguments.append(self.getParameterValue(arg))

python/plugins/processing/algs/grass/GrassAlgorithm.py

@@ -34,6 +34,7 @@
 import uuid
 import importlib
 import re
+import traceback
 
 from qgis.PyQt.QtCore import QCoreApplication
 from qgis.PyQt.QtGui import QIcon
@@ -145,18 +146,14 @@ def defineCharacteristicsFromFile(self):
                 line = line.strip('\n').strip()
                 if line.startswith('Hardcoded'):
                     self.hardcodedStrings.append(line[len('Hardcoded|'):])
-                elif line.startswith('Parameter'):
-                    parameter = getParameterFromString(line)
+                parameter = getParameterFromString(line)
+                if parameter is not None:
                     self.addParameter(parameter)
                     if isinstance(parameter, ParameterVector):
                         hasVectorInput = True
                     if isinstance(parameter, ParameterMultipleInput) \
                        and parameter.datatype < 3:
                         hasVectorInput = True
-                elif line.startswith('*Parameter'):
-                    param = getParameterFromString(line[1:])
-                    param.isAdvanced = True
-                    self.addParameter(param)
                 else:
                     output = getOutputFromString(line)
                     self.addOutput(output)
@@ -169,9 +166,11 @@ def defineCharacteristicsFromFile(self):
                                                   " (raw output)", "txt"))
                 line = lines.readline().strip('\n').strip()
             except Exception as e:
+
                 ProcessingLog.addToLog(
                     ProcessingLog.LOG_ERROR,
-                    self.tr('Could not open GRASS algorithm: %s.\n%s' % (self.descriptionFile, line)))
+                    traceback.format_exc())
+                #self.tr('Could not open GRASS algorithm: %s.\n%s' % (self.descriptionFile, line)))
                 raise e
         lines.close()
 

python/plugins/processing/algs/grass7/Grass7Algorithm.py

@@ -177,18 +177,14 @@ def defineCharacteristicsFromFile(self):
                 line = line.strip('\n').strip()
                 if line.startswith('Hardcoded'):
                     self.hardcodedStrings.append(line[len('Hardcoded|'):])
-                elif line.startswith('Parameter'):
-                    parameter = getParameterFromString(line)
+                parameter = getParameterFromString(line)
+                if parameter is not None:
                     self.addParameter(parameter)
                     if isinstance(parameter, ParameterVector):
                         hasVectorInput = True
                     if isinstance(parameter, ParameterMultipleInput) \
                        and parameter.datatype < 3:
                         hasVectorInput = True
-                elif line.startswith('*Parameter'):
-                    param = getParameterFromString(line[1:])
-                    param.isAdvanced = True
-                    self.addParameter(param)
                 else:
                     output = getOutputFromString(line)
                     self.addOutput(output)

python/plugins/processing/algs/grass7/ext/i.py

@@ -174,7 +174,7 @@ def exportInputRasters(alg, rasterDic):
     { 'inputName1': 'outputName1', 'inputName2': 'outputName2'}
     """
     # Get inputs and outputs
-    for inputName, outputName in rasterDic.items():
+    for inputName, outputName in list(rasterDic.items()):
         inputRaster = alg.getParameterValue(inputName)
         outputRaster = alg.getOutputFromName(outputName)
         command = 'r.out.gdal -c -t -f --overwrite createopt="TFW=YES,COMPRESS=LZW" input={} output=\"{}\"'.format(

python/plugins/processing/algs/grass7/ext/v_net.py

@@ -87,7 +87,7 @@ def variableOutput(alg, params, nocats=True):
     """
 
     # Build the v.out.ogr commands
-    for outputName, typeList in params.items():
+    for outputName, typeList in list(params.items()):
         if not isinstance(typeList, list):
             continue
 

python/plugins/processing/algs/help/__init__.py

@@ -50,7 +50,7 @@ def replace(s):
             return s.replace("{qgisdocs}", "https://docs.qgis.org/%s/%s/docs" % (version, locale))
         else:
             return None
-    h = {k: replace(v) for k, v in h.items()}
+    h = {k: replace(v) for k, v in list(h.items())}
     return h
 
 

python/plugins/processing/algs/lidar/fusion/ClipData.py

@@ -52,7 +52,7 @@ def defineCharacteristics(self):
         self.group, self.i18n_group = self.trAlgorithm('Points')
         self.addParameter(ParameterFile(
             self.INPUT, self.tr('Input LAS layer')))
-        self.addParameter(ParameterExtent(self.EXTENT, self.tr('Extent')))
+        self.addParameter(ParameterExtent(self.EXTENT, self.tr('Extent'), optional=False))
         self.addParameter(ParameterSelection(
             self.SHAPE, self.tr('Shape'), ['Rectangle', 'Circle']))
         self.addOutput(OutputFile(

python/plugins/processing/algs/lidar/lastools/lasquery.py

@@ -45,7 +45,7 @@ def defineCharacteristics(self):
         self.name, self.i18n_name = self.trAlgorithm('lasquery')
         self.group, self.i18n_group = self.trAlgorithm('LAStools')
         self.addParametersVerboseGUI()
-        self.addParameter(ParameterExtent(self.AOI, self.tr('area of interest')))
+        self.addParameter(ParameterExtent(self.AOI, self.tr('area of interest'), optional=False))
         self.addParametersAdditionalGUI()
 
     def processAlgorithm(self, progress):
@@ -61,7 +61,7 @@ def processAlgorithm(self, progress):
         layers = QgsMapLayerRegistry.instance().mapLayers()
 
         # loop over layers
-        for name, layer in layers.items():
+        for name, layer in list(layers.items()):
             layerType = layer.type()
             if layerType == QgsMapLayer.VectorLayer:
                 shp_file_name = layer.source()