Skip to content

Commit

Permalink
Merge pull request #2006 from NaturalGIS/grass7_better_default_raster…
Browse files Browse the repository at this point in the history
…_resolution

better GRASS7 default raster resolution and fix r.composite
  • Loading branch information
pcav committed Apr 26, 2015
2 parents e7e0279 + 031f9a9 commit c79dd9d
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions python/plugins/processing/algs/grass7/Grass7Algorithm.py
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ def getDefaultCellsize(self):
)

if cellsize == 0:
cellsize = 1
cellsize = 100
return cellsize

def processAlgorithm(self, progress):
Expand Down Expand Up @@ -359,18 +359,19 @@ def processAlgorithm(self, progress):
outputCommands.append('g.region raster=' + out.name
+ uniqueSufix)
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 += out.name + uniqueSufix
command += ' output="' + filename + '"'
commands.append(command)
outputCommands.append(command)
else:
command = 'r.out.gdal -c createopt="TFW=YES,COMPRESS=LZW"'
command += ' input='

if self.grassName == 'r.horizon':
command += out.name + uniqueSufix + '_0'
elif self.grassName == 'r.composite':
commands.append(command)
outputCommands.append(command)
else:
command += out.name + uniqueSufix
command += ' output="' + filename + '"'
Expand Down

0 comments on commit c79dd9d

Please sign in to comment.