From b2441f809897fdaed1656cb3fb6653da9a34b1b2 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Wed, 19 Jun 2013 18:26:37 +0200 Subject: [PATCH] [gdaltools] Proximity(raster distance) error (Fix #8115) --- python/plugins/GdalTools/tools/doInfo.py | 2 +- python/plugins/GdalTools/tools/doProximity.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/plugins/GdalTools/tools/doInfo.py b/python/plugins/GdalTools/tools/doInfo.py index a2d1a78d372..d82e803cc8c 100644 --- a/python/plugins/GdalTools/tools/doInfo.py +++ b/python/plugins/GdalTools/tools/doInfo.py @@ -101,7 +101,7 @@ class GdalToolsDialog( QWidget, Ui_Widget, BasePluginWidget ): 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 index 8ace2eed26d..2e5573cba20 100644 --- a/python/plugins/GdalTools/tools/doProximity.py +++ b/python/plugins/GdalTools/tools/doProximity.py @@ -90,10 +90,10 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): 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())