Skip to content

Commit a781e1e

Browse files
committed
GdalTools: apply selected name filter to -of parameter (fix #8408)
1 parent e76fc95 commit a781e1e

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

python/plugins/GdalTools/tools/GdalTools_utils.py

+12-8
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ def fillRasterOutputFormat(aFilter = None, filename = None):
227227

228228
if aFilter != None:
229229
supportedRasters = GdalConfig.getSupportedRasters()
230-
filterName = re.sub('^.*\] ', '', FileFilter.getFilterName( aFilter ))
230+
filterName = re.sub('^.*\] ', '', FileFilter.getFilterName( aFilter[0] ))
231231
if supportedRasters.has_key( filterName ):
232232
return supportedRasters[ filterName ][ "SHORTNAME" ]
233233

@@ -246,7 +246,7 @@ def fillVectorOutputFormat(aFilter = None, filename = None):
246246

247247
if aFilter != None:
248248
supportedVectors = GdalConfig.getSupportedVectors()
249-
filterName = re.sub('^.*\] ', '', FileFilter.getFilterName( aFilter ))
249+
filterName = re.sub('^.*\] ', '', FileFilter.getFilterName( aFilter[0] ))
250250
if supportedVectors.has_key( filterName ):
251251
return supportedVectors[ filterName ][ "SHORTNAME" ]
252252

@@ -359,7 +359,7 @@ def getDialog(self, parent = None, caption = '', acceptMode = QFileDialog.Accept
359359
dialog.setAcceptMode(acceptMode)
360360

361361
if selectedFilter != None:
362-
dialog.selectNameFilter(selectedFilter)
362+
dialog.selectNameFilter(selectedFilter[0])
363363

364364
if not dialog.exec_():
365365
if useEncoding:
@@ -368,7 +368,7 @@ def getDialog(self, parent = None, caption = '', acceptMode = QFileDialog.Accept
368368

369369
# change the selected filter value
370370
if selectedFilter != None:
371-
selectedFilter = dialog.selectedNameFilter()
371+
selectedFilter[0] = dialog.selectedNameFilter()
372372

373373
# save the last used dir and return the selected files
374374
files = dialog.selectedFiles()
@@ -441,13 +441,15 @@ def allRastersFilter(self):
441441

442442
return self.rastersFilter
443443

444+
# Retrieves the last used filter for raster files
445+
# Note: filter string is in a list
444446
@classmethod
445447
def lastUsedRasterFilter(self):
446-
return self.getFilter("lastRaster")
448+
return [self.getFilter("lastRaster")]
447449

448450
@classmethod
449451
def setLastUsedRasterFilter(self, aFilter):
450-
self.setFilter("lastRaster", aFilter)
452+
self.setFilter("lastRaster", aFilter[0])
451453

452454
# stores the supported vectors file filter
453455
vectorsFilter = ''
@@ -459,13 +461,15 @@ def allVectorsFilter(self):
459461
self.vectorsFilter = QgsProviderRegistry.instance().fileVectorFilters()
460462
return self.vectorsFilter
461463

464+
# Retrieves the last used filter for vector files
465+
# Note: filter string is in a list
462466
@classmethod
463467
def lastUsedVectorFilter(self):
464-
return self.getFilter("lastVector")
468+
return [self.getFilter("lastVector")]
465469

466470
@classmethod
467471
def setLastUsedVectorFilter(self, aFilter):
468-
self.setFilter("lastVector", aFilter)
472+
self.setFilter("lastVector", aFilter[0])
469473

470474
# Retrieves the extensions list from a filter string
471475
@classmethod

0 commit comments

Comments
 (0)