fix GdalTools assign and extract projection

This commit is contained in:
Etienne Tourigny 2013-06-14 15:54:30 -03:00
parent 5e98be1266
commit 684aa98e96
2 changed files with 15 additions and 14 deletions

View File

@ -79,14 +79,14 @@ class GdalToolsDialog( QDialog, Ui_Dialog ):
def fillInputFileEdit( self ): def fillInputFileEdit( self ):
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter() lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
inputFile = Utils.FileDialog.getOpenFileName( self, self.tr( "Select the file to analyse" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter ) inputFile = Utils.FileDialog.getOpenFileName( self, self.tr( "Select the file to analyse" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
if inputFile.isEmpty(): if not inputFile:
return return
Utils.FileFilter.setLastUsedRasterFilter( lastUsedFilter ) Utils.FileFilter.setLastUsedRasterFilter( lastUsedFilter )
self.inSelector.setFilename( inputFile ) self.inSelector.setFilename( inputFile )
def fillInputDir( self ): def fillInputDir( self ):
inputDir = Utils.FileDialog.getExistingDirectory( self, self.tr( "Select the input directory with files to Assign projection" )) inputDir = Utils.FileDialog.getExistingDirectory( self, self.tr( "Select the input directory with files to Assign projection" ))
if inputDir.isEmpty(): if not inputDir:
return return
self.inSelector.setFilename( inputDir ) self.inSelector.setFilename( inputDir )

View File

@ -34,6 +34,7 @@ from dialogSRS import GdalToolsSRSDialog as SRSDialog
import GdalTools_utils as Utils import GdalTools_utils as Utils
import os.path import os.path
import re
class GdalToolsDialog( QWidget, Ui_Widget, BaseBatchWidget ): class GdalToolsDialog( QWidget, Ui_Widget, BaseBatchWidget ):
@ -96,14 +97,14 @@ class GdalToolsDialog( QWidget, Ui_Widget, BaseBatchWidget ):
def fillInputFileEdit( self ): def fillInputFileEdit( self ):
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter() lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
inputFile = Utils.FileDialog.getOpenFileName( self, self.tr( "Select the file to analyse" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter ) inputFile = Utils.FileDialog.getOpenFileName( self, self.tr( "Select the file to analyse" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
if inputFile.isEmpty(): if not inputFile:
return return
Utils.FileFilter.setLastUsedRasterFilter( lastUsedFilter ) Utils.FileFilter.setLastUsedRasterFilter( lastUsedFilter )
self.inSelector.setFilename( inputFile ) self.inSelector.setFilename( inputFile )
def fillInputDir( self ): def fillInputDir( self ):
inputDir = Utils.FileDialog.getExistingDirectory( self, self.tr( "Select the input directory with files to Assign projection" )) inputDir = Utils.FileDialog.getExistingDirectory( self, self.tr( "Select the input directory with files to Assign projection" ))
if inputDir.isEmpty(): if not inputDir:
return return
self.inSelector.setFilename( inputDir ) self.inSelector.setFilename( inputDir )
@ -113,24 +114,24 @@ class GdalToolsDialog( QWidget, Ui_Widget, BaseBatchWidget ):
self.desiredSRSEdit.setText( dialog.getProjection() ) self.desiredSRSEdit.setText( dialog.getProjection() )
def getArguments( self ): def getArguments( self ):
arguments = QStringList() arguments = []
if not self.desiredSRSEdit.text().isEmpty(): if self.desiredSRSEdit.text():
arguments << "-t_srs" arguments.append("-t_srs")
arguments << self.desiredSRSEdit.text() arguments.append(self.desiredSRSEdit.text())
if self.batchCheck.isChecked(): if self.batchCheck.isChecked():
return arguments return arguments
inputFn = self.getInputFileName() inputFn = self.getInputFileName()
arguments << inputFn arguments.append(inputFn)
self.tempFile = inputFn self.tempFile = inputFn
self.needOverwrite = False self.needOverwrite = False
if not self.tempFile.isEmpty(): if self.tempFile:
if self.tempFile.toLower().contains( QRegExp( "\.tif{1,2}" ) ): if self.tempFile.lower().endswith(".tif") or self.tempFile.lower().endswith(".tiff") :
self.tempFile = self.tempFile.replace( QRegExp( "\.[a-zA-Z]{2,4}$" ), ".tif" ).append( ".tmp" ) self.tempFile = re.sub("\.[a-zA-Z]{2,4}$", ".tif", self.tempFile) + ".tmp"
self.needOverwrite = True self.needOverwrite = True
else: else:
self.tempFile = self.tempFile.replace( QRegExp( "\.[a-zA-Z]{2,4}$" ), ".tif" ) self.tempFile = re.sub("\.[a-zA-Z]{2,4}$", ".tif", self.tempFile)
arguments << self.tempFile arguments.append(self.tempFile)
return arguments return arguments
def finished( self ): def finished( self ):