sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4587 from alexbruy/processing-saga

Browse Source 
[processing][needs-docs] always use SAGA shipped with QGIS (refs #16422)
This commit is contained in:
Alexander Bruy 2017-05-19 15:08:45 +03:00 committed by GitHub
commit bbcc8725fc
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/plugins/processing/algs/saga/SagaAlgorithmProvider.py
View File

@ -53,11 +53,6 @@ class SagaAlgorithmProvider(QgsProcessingProvider):
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 @@ class SagaAlgorithmProvider(QgsProcessingProvider):
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)

10
python/plugins/processing/algs/saga/SagaUtils.py
View File

@ -39,7 +39,6 @@ from processing.tools.system import isWindows, isMac, userFolder
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 ''