[processing] added extension option to ParameterFile.py

qgis · Jun 16, 2014 · 72d3385 · 72d3385
1 parent 3d15239
commit 72d3385
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/python/plugins/processing/gui/FileSelectionPanel.py b/python/plugins/processing/gui/FileSelectionPanel.py
@@ -32,8 +32,9 @@
 
 class FileSelectionPanel(QtGui.QWidget):
 
-    def __init__(self, isFolder):
+    def __init__(self, isFolder, ext = None):
         super(FileSelectionPanel, self).__init__(None)
+        self.ext = ext or '*'
         self.isFolder = isFolder
         self.horizontalLayout = QtGui.QHBoxLayout(self)
         self.horizontalLayout.setSpacing(2)
@@ -70,7 +71,7 @@ def showSelectionDialog(self):
                                   os.path.dirname(unicode(folder)))
         else:
             filenames = QtGui.QFileDialog.getOpenFileNames(self, 'Open file',
-                    path, '*.*')
+                    path, '*.' + self.ext)
             if filenames:
                 self.text.setText(u';'.join(filenames))
                 settings.setValue('/Processing/LastInputPath',

diff --git a/python/plugins/processing/gui/ParametersPanel.py b/python/plugins/processing/gui/ParametersPanel.py
@@ -277,7 +277,7 @@ def getWidgetFromParameter(self, param):
         elif isinstance(param, ParameterRange):
             item = RangePanel(param)
         elif isinstance(param, ParameterFile):
-            item = FileSelectionPanel(param.isFolder)
+            item = FileSelectionPanel(param.isFolder, param.ext)
         elif isinstance(param, ParameterMultipleInput):
             if param.datatype == ParameterMultipleInput.TYPE_FILE:
                 item = MultipleFileInputPanel()

diff --git a/python/plugins/processing/parameters/ParameterFile.py b/python/plugins/processing/parameters/ParameterFile.py
@@ -30,9 +30,10 @@
 
 class ParameterFile(Parameter):
 
-    def __init__(self, name='', description='', isFolder=False, optional=True):
+    def __init__(self, name='', description='', isFolder=False, optional=True, ext = None):
         Parameter.__init__(self, name, description)
         self.value = None
+        self.ext = ext
         self.isFolder = isFolder
         self.optional = optional
 
@@ -51,6 +52,8 @@ def setValue(self, obj):
                 return False
             else:
                 self.value = ''
+        if self.ext is not None and self.value != '':
+            return self.value.endswith(self.ext) 
         return True
 
     def deserialize(self, s):