Skip to content

Commit

Permalink
[sextante] fixed issue with multiple raster input in gdal merge
Browse files Browse the repository at this point in the history
  • Loading branch information
volaya committed Jun 7, 2013
1 parent da0b468 commit eea63a4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 37 deletions.
14 changes: 7 additions & 7 deletions python/plugins/sextante/gdal/GdalUtils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
2 changes: 1 addition & 1 deletion python/plugins/sextante/gdal/merge.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
29 changes: 0 additions & 29 deletions python/plugins/sextante/grass/ext/r_quantile.py

This file was deleted.

0 comments on commit eea63a4

Please sign in to comment.