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

[processing] fix path handling (fix #14432)

Browse Source
This commit is contained in:
Alexander Bruy 2016-04-11 18:51:18 +03:00
parent 4815ebd5c2
commit e873540d14
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/plugins/processing/algs/grass/GrassUtils.py
View File

@ -86,7 +86,7 @@ class GrassUtils:
if not isWindows() and not isMac():
return ''
folder = ProcessingConfig.getSetting(GrassUtils.GRASS_FOLDER)
folder = ProcessingConfig.getSetting(GrassUtils.GRASS_FOLDER) or ''
if not os.path.exists(folder):
folder = None
if folder is None:
@ -110,7 +110,7 @@ class GrassUtils:
@staticmethod
def grassWinShell():
folder = ProcessingConfig.getSetting(GrassUtils.GRASS_WIN_SHELL)
folder = ProcessingConfig.getSetting(GrassUtils.GRASS_WIN_SHELL) or ''
if not os.path.exists(folder):
folder = None
if folder is None:

2
python/plugins/processing/algs/grass7/Grass7Utils.py
View File

@ -83,7 +83,7 @@ class Grass7Utils:
if not isWindows() and not isMac():
return ''
folder = ProcessingConfig.getSetting(Grass7Utils.GRASS_FOLDER)
folder = ProcessingConfig.getSetting(Grass7Utils.GRASS_FOLDER) or ''
if not os.path.exists(folder):
folder = None
if folder is None:

15
python/plugins/processing/algs/otb/OTBUtils.py
View File

@ -101,24 +101,15 @@ def findOtbLibPath():
def otbLibPath():
folder = ProcessingConfig.getSetting(OTB_LIB_FOLDER)
if folder is None:
folder = ""
return folder
return ProcessingConfig.getSetting(OTB_LIB_FOLDER) or ''
def otbSRTMPath():
folder = ProcessingConfig.getSetting(OTB_SRTM_FOLDER)
if folder is None:
folder = ""
return folder
return ProcessingConfig.getSetting(OTB_SRTM_FOLDER) or ''
def otbGeoidPath():
filepath = ProcessingConfig.getSetting(OTB_GEOID_FILE)
if filepath is None:
filepath = ""
return filepath
return ProcessingConfig.getSetting(OTB_GEOID_FILE) or ''
def otbDescriptionPath():