[processing] fixed loading of parameters for grass algorithms

volaya · volaya · commit a1642a376fe0 · 2016-10-05T12:38:12.000+02:00
diff --git a/python/plugins/processing/algs/grass/GrassAlgorithm.py b/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()
 
diff --git a/python/plugins/processing/algs/grass7/Grass7Algorithm.py b/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)
