[gdaltools] Proximity(raster distance) error (Fix #8115)

qgis · Jun 19, 2013 · b2441f8 · b2441f8
1 parent 0b0de71
commit b2441f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/python/plugins/GdalTools/tools/doInfo.py b/python/plugins/GdalTools/tools/doInfo.py
@@ -101,7 +101,7 @@ def finished( self ):
       self.rasterInfoList.clear()
       arr = str(self.base.process.readAllStandardOutput()).strip()
       if platform.system() == "Windows":
-        #info = QString.fromLocal8Bit( arr ).trimmed().split( "\r\n" )
+        #info = QString.fromLocal8Bit( arr ).strip().split( "\r\n" )
         # TODO test
         info = string.split(arr, sep="\r\n" )
       else:

diff --git a/python/plugins/GdalTools/tools/doProximity.py b/python/plugins/GdalTools/tools/doProximity.py
@@ -90,10 +90,10 @@ def getArguments(self):
       outputFn = self.getOutputFileName()
       arguments.append( outputFn)
       if self.valuesCheck.isChecked():
-        values = self.valuesEdit.text().trimmed()
+        values = self.valuesEdit.text().split()
         if values:
           arguments.append( "-values")
-          arguments.append( values.replace(' ', ','))
+          arguments.append( ','.join( values) )
       if self.distUnitsCheck.isChecked() and self.distUnitsCombo.currentIndex() >= 0:
         arguments.append( "-distunits")
         arguments.append( self.distUnitsCombo.currentText())