[processing] methods in dataobjects.py now return layers ordered by name

fixes #10446
This commit is contained in:
Victor Olaya 2014-06-28 16:48:24 +02:00
parent 5c9cb5a0cd
commit 93511b2f82

View File

@ -76,7 +76,7 @@ def getRasterLayers():
if layer.type() == layer.RasterLayer: if layer.type() == layer.RasterLayer:
if layer.providerType() == 'gdal': # only gdal file-based layers if layer.providerType() == 'gdal': # only gdal file-based layers
raster.append(layer) raster.append(layer)
return raster return sorted(raster, key=lambda layer: layer.name().lower())
def getVectorLayers(shapetype=[-1]): def getVectorLayers(shapetype=[-1]):
@ -86,17 +86,16 @@ def getVectorLayers(shapetype=[-1]):
if layer.type() == layer.VectorLayer: if layer.type() == layer.VectorLayer:
if shapetype == ALL_TYPES or layer.geometryType() in shapetype: if shapetype == ALL_TYPES or layer.geometryType() in shapetype:
uri = unicode(layer.source()) uri = unicode(layer.source())
if not uri.lower().endswith('csv') \ if not uri.lower().endswith('csv') and not uri.lower().endswith('dbf'):
and not uri.lower().endswith('dbf'):
vector.append(layer) vector.append(layer)
return vector return sorted(vector, key=lambda layer: layer.name().lower())
def getAllLayers(): def getAllLayers():
layers = [] layers = []
layers += getRasterLayers() layers += getRasterLayers()
layers += getVectorLayers() layers += getVectorLayers()
return layers return sorted(layers, key=lambda layer: layer.name().lower())
def getTables(): def getTables():
@ -105,7 +104,7 @@ def getTables():
for layer in layers: for layer in layers:
if layer.type() == layer.VectorLayer: if layer.type() == layer.VectorLayer:
tables.append(layer) tables.append(layer)
return tables return sorted(tables, key=lambda table: table.name().lower())
def extent(layers): def extent(layers):