Skip to content
Permalink
Browse files
fix conflicts
  • Loading branch information
alexbruy committed May 27, 2015
1 parent 6919d98 commit 596b126b94ffb6ae8a0a40654ed4f660fddac2a5
Showing with 7 additions and 6 deletions.
  1. +7 −6 python/plugins/processing/algs/grass7/Grass7Algorithm.py
@@ -361,20 +361,21 @@ def processAlgorithm(self, progress):
commands.append('g.region raster=' + out.name + uniqueSufix)
outputCommands.append('g.region raster=' + out.name
+ uniqueSufix)

if self.grassName == 'r.statistics':
# r.statistics saves its results in a non-qgis compatible way.
# Post-Process with r.mapcalc.
# r.statistics saves its results in a non-qgis compatible
# way. Post-process them with r.mapcalc.
calcExpression = 'correctedoutput' + uniqueSufix
calcExpression += '=@' + out.name + uniqueSufix
command = 'r.mapcalc expression="' + calcExpression + '"'
commands.append(command)
outputCommands.append(command)

command = 'r.out.gdal -c createopt="TFW=YES,COMPRESS=LZW"'
command += ' input='
command += out.name + uniqueSufix
command += 'correctedoutput' + uniqueSufix
command += ' output="' + filename + '"'
elif self.grassName == 'r.statistics':
elif self.grass7Name == 'r.composite':
command = 'r.out.gdal -c createopt="TFW=YES,COMPRESS=LZW"'
command += ' input='
command += 'correctedoutput' + uniqueSufix
@@ -388,7 +389,7 @@ def processAlgorithm(self, progress):
elif self.grass7Name == 'r.composite':
commands.append(command)
outputCommands.append(command)
elif self.grassName == 'r.statistics':
elif self.grass7Name == 'r.statistics':
commands.append(command)
outputCommands.append(command)
else:

0 comments on commit 596b126

Please sign in to comment.