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

[processing] fixed wrong indentation

Browse Source
This commit is contained in:
Victor Olaya 2013-10-20 19:01:56 +02:00
parent 83cca9b7cd
commit 5cfd708b7b
2 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
python/plugins/processing/grass/GrassAlgorithm.py
View File

@ -373,22 +373,23 @@ class GrassAlgorithm(GeoAlgorithm):
outputCommands.append('g.region rast=' + out.name outputCommands.append('g.region rast=' + out.name
+ uniqueSufix) + uniqueSufix)
if self.grassName == 'r.composite': if self.grassName == 'r.composite':
command = 'r.out.tiff -t --verbose' command = 'r.out.tiff -t --verbose'
command += ' input=' command += ' input='
command += out.name + uniqueSufix command += out.name + uniqueSufix
command += ' output="' + filename + '"' command += ' output="' + filename + '"'
commands.append(command) commands.append(command)
outputCommands.append(command) outputCommands.append(command)
else: else:
command = 'r.out.gdal -c createopt="TFW=YES,COMPRESS=LZW"' command = 'r.out.gdal -c createopt="TFW=YES,COMPRESS=LZW"'
command += ' input=' command += ' input='
if self.grassName == 'r.horizon':
command += out.name + uniqueSufix + '_0' if self.grassName == 'r.horizon':
else: command += out.name + uniqueSufix + '_0'
command += out.name + uniqueSufix else:
command += ' output="' + filename + '"' command += out.name + uniqueSufix
commands.append(command) command += ' output="' + filename + '"'
outputCommands.append(command) commands.append(command)
outputCommands.append(command)
if isinstance(out, OutputVector): if isinstance(out, OutputVector):
filename = out.value filename = out.value

24
python/plugins/processing/saga/SagaAlgorithm.py
View File

@ -360,21 +360,21 @@ class SagaAlgorithm(GeoAlgorithm):
continue continue
if self.cmdname == 'RGB Composite': if self.cmdname == 'RGB Composite':
if isWindows() or isMac() or not saga208: if isWindows() or isMac() or not saga208:
commands.append('io_grid_image 0 -IS_RGB -GRID:"' + filename2 commands.append('io_grid_image 0 -IS_RGB -GRID:"' + filename2
+ '" -FILE:"' + filename + '" -FILE:"' + filename
+ '"') + '"')
else: else:
commands.append('libio_grid_image 0 -IS_RGB -GRID:"' + filename2 commands.append('libio_grid_image 0 -IS_RGB -GRID:"' + filename2
+ '" -FILE:"' + filename + '" -FILE:"' + filename
+ '"') + '"')
else: else:
if isWindows() or isMac() or not saga208: if isWindows() or isMac() or not saga208:
commands.append('io_gdal 1 -GRIDS "' + filename2 commands.append('io_gdal 1 -GRIDS "' + filename2
+ '" -FORMAT ' + str(formatIndex) + '" -FORMAT ' + str(formatIndex)
+ ' -TYPE 0 -FILE "' + filename + '"') + ' -TYPE 0 -FILE "' + filename + '"')
else: else:
commands.append('libio_gdal 1 -GRIDS "' + filename2 commands.append('libio_gdal 1 -GRIDS "' + filename2
+ '" -FORMAT 1 -TYPE 0 -FILE "' + filename + '" -FORMAT 1 -TYPE 0 -FILE "' + filename
+ '"') + '"')
@ -471,11 +471,11 @@ class SagaAlgorithm(GeoAlgorithm):
sessionExportedLayers[source] = destFilename sessionExportedLayers[source] = destFilename
saga208 = ProcessingConfig.getSetting(SagaUtils.SAGA_208) saga208 = ProcessingConfig.getSetting(SagaUtils.SAGA_208)
if saga208: if saga208:
if isWindows() or isMac(): if isWindows() or isMac():
return 'io_gdal 0 -GRIDS "' + destFilename + '" -FILES "' + source \ return 'io_gdal 0 -GRIDS "' + destFilename + '" -FILES "' + source \
+ '"' + '"'
else: else:
return 'libio_gdal 0 -GRIDS "' + destFilename + '" -FILES "' \ return 'libio_gdal 0 -GRIDS "' + destFilename + '" -FILES "' \
+ source + '"' + source + '"'
else: else:
return 'io_gdal 0 -TRANSFORM -INTERPOL 0 -GRIDS "' + destFilename + '" -FILES "' + source \ return 'io_gdal 0 -TRANSFORM -INTERPOL 0 -GRIDS "' + destFilename + '" -FILES "' + source \