From 838b614df51c85048a9d6b0918703805a3cf008d Mon Sep 17 00:00:00 2001 From: brushtyler Date: Fri, 5 Nov 2010 13:35:23 +0000 Subject: [PATCH] split extent on comma in GdalTools Merge tool, to fix #3092 git-svn-id: http://svn.osgeo.org/qgis/trunk@14513 c8812cc2-4d05-0410-92ff-de0c093fc19c --- python/plugins/GdalTools/__init__.py | 2 +- python/plugins/GdalTools/tools/doMerge.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/python/plugins/GdalTools/__init__.py b/python/plugins/GdalTools/__init__.py index 1124bbc9b559..2df453379738 100644 --- a/python/plugins/GdalTools/__init__.py +++ b/python/plugins/GdalTools/__init__.py @@ -22,7 +22,7 @@ def name(): def description(): return "Integrate gdal tools into qgis" def version(): - return "Version 1.2.15" + return "Version 1.2.16" def qgisMinimumVersion(): return "1.0" def classFactory(iface): diff --git a/python/plugins/GdalTools/tools/doMerge.py b/python/plugins/GdalTools/tools/doMerge.py index fd7b0c164ec3..46947bb1338a 100644 --- a/python/plugins/GdalTools/tools/doMerge.py +++ b/python/plugins/GdalTools/tools/doMerge.py @@ -124,12 +124,12 @@ def getRectangle( self, file ): info = QString( arr ).split( "\n" ) ulCoord = info[ info.indexOf( QRegExp( "^Upper\sLeft.*" ) ) ].simplified() lrCoord = info[ info.indexOf( QRegExp( "^Lower\sRight.*" ) ) ].simplified() - ul = ulCoord.split( " " ) - lr = lrCoord.split( " " ) - xUL = ul[ 3 ].replace( ",", "" ).toDouble() [ 0 ] - yUL = ul[ 4 ].replace( ")", "" ).toDouble()[ 0 ] - xLR = lr[ 3 ].replace( ",", "" ).toDouble()[ 0 ] - yLR = lr[ 4 ].replace( ")", "" ).toDouble()[ 0 ] + ulCoord = ulCoord[ulCoord.indexOf( "(" ) + 1 : ulCoord.indexOf( ")" ) - 1].split( "," ) + lrCoord = lrCoord[lrCoord.indexOf( "(" ) + 1 : lrCoord.indexOf( ")" ) - 1].split( "," ) + xUL = ulCoord[0].toDouble()[0] + yUL = ulCoord[1].toDouble()[0] + xLR = lrCoord[0].toDouble()[0] + yLR = lrCoord[1].toDouble()[0] return QgsRectangle( xUL, yLR, xLR, yUL )