@@ -227,7 +227,7 @@ def fillRasterOutputFormat(aFilter = None, filename = None):
227
227
228
228
if aFilter != None :
229
229
supportedRasters = GdalConfig .getSupportedRasters ()
230
- filterName = re .sub ('^.*\] ' , '' , FileFilter .getFilterName ( aFilter ))
230
+ filterName = re .sub ('^.*\] ' , '' , FileFilter .getFilterName ( aFilter [ 0 ] ))
231
231
if supportedRasters .has_key ( filterName ):
232
232
return supportedRasters [ filterName ][ "SHORTNAME" ]
233
233
@@ -246,7 +246,7 @@ def fillVectorOutputFormat(aFilter = None, filename = None):
246
246
247
247
if aFilter != None :
248
248
supportedVectors = GdalConfig .getSupportedVectors ()
249
- filterName = re .sub ('^.*\] ' , '' , FileFilter .getFilterName ( aFilter ))
249
+ filterName = re .sub ('^.*\] ' , '' , FileFilter .getFilterName ( aFilter [ 0 ] ))
250
250
if supportedVectors .has_key ( filterName ):
251
251
return supportedVectors [ filterName ][ "SHORTNAME" ]
252
252
@@ -359,7 +359,7 @@ def getDialog(self, parent = None, caption = '', acceptMode = QFileDialog.Accept
359
359
dialog .setAcceptMode (acceptMode )
360
360
361
361
if selectedFilter != None :
362
- dialog .selectNameFilter (selectedFilter )
362
+ dialog .selectNameFilter (selectedFilter [ 0 ] )
363
363
364
364
if not dialog .exec_ ():
365
365
if useEncoding :
@@ -368,7 +368,7 @@ def getDialog(self, parent = None, caption = '', acceptMode = QFileDialog.Accept
368
368
369
369
# change the selected filter value
370
370
if selectedFilter != None :
371
- selectedFilter = dialog .selectedNameFilter ()
371
+ selectedFilter [ 0 ] = dialog .selectedNameFilter ()
372
372
373
373
# save the last used dir and return the selected files
374
374
files = dialog .selectedFiles ()
@@ -441,13 +441,15 @@ def allRastersFilter(self):
441
441
442
442
return self .rastersFilter
443
443
444
+ # Retrieves the last used filter for raster files
445
+ # Note: filter string is in a list
444
446
@classmethod
445
447
def lastUsedRasterFilter (self ):
446
- return self .getFilter ("lastRaster" )
448
+ return [ self .getFilter ("lastRaster" )]
447
449
448
450
@classmethod
449
451
def setLastUsedRasterFilter (self , aFilter ):
450
- self .setFilter ("lastRaster" , aFilter )
452
+ self .setFilter ("lastRaster" , aFilter [ 0 ] )
451
453
452
454
# stores the supported vectors file filter
453
455
vectorsFilter = ''
@@ -459,13 +461,15 @@ def allVectorsFilter(self):
459
461
self .vectorsFilter = QgsProviderRegistry .instance ().fileVectorFilters ()
460
462
return self .vectorsFilter
461
463
464
+ # Retrieves the last used filter for vector files
465
+ # Note: filter string is in a list
462
466
@classmethod
463
467
def lastUsedVectorFilter (self ):
464
- return self .getFilter ("lastVector" )
468
+ return [ self .getFilter ("lastVector" )]
465
469
466
470
@classmethod
467
471
def setLastUsedVectorFilter (self , aFilter ):
468
- self .setFilter ("lastVector" , aFilter )
472
+ self .setFilter ("lastVector" , aFilter [ 0 ] )
469
473
470
474
# Retrieves the extensions list from a filter string
471
475
@classmethod
0 commit comments