Merge pull request #4587 from alexbruy/processing-saga

alexbruy · web-flow · commit bbcc8725fc29 · 2017-05-19T15:08:45.000+03:00
[processing][needs-docs] always use SAGA shipped with QGIS (refs #16422)
diff --git a/python/plugins/processing/algs/saga/SagaAlgorithmProvider.py b/python/plugins/processing/algs/saga/SagaAlgorithmProvider.py
@@ -53,11 +53,6 @@ def load(self):
         ProcessingConfig.settingIcons[self.name()] = self.icon()
         ProcessingConfig.addSetting(Setting("SAGA", 'ACTIVATE_SAGA',
                                             self.tr('Activate'), True))
-        if (isWindows() or isMac()):
-            ProcessingConfig.addSetting(Setting("SAGA",
-                                                SagaUtils.SAGA_FOLDER, self.tr('SAGA folder'),
-                                                '',
-                                                valuetype=Setting.FOLDER))
         ProcessingConfig.addSetting(Setting("SAGA",
                                             SagaUtils.SAGA_IMPORT_EXPORT_OPTIMIZATION,
                                             self.tr('Enable SAGA Import/Export optimizations'), False))
@@ -73,9 +68,6 @@ def load(self):
 
     def unload(self):
         ProcessingConfig.removeSetting('ACTIVATE_SAGA')
-        if (isWindows() or isMac()):
-            ProcessingConfig.removeSetting(SagaUtils.SAGA_FOLDER)
-
         ProcessingConfig.removeSetting(SagaUtils.SAGA_LOG_CONSOLE)
         ProcessingConfig.removeSetting(SagaUtils.SAGA_LOG_COMMANDS)
 
diff --git a/python/plugins/processing/algs/saga/SagaUtils.py b/python/plugins/processing/algs/saga/SagaUtils.py
@@ -39,7 +39,6 @@
 
 SAGA_LOG_COMMANDS = 'SAGA_LOG_COMMANDS'
 SAGA_LOG_CONSOLE = 'SAGA_LOG_CONSOLE'
-SAGA_FOLDER = 'SAGA_FOLDER'
 SAGA_IMPORT_EXPORT_OPTIMIZATION = 'SAGA_IMPORT_EXPORT_OPTIMIZATION'
 
 _installedVersion = None
@@ -83,13 +82,10 @@ def findSagaFolder():
 
 
 def sagaPath():
-    folder = ProcessingConfig.getSetting(SAGA_FOLDER)
-    if folder and not os.path.isdir(folder):
-        folder = None
-        QgsMessageLog.logMessage('Specified SAGA folder does not exist. Will try to find built-in binaries.', 'Processing', QgsMessageLog.WARNING)
-    if folder is None or folder == '':
-        folder = findSagaFolder()
+    if not isWindows() and not isMac():
+        return ''
 
+    folder = findSagaFolder()
     return folder or ''
 
 
