sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing] added extension option to ParameterFile.py

Browse Source
This commit is contained in:
Victor Olaya 2014-06-15 15:26:01 +02:00
parent 3d152393d7
commit 72d33852f1
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python/plugins/processing/gui/FileSelectionPanel.py
View File

@ -32,8 +32,9 @@ from processing.tools.system import *
class FileSelectionPanel(QtGui.QWidget): class FileSelectionPanel(QtGui.QWidget):
def __init__(self, isFolder): def __init__(self, isFolder, ext = None):
super(FileSelectionPanel, self).__init__(None) super(FileSelectionPanel, self).__init__(None)
self.ext = ext or '*'
self.isFolder = isFolder self.isFolder = isFolder
self.horizontalLayout = QtGui.QHBoxLayout(self) self.horizontalLayout = QtGui.QHBoxLayout(self)
self.horizontalLayout.setSpacing(2) self.horizontalLayout.setSpacing(2)
@ -70,7 +71,7 @@ class FileSelectionPanel(QtGui.QWidget):
os.path.dirname(unicode(folder))) os.path.dirname(unicode(folder)))
else: else:
filenames = QtGui.QFileDialog.getOpenFileNames(self, 'Open file', filenames = QtGui.QFileDialog.getOpenFileNames(self, 'Open file',
path, '*.*') path, '*.' + self.ext)
if filenames: if filenames:
self.text.setText(u';'.join(filenames)) self.text.setText(u';'.join(filenames))
settings.setValue('/Processing/LastInputPath', settings.setValue('/Processing/LastInputPath',

2
python/plugins/processing/gui/ParametersPanel.py
View File

@ -277,7 +277,7 @@ class ParametersPanel(QtGui.QWidget):
elif isinstance(param, ParameterRange): elif isinstance(param, ParameterRange):
item = RangePanel(param) item = RangePanel(param)
elif isinstance(param, ParameterFile): elif isinstance(param, ParameterFile):
item = FileSelectionPanel(param.isFolder) item = FileSelectionPanel(param.isFolder, param.ext)
elif isinstance(param, ParameterMultipleInput): elif isinstance(param, ParameterMultipleInput):
if param.datatype == ParameterMultipleInput.TYPE_FILE: if param.datatype == ParameterMultipleInput.TYPE_FILE:
item = MultipleFileInputPanel() item = MultipleFileInputPanel()

5
python/plugins/processing/parameters/ParameterFile.py
View File

@ -30,9 +30,10 @@ from processing.parameters.Parameter import Parameter
class ParameterFile(Parameter): 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) Parameter.__init__(self, name, description)
self.value = None self.value = None
self.ext = ext
self.isFolder = isFolder self.isFolder = isFolder
self.optional = optional self.optional = optional
@ -51,6 +52,8 @@ class ParameterFile(Parameter):
return False return False
else: else:
self.value = '' self.value = ''
if self.ext is not None and self.value != '':
return self.value.endswith(self.ext)
return True return True
def deserialize(self, s): def deserialize(self, s):