sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

[processing] fixes for SAGA folder configuration

Browse Source 
This tries to address some problem with previously set SAGA paths, by always showing the SAGA path config value, and by trying to ruin a built in copy of SAGA if the current SAGA folder is wrong (as it usually happens when updating QGIS)
This commit is contained in:
volaya 2016-12-08 08:11:35 +01:00
parent 7028eee198
commit f852603f07
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ class SagaAlgorithmProvider(AlgorithmProvider):
self.activate = True
def initializeSettings(self):
if (isWindows() or isMac()) and SagaUtils.findSagaFolder() is None:
if (isWindows() or isMac()):
ProcessingConfig.addSetting(Setting("SAGA",
SagaUtils.SAGA_FOLDER, self.tr('SAGA folder'),
'',
@ -78,7 +78,7 @@ class SagaAlgorithmProvider(AlgorithmProvider):
def unload(self):
AlgorithmProvider.unload(self)
if (isWindows() or isMac()) and SagaUtils.findSagaFolder() is None:
if (isWindows() or isMac()):
ProcessingConfig.removeSetting(SagaUtils.SAGA_FOLDER)
ProcessingConfig.removeSetting(SagaUtils.SAGA_LOG_CONSOLE)

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

@ -72,10 +72,13 @@ def findSagaFolder():
def sagaPath():
folder = ProcessingConfig.getSetting(SAGA_FOLDER)
if not os.path.isdir(folder):
folder = None
ProcessingLog.addToLog(ProcessingLog.LOG_WARNING,
'Specified SAGA folder does not exist. Will try to find built-in binaries.')
if folder is None or folder == '':
folder = findSagaFolder()
if folder is not None:
ProcessingConfig.setSettingValue(SAGA_FOLDER, folder)
return folder or ''