Merge pull request #1031 from rldhont/headless_processing

Some changes to allow Processing to be run headless It replaces legendInterface with QgsMapLayerRegistry, which is a better option
qgis · Dec 20, 2013 · cbcd28a · cbcd28a
2 parents 0ad5cc9 + a09892f
commit cbcd28a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/python/plugins/processing/core/Processing.py b/python/plugins/processing/core/Processing.py
@@ -34,6 +34,7 @@
 from processing.core.ProcessingConfig import ProcessingConfig
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.ProcessingLog import ProcessingLog
+from processing.core.SilentProgress import SilentProgress
 from processing.gui.AlgorithmClassification import AlgorithmDecorator
 from processing.gui.MessageBarProgress import MessageBarProgress
 from processing.gui.RenderingStyles import RenderingStyles
@@ -347,7 +348,9 @@ def runAlgorithm(algOrName, onFinish, *args):
         elif cursor.shape() != Qt.WaitCursor:
             QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
 
-        progress = MessageBarProgress()
+        progress = SilentProgress()
+        if not interface.iface == None :
+          progress = MessageBarProgress()
         ret = UnthreadedAlgorithmExecutor.runalg(alg, progress)
         if onFinish is not None and ret:
             onFinish(alg, progress)

diff --git a/python/plugins/processing/core/SilentProgress.py b/python/plugins/processing/core/SilentProgress.py
@@ -48,3 +48,6 @@ def setDebugInfo(self, _):
 
     def setConsoleInfo(self, _):
         pass
+
+    def close(self):
+        pass
diff --git a/python/plugins/processing/tools/dataobjects.py b/python/plugins/processing/tools/dataobjects.py
@@ -65,7 +65,7 @@ def getSupportedOutputTableExtensions():
 
 
 def getRasterLayers():
-    layers = interface.iface.legendInterface().layers()
+    layers = QgsMapLayerRegistry.instance().mapLayers().values()
     raster = list()
 
     for layer in layers:
@@ -76,7 +76,7 @@ def getRasterLayers():
 
 
 def getVectorLayers(shapetype=[-1]):
-    layers = interface.iface.legendInterface().layers()
+    layers = QgsMapLayerRegistry.instance().mapLayers().values()
     vector = []
     for layer in layers:
         if layer.type() == layer.VectorLayer:
@@ -96,7 +96,7 @@ def getAllLayers():
 
 
 def getTables():
-    layers = interface.iface.legendInterface().layers()
+    layers = QgsMapLayerRegistry.instance().mapLayers().values()
     tables = list()
     for layer in layers:
         if layer.type() == layer.VectorLayer: