@@ -116,16 +116,16 @@ def getRasterExtensions():
116
116
formats = FileFilter .allRastersFilter ().split ( ";;" )
117
117
extensions = []
118
118
for f in formats :
119
- if f . contains ( "*.bt" ) or f . contains ( "*.mpr" ): # Binary Terrain or ILWIS
119
+ if string . find ( f , "*.bt" ) is not - 1 or string . find ( f , "*.mpr" ) is not - 1 : # Binary Terrain or ILWIS
120
120
continue
121
- extensions << FileFilter .getFilterExtensions ( f )
121
+ extensions . extend ( FileFilter .getFilterExtensions ( f ) )
122
122
return extensions
123
123
124
124
def getVectorExtensions ():
125
125
formats = FileFilter .allVectorsFilter ().split ( ";;" )
126
126
extensions = []
127
127
for f in formats :
128
- extensions .append ( FileFilter .getFilterExtensions ( f ))
128
+ extensions .extend ( FileFilter .getFilterExtensions ( f ) )
129
129
return extensions
130
130
131
131
class LayerRegistry (QObject ):
@@ -201,23 +201,24 @@ def getRasterFiles(path, recursive=False):
201
201
if not QFileInfo (path ).exists ():
202
202
return rasters
203
203
204
- filter = getRasterExtensions ()
204
+ # TODO remove *.aux.xml
205
+ _filter = getRasterExtensions ()
205
206
workDir = QDir ( path )
206
207
workDir .setFilter ( QDir .Files | QDir .NoSymLinks | QDir .NoDotAndDotDot )
207
- workDir .setNameFilters ( filter )
208
+ workDir .setNameFilters ( _filter )
208
209
files = workDir .entryList ()
209
210
for f in files :
210
- rasters << path + "/" + f
211
+ rasters . append ( path + "/" + f )
211
212
212
213
if recursive :
213
214
for myRoot , myDirs , myFiles in os .walk ( unicode (path ) ):
214
215
for dir in myDirs :
215
216
workDir = QDir ( myRoot + "/" + dir )
216
217
workDir .setFilter ( QDir .Files | QDir .NoSymLinks | QDir .NoDotAndDotDot )
217
- workDir .setNameFilters ( filter )
218
+ workDir .setNameFilters ( _filter )
218
219
workFiles = workDir .entryList ()
219
220
for f in workFiles :
220
- rasters << myRoot + "/" + dir + "/" + f
221
+ rasters . append ( myRoot + "/" + dir + "/" + f )
221
222
222
223
return rasters
223
224
@@ -382,8 +383,8 @@ def getDialog(self, parent = None, caption = '', acceptMode = QFileDialog.Accept
382
383
firstExt = ext
383
384
384
385
if firstExt != None :
385
- if firstExt .startsWith ('*' ):
386
- files . append ( firstExt [1 :] )
386
+ if firstExt .startswith ('*' ):
387
+ files += firstExt [1 :]
387
388
388
389
if useEncoding :
389
390
encoding = dialog .encoding ()
@@ -403,8 +404,6 @@ def getOpenFileName(self, parent = None, caption = '', filter = '', selectedFilt
403
404
404
405
@classmethod
405
406
def getSaveFileName (self , parent = None , caption = '' , filter = '' , selectedFilter = None , useEncoding = False ):
406
- print ("filter:" )
407
- print (str (filter ))
408
407
return self .getDialog (parent , caption , QFileDialog .AcceptSave , QFileDialog .AnyFile , filter , selectedFilter , useEncoding )
409
408
410
409
@classmethod
@@ -473,7 +472,7 @@ def getFilterExtensions(self, aFilter):
473
472
# if there is no extensions or the filter matches all, then return an empty list
474
473
# otherwise return the list of estensions
475
474
if exts != '' and exts != "*" and exts != "*.*" :
476
- extList .append (exts .split (" " ))
475
+ extList .extend (exts .split (" " ))
477
476
return extList
478
477
479
478
@classmethod
@@ -482,13 +481,7 @@ def getFilterName(self, aFilter):
482
481
483
482
@classmethod
484
483
def filenameMatchesFilterExt (self , fileName , ext ):
485
- regex = QRegExp (ext )
486
- # use the wildcard matching
487
- regex .setPatternSyntax (QRegExp .Wildcard )
488
-
489
- if regex .exactMatch (fileName ):
490
- return True
491
- return False
484
+ return re .match ( '.' + str (ext ), fileName ) is not None
492
485
493
486
# Retrieves gdal information
494
487
class GdalConfig :
0 commit comments