[processing] extension can now be specified for OutputFile

qgis · May 15, 2014 · 60f7824 · 60f7824
1 parent a7cb486
commit 60f7824
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/python/plugins/processing/outputs/Output.py b/python/plugins/processing/outputs/Output.py
@@ -45,7 +45,7 @@ def __init__(self, name='', description='', hidden=False):
         # in a vector layer). In the case of layers, hidden outputs are
         # not loaded into QGIS after the algorithm is executed. Other
         # outputs not representing layers or tables should always be hidden.
-        self.hidden = hidden
+        self.hidden = str(hidden).lower() == str(True).lower()
 
         # This value indicates whether the output has to be opened
         # after being produced by the algorithm or not

diff --git a/python/plugins/processing/outputs/OutputFactory.py b/python/plugins/processing/outputs/OutputFactory.py
@@ -53,4 +53,4 @@ def getFromString(s):
                 if len(tokens) == 2:
                     return clazz(tokens[0], tokens[1])
                 else:
-                    return clazz(tokens[0], tokens[1], tokens[2] == str(True))
+                    return clazz(tokens[0], tokens[1], tokens[2])
diff --git a/python/plugins/processing/outputs/OutputFile.py b/python/plugins/processing/outputs/OutputFile.py
@@ -30,8 +30,16 @@
 
 class OutputFile(Output):
 
+    def __init__(self, name='', description='', ext = None):
+        self.name = name
+        self.description = description
+        self.ext = ext
+
     def getFileFilter(self, alg):
-        return 'All files(*.*)'
+        if self.ext is None:
+            return 'All files(*.*)'
+        else:
+            return '%s files(*.%s)' % self.ext
 
     def getDefaultFileExtension(self, alg):
-        return 'file'
+        return self.ext or 'file'