[processing] fixed behaviour of select algorithms in modeler

volaya · volaya · commit b390b3e7780c · 2014-06-20T23:18:40.000+02:00
diff --git a/python/plugins/processing/algs/qgis/ftools/SelectByLocation.py b/python/plugins/processing/algs/qgis/ftools/SelectByLocation.py
@@ -46,7 +46,6 @@ class SelectByLocation(GeoAlgorithm):
 
 
     def defineCharacteristics(self):
-        self.allowOnlyOpenedLayers = True
         self.name = 'Select by location'
         self.group = 'Vector selection tools'
         self.addParameter(ParameterVector(self.INPUT, 'Layer to select from',
diff --git a/python/plugins/processing/algs/qgis/mmqgisx/MMQGISXAlgorithms.py b/python/plugins/processing/algs/qgis/mmqgisx/MMQGISXAlgorithms.py
@@ -1059,7 +1059,6 @@ class mmqgisx_select_algorithm(GeoAlgorithm):
     RESULT = 'RESULT'
 
     def defineCharacteristics(self):
-        self.allowOnlyOpenedLayers = True
         self.name = 'Select by attribute'
         self.group = 'Vector selection tools'
 
@@ -1087,8 +1086,7 @@ def defineCharacteristics(self):
     def processAlgorithm(self, progress):
 
         filename = self.getParameterValue(self.LAYERNAME)
-        layer = dataobjects.getObjectFromUri(filename)
-
+        layer = dataobjects.getObjectFromUri(filename)        
         attribute = self.getParameterValue(self.ATTRIBUTE)
         comparison = self.comparisons[self.getParameterValue(self.COMPARISON)]
         comparisonvalue = self.getParameterValue(self.COMPARISONVALUE)
diff --git a/python/plugins/processing/tools/dataobjects.py b/python/plugins/processing/tools/dataobjects.py
@@ -36,6 +36,12 @@
 
 ALL_TYPES = [-1]
 
+_loadedLayers = {}
+
+def resetLoadedLayers():
+    global _loadedLayers
+    _loadedLayers = {}
+
 def getSupportedOutputVectorLayerExtensions():
     formats = QgsVectorFileWriter.supportedFiltersAndFormats()
     exts = ['shp']  # shp is the default, should be the first
@@ -206,6 +212,9 @@ def getObjectFromUri(uri, forceLoad=True):
 
     if uri is None:
         return None
+    print _loadedLayers
+    if uri in _loadedLayers:
+        return _loadedLayers[uri]
     layers = getRasterLayers()
     for layer in layers:
         if layer.source() == uri:
@@ -228,11 +237,13 @@ def getObjectFromUri(uri, forceLoad=True):
         if layer.isValid():
             if prjSetting:
                 settings.setValue('/Projections/defaultBehaviour', prjSetting)
+            _loadedLayers[layer.source()] = layer
             return layer
         layer = QgsRasterLayer(uri, uri)
         if layer.isValid():
             if prjSetting:
                 settings.setValue('/Projections/defaultBehaviour', prjSetting)
+            _loadedLayers[layer.source()] = layer
             return layer
         if prjSetting:
             settings.setValue('/Projections/defaultBehaviour', prjSetting)
