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

Merge pull request #2006 from NaturalGIS/grass7_better_default_raster_resolution

Browse Source 
better GRASS7 default raster resolution and fix r.composite
This commit is contained in:
Paolo Cavallini 2015-04-26 13:22:47 +02:00
commit c79dd9d15b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python/plugins/processing/algs/grass7/Grass7Algorithm.py
View File

@ -194,7 +194,7 @@ class Grass7Algorithm(GeoAlgorithm):
) )
if cellsize == 0: if cellsize == 0:
cellsize = 1 cellsize = 100
return cellsize return cellsize
def processAlgorithm(self, progress): def processAlgorithm(self, progress):
@ -359,18 +359,19 @@ class Grass7Algorithm(GeoAlgorithm):
outputCommands.append('g.region raster=' + out.name outputCommands.append('g.region raster=' + out.name
+ uniqueSufix) + uniqueSufix)
if self.grassName == 'r.composite': if self.grassName == 'r.composite':
command = 'r.out.tiff -t --verbose' # FIXME r.out.tiff deprecated, use r.out.gdal command = 'r.out.gdal -c createopt="TFW=YES,COMPRESS=LZW"'
command += ' input=' command += ' input='
command += out.name + uniqueSufix command += out.name + uniqueSufix
command += ' output="' + filename + '"' command += ' output="' + filename + '"'
commands.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': if self.grassName == 'r.horizon':
command += out.name + uniqueSufix + '_0' command += out.name + uniqueSufix + '_0'
elif self.grassName == 'r.composite':
commands.append(command)
outputCommands.append(command)
else: else:
command += out.name + uniqueSufix command += out.name + uniqueSufix
command += ' output="' + filename + '"' command += ' output="' + filename + '"'