[processing] some SAGA fixes

-fixed raster export
-fixed version numbering when no saga installation is found
This commit is contained in:
volaya 2015-01-20 11:32:47 +01:00
parent 5511c86c9f
commit e9228b67c9
4 changed files with 15 additions and 8 deletions

View File

@ -304,8 +304,12 @@ class SagaAlgorithm212(GeoAlgorithm):
def exportRasterLayer(self, source):
global sessionExportedLayers
if source in sessionExportedLayers:
self.exportedLayers[source] = sessionExportedLayers[source]
return None
exportedLayer = sessionExportedLayers[source]
if os.path.exists(exportedLayer):
self.exportedLayers[source] = exportedLayer
return None
else:
del sessionExportedLayers[source]
layer = dataobjects.getObjectFromUri(source, False)
if layer:
filename = str(layer.name())

View File

@ -42,7 +42,6 @@ from processing.tools.system import *
sessionExportedLayers = {}
class SagaAlgorithm213(SagaAlgorithm212):
OUTPUT_EXTENT = 'OUTPUT_EXTENT'
@ -225,11 +224,15 @@ class SagaAlgorithm213(SagaAlgorithm212):
def exportRasterLayer(self, source):
global sessionExportedLayers
if source in sessionExportedLayers:
self.exportedLayers[source] = sessionExportedLayers[source]
return None
exportedLayer = sessionExportedLayers[source]
if os.path.exists(exportedLayer):
self.exportedLayers[source] = exportedLayer
return None
else:
del sessionExportedLayers[source]
layer = dataobjects.getObjectFromUri(source, False)
if layer:
filename = str(layer.name())
filename = layer.name()
else:
filename = os.path.basename(source)
validChars = \

View File

@ -102,7 +102,8 @@ class SagaAlgorithmProvider(AlgorithmProvider):
ProcessingLog.addToLog(ProcessingLog.LOG_ERROR,
self.tr('Could not open SAGA algorithm: %s\n%s' % (descriptionFile, str(e))))
def getDescription(self):
return 'SAGA (%s)' % SagaUtils.getSagaInstalledVersion()
version = SagaUtils.getSagaInstalledVersion()
return 'SAGA (%s)' % version if version is not None else 'SAGA'
def getName(self):
return 'saga'

View File

@ -27,7 +27,6 @@ __revision__ = '$Format:%H$'
import os
import stat
import traceback
import subprocess
from PyQt4.QtCore import *
from qgis.core import *