Skip to content

Commit

Permalink
gdaltools: more SIP APIv2 update
Browse files Browse the repository at this point in the history
  • Loading branch information
brushtyler committed Jun 27, 2013
1 parent edd0cdd commit df4fc99
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions python/plugins/GdalTools/tools/doFillNodata.py
Expand Up @@ -205,7 +205,7 @@ def updateProgress(self, index, total):
self.progressBar.setValue( 0 )

def batchRun(self):
exts = self.formatCombo.currentText().remove( QRegExp('^.*\(') ).remove( QRegExp('\).*$') ).split( " " )
exts = re.sub('\).*$', '', re.sub('^.*\(', '', self.formatCombo.currentText())).split(" ")
if exts and exts != "*" and exts != "*.*":
outExt = exts[ 0 ].remove( "*" )
else:
Expand All @@ -229,7 +229,7 @@ def batchRun(self):
for f in files:
self.inFiles.append( inDir + "/" + f )
if outDir != None:
outFile = re.sub( f, "\.[a-zA-Z0-9]{2,4}", outExt )
outFile = re.sub( "\.[a-zA-Z0-9]{2,4}", outExt, f )
self.outFiles.append( outDir + "/" + outFile )

self.errors = []
Expand Down
6 changes: 3 additions & 3 deletions python/plugins/GdalTools/tools/doTranslate.py
Expand Up @@ -206,7 +206,7 @@ def getArguments(self):
if self.sdsCheck.isChecked():
arguments.append( "-sds")
if self.srcwinCheck.isChecked() and self.srcwinEdit.text():
coordList = self.srcwinEdit.text().split( ' ', QString.SkipEmptyParts )
coordList = self.srcwinEdit.text().split() # split the string on whitespace(s)
if len(coordList) == 4 and coordList[3]:
try:
for x in coordList:
Expand All @@ -219,7 +219,7 @@ def getArguments(self):
for x in coordList:
arguments.append( x)
if self.prjwinCheck.isChecked() and self.prjwinEdit.text():
coordList = self.prjwinEdit.text().split( ' ', QString.SkipEmptyParts )
coordList = self.prjwinEdit.text().split() # split the string on whitespace(s)
if len(coordList) == 4 and coordList[3]:
try:
for x in coordList:
Expand Down Expand Up @@ -276,7 +276,7 @@ def updateProgress(self, index, total):
self.progressBar.setValue( 0 )

def batchRun(self):
exts = self.formatCombo.currentText().remove( QRegExp('^.*\(') ).remove( QRegExp('\).*$') ).split( " " )
exts = re.sub('\).*$', '', re.sub('^.*\(', '', self.formatCombo.currentText())).split(" ")
if exts and exts != "*" and exts != "*.*":
outExt = exts[ 0 ].remove( "*" )
else:
Expand Down

0 comments on commit df4fc99

Please sign in to comment.