sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-22 00:14:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

[processing] fixed saga algorithms when input is an sdat file

Browse Source
This commit is contained in:
volaya 2015-06-24 18:04:11 +02:00
parent 848cd44d69
commit feb8d386a5
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
python/plugins/processing/algs/saga/SagaAlgorithm212.py
View File

@ -111,9 +111,10 @@ class SagaAlgorithm212(GeoAlgorithm):
if isinstance(param, ParameterRaster): if isinstance(param, ParameterRaster):
if param.value is None: if param.value is None:
continue continue
value = param.value if param.value.endswith('sdat'):
if not value.endswith('sgrd'): param.value = param.value[:-4] + "sgrd"
exportCommand = self.exportRasterLayer(value) elif not param.value.endswith('sgrd'):
exportCommand = self.exportRasterLayer(param.value)
if exportCommand is not None: if exportCommand is not None:
commands.append(exportCommand) commands.append(exportCommand)
if isinstance(param, ParameterVector): if isinstance(param, ParameterVector):
@ -143,11 +144,15 @@ class SagaAlgorithm212(GeoAlgorithm):
if layers is None or len(layers) == 0: if layers is None or len(layers) == 0:
continue continue
if param.datatype == ParameterMultipleInput.TYPE_RASTER: if param.datatype == ParameterMultipleInput.TYPE_RASTER:
for layerfile in layers: for i, layerfile in enumerate(layers):
if not layerfile.endswith('sgrd'): if layerfile.endswith('sdat'):
layerfile = param.value[:-4] + "sgrd"
layers[i] = layerfile
elif not layerfile.endswith('sgrd'):
exportCommand = self.exportRasterLayer(layerfile) exportCommand = self.exportRasterLayer(layerfile)
if exportCommand is not None: if exportCommand is not None:
commands.append(exportCommand) commands.append(exportCommand)
param.value = ";".join(layers)
elif param.datatype == ParameterMultipleInput.TYPE_VECTOR_ANY: elif param.datatype == ParameterMultipleInput.TYPE_VECTOR_ANY:
for layerfile in layers: for layerfile in layers:
layer = dataobjects.getObjectFromUri(layerfile, False) layer = dataobjects.getObjectFromUri(layerfile, False)

15
python/plugins/processing/algs/saga/SagaAlgorithm213.py
View File

@ -61,9 +61,10 @@ class SagaAlgorithm213(SagaAlgorithm212):
if isinstance(param, ParameterRaster): if isinstance(param, ParameterRaster):
if param.value is None: if param.value is None:
continue continue
value = param.value if param.value.endswith('sdat'):
if not value.endswith('sgrd'): param.value = param.value[:-4] + "sgrd"
exportCommand = self.exportRasterLayer(value) elif not param.value.endswith('sgrd'):
exportCommand = self.exportRasterLayer(param.value)
if exportCommand is not None: if exportCommand is not None:
commands.append(exportCommand) commands.append(exportCommand)
if isinstance(param, ParameterVector): if isinstance(param, ParameterVector):
@ -93,11 +94,15 @@ class SagaAlgorithm213(SagaAlgorithm212):
if layers is None or len(layers) == 0: if layers is None or len(layers) == 0:
continue continue
if param.datatype == ParameterMultipleInput.TYPE_RASTER: if param.datatype == ParameterMultipleInput.TYPE_RASTER:
for layerfile in layers: for i, layerfile in enumerate(layers):
if not layerfile.endswith('sgrd'): if layerfile.endswith('sdat'):
layerfile = param.value[:-4] + "sgrd"
layers[i] = layerfile
elif not layerfile.endswith('sgrd'):
exportCommand = self.exportRasterLayer(layerfile) exportCommand = self.exportRasterLayer(layerfile)
if exportCommand is not None: if exportCommand is not None:
commands.append(exportCommand) commands.append(exportCommand)
param.value = ";".join(layers)
elif param.datatype == ParameterMultipleInput.TYPE_VECTOR_ANY: elif param.datatype == ParameterMultipleInput.TYPE_VECTOR_ANY:
for layerfile in layers: for layerfile in layers:
layer = dataobjects.getObjectFromUri(layerfile, False) layer = dataobjects.getObjectFromUri(layerfile, False)