Skip to content

Commit

Permalink
split extent on comma in GdalTools Merge tool, to fix #3092
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk@14513 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
brushtyler committed Nov 5, 2010
1 parent f25d868 commit 838b614
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion python/plugins/GdalTools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
12 changes: 6 additions & 6 deletions python/plugins/GdalTools/tools/doMerge.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 )

Expand Down

0 comments on commit 838b614

Please sign in to comment.