Skip to content
Permalink
Browse files
Merge branch 'master' of https://github.com/scubbx/QGIS into processi…
…ng-r.stat

Conflicts:
	python/plugins/processing/algs/grass7/Grass7Algorithm.py
  • Loading branch information
alexbruy committed May 27, 2015
2 parents c729a75 + a3454e7 commit 6919d9841b7d29bc332287f6649d7e3c10b41e30
Showing with 17 additions and 1 deletion.
  1. +17 −1 python/plugins/processing/algs/grass7/Grass7Algorithm.py
@@ -361,11 +361,24 @@ def processAlgorithm(self, progress):
commands.append('g.region raster=' + out.name + uniqueSufix)
outputCommands.append('g.region raster=' + out.name
+ uniqueSufix)
if self.grass7Name == 'r.composite':
if self.grassName == 'r.statistics':
# r.statistics saves its results in a non-qgis compatible way.
# Post-Process 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 += ' output="' + filename + '"'
elif self.grassName == 'r.statistics':
command = 'r.out.gdal -c createopt="TFW=YES,COMPRESS=LZW"'
command += ' input='
command += 'correctedoutput' + uniqueSufix
command += ' output="' + filename + '"'
else:
command = 'r.out.gdal -c createopt="TFW=YES,COMPRESS=LZW"'
command += ' input='
@@ -375,6 +388,9 @@ def processAlgorithm(self, progress):
elif self.grass7Name == 'r.composite':
commands.append(command)
outputCommands.append(command)
elif self.grassName == 'r.statistics':
commands.append(command)
outputCommands.append(command)
else:
command += out.name + uniqueSufix
command += ' output="' + filename + '"'

0 comments on commit 6919d98

Please sign in to comment.