Merge pull request #945 from gioman/grassrasterexport

[processing] fixes GRASS raster export in order to cope with r.horizon and r.composite

Author: volaya

python/plugins/processing/grass/GrassAlgorithm.py

@@ -372,12 +372,23 @@ def processAlgorithm(self, progress):
                 commands.append('g.region rast=' + out.name + uniqueSufix)
                 outputCommands.append('g.region rast=' + out.name
                                       + uniqueSufix)
-                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)
+                if self.grassName == 'r.composite':
+               		command = 'r.out.tiff -t --verbose'
+                	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'
+			else:
+				command += out.name + uniqueSufix
+                	command += ' output="' + filename + '"'
+                	commands.append(command)
+                	outputCommands.append(command)
 
             if isinstance(out, OutputVector):
                 filename = out.value