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

[processing]fixed SAGA when using a version newer than the latest supported one

Browse Source 
fixes #13279
This commit is contained in:
volaya 2015-10-01 07:44:25 +02:00
parent d4cb3465b2
commit a9dab06a6a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,8 +87,9 @@ class SagaAlgorithmProvider(AlgorithmProvider):
self.tr('Problem with SAGA installation: SAGA was not found or is not correctly installed'))
return
if version not in self.supportedVersions:
if version > self.supportedVersions.keys()[-1]:
version = self.supportedVersions.keys()[-1]
lastVersion = sorted(self.supportedVersions.keys())[-1]
if version > lastVersion:
version = lastVersion
else:
ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
self.tr('Problem with SAGA installation: installed SAGA version (%s) is not supported' % version))
@ -99,12 +100,12 @@ class SagaAlgorithmProvider(AlgorithmProvider):
for descriptionFile in os.listdir(folder):
if descriptionFile.endswith('txt'):
f = os.path.join(folder, descriptionFile)
self._loadAlgorithm(f)
self._loadAlgorithm(f, version)
self.algs.append(SplitRGBBands())
def _loadAlgorithm(self, descriptionFile):
def _loadAlgorithm(self, descriptionFile, version):
try:
alg = self.supportedVersions[SagaUtils.getSagaInstalledVersion()][1](descriptionFile)
alg = self.supportedVersions[version][1](descriptionFile)
if alg.name.strip() != '':
self.algs.append(alg)
else: