Merge branch 'master' of https://github.com/scubbx/QGIS into processing-r.stat

Conflicts:
	python/plugins/processing/algs/grass7/Grass7Algorithm.py

Author: alexbruy

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 + '"'