[sextante] fixed issue with multiple raster input in gdal merge

qgis · Jun 7, 2013 · eea63a4 · eea63a4
1 parent da0b468
commit eea63a4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 37 deletions.
diff --git a/python/plugins/sextante/gdal/GdalUtils.py b/python/plugins/sextante/gdal/GdalUtils.py
@@ -112,11 +112,11 @@ def getFormatShortNameFromFilename(filename):
 
     @staticmethod
     def escapeAndJoin(strList):
-        joined = QString()
+        joined = ""
         for s in strList:
-          if " " in s:
-            escaped = '"' + s.replace('\\', '\\\\').replace('"', '\\"') + '"'
-          else:
-            escaped = s
-          joined += escaped + " "
-        return joined.trimmed()
+            if " " in s:
+                escaped = '"' + s.replace('\\', '\\\\').replace('"', '\\"') + '"'
+            else:
+                escaped = s
+            joined += escaped + " "
+        return joined.strip()
diff --git a/python/plugins/sextante/gdal/merge.py b/python/plugins/sextante/gdal/merge.py
@@ -66,7 +66,7 @@ def processAlgorithm(self, progress):
         arguments.append(out)
         arguments.append("-of")
         arguments.append(GdalUtils.getFormatShortNameFromFilename(out))
-        arguments.append(self.getParameterValue(merge.INPUT).replace(";", " "))
+        arguments.extend(self.getParameterValue(merge.INPUT).split(";"))
 
         commands = []
         if SextanteUtils.isWindows():

diff --git a/python/plugins/sextante/grass/ext/r_quantile.py b/python/plugins/sextante/grass/ext/r_quantile.py