[processing] patch for issues with delimited text layers

Still won't work when using delimited text layers in parameters of type MultipleInput
qgis · Nov 21, 2014 · 9f8a742 · 9f8a742
1 parent 1f47ffe
commit 9f8a742
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/python/plugins/processing/core/GeoAlgorithm.py b/python/plugins/processing/core/GeoAlgorithm.py
@@ -350,7 +350,10 @@ def setOutputCRS(self):
             if isinstance(param, (ParameterRaster, ParameterVector,
                           ParameterMultipleInput)):
                 if param.value:
-                    inputlayers = param.value.split(';')
+                    if isinstance(param, ParameterMultipleInput):
+                        inputlayers = param.value.split(';')
+                    else:
+                        inputlayers = [param.value]
                     for inputlayer in inputlayers:
                         for layer in layers:
                             if layer.source() == inputlayer:
@@ -377,7 +380,10 @@ def checkInputCRS(self):
             if isinstance(param, (ParameterRaster, ParameterVector,
                           ParameterMultipleInput)):
                 if param.value:
-                    layers = param.value.split(';')
+                    if isinstance(param, ParameterMultipleInput):
+                        layers = param.value.split(';')
+                    else:
+                        layers = [param.value]
                     for item in layers:
                         crs = dataobjects.getObject(item).crs()
                         if crs not in crsList:

diff --git a/python/plugins/processing/tools/dataobjects.py b/python/plugins/processing/tools/dataobjects.py
@@ -89,10 +89,9 @@ def getVectorLayers(shapetype=[-1], sorting=True):
     for layer in layers:
         mapLayer = layer.layer()
         if mapLayer.type() == QgsMapLayer.VectorLayer:
-            if shapetype == ALL_TYPES or mapLayer.geometryType() in shapetype:
+            if (mapLayer.hasGeometryType() and
-                uri = unicode(mapLayer.source())
+                    (shapetype == ALL_TYPES or mapLayer.geometryType() in shapetype)):
-                if not uri.lower().endswith('csv') and not uri.lower().endswith('dbf'):
+                vector.append(mapLayer)
-                    vector.append(mapLayer)
     if sorting:
         return sorted(vector,  key=lambda layer: layer.name().lower())
     else: