[QGIS Commit] r14513 - in trunk/qgis/python/plugins/GdalTools: . tools

[svn_qgis at osgeo.org]

Author: brushtyler
Date: 2010-11-05 06:35:23 -0700 (Fri, 05 Nov 2010)
New Revision: 14513

Modified:
   trunk/qgis/python/plugins/GdalTools/__init__.py
   trunk/qgis/python/plugins/GdalTools/tools/doMerge.py
Log:
split extent on comma in GdalTools Merge tool, to fix #3092


Modified: trunk/qgis/python/plugins/GdalTools/__init__.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/__init__.py	2010-11-05 07:30:40 UTC (rev 14512)
+++ trunk/qgis/python/plugins/GdalTools/__init__.py	2010-11-05 13:35:23 UTC (rev 14513)
@@ -22,7 +22,7 @@
 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): 

Modified: trunk/qgis/python/plugins/GdalTools/tools/doMerge.py
===================================================================
--- trunk/qgis/python/plugins/GdalTools/tools/doMerge.py	2010-11-05 07:30:40 UTC (rev 14512)
+++ trunk/qgis/python/plugins/GdalTools/tools/doMerge.py	2010-11-05 13:35:23 UTC (rev 14513)
@@ -124,12 +124,12 @@
     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 )