sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-27 00:03:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

[BACKPORT] fix broken Assign projection functionality in GDALTools and

Browse Source 
improve handling output file extension
This commit is contained in:
Alexander Bruy 2011-11-13 11:19:44 +02:00
parent 19501c6a89
commit aaae4898a9
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
python/plugins/GdalTools/tools/doProjection.py
View File

@ -41,9 +41,6 @@ class GdalToolsDialog( QWidget, Ui_Widget, BaseBatchWidget ):
self.connect( self.batchCheck, SIGNAL( "stateChanged( int )" ), self.switchToolMode ) self.connect( self.batchCheck, SIGNAL( "stateChanged( int )" ), self.switchToolMode )
self.connect( self.recurseCheck, SIGNAL( "stateChanged( int )" ), self.enableRecurse ) self.connect( self.recurseCheck, SIGNAL( "stateChanged( int )" ), self.enableRecurse )
#QObject.disconnect( self.base.buttonBox.button( QDialogButtonBox.Ok ), SIGNAL( "clicked()" ), self.onRun )
#QObject.connect( self.base.buttonBox.button( QDialogButtonBox.Ok ), SIGNAL( "clicked()" ), self.checkLayer )
def switchToolMode( self ): def switchToolMode( self ):
self.setCommandViewerEnabled( not self.batchCheck.isChecked() ) self.setCommandViewerEnabled( not self.batchCheck.isChecked() )
self.progressBar.setVisible( self.batchCheck.isChecked() ) self.progressBar.setVisible( self.batchCheck.isChecked() )
@ -102,11 +99,32 @@ class GdalToolsDialog( QWidget, Ui_Widget, BaseBatchWidget ):
inputFn = self.getInputFileName() inputFn = self.getInputFileName()
arguments << inputFn arguments << inputFn
self.tempFile = QString( inputFn ) self.tempFile = QString( inputFn )
self.needOverwrite = False
if not self.tempFile.isEmpty(): if not self.tempFile.isEmpty():
if self.tempFile.toLower().contains( QRegExp( "\.tif{1,2}" ) ):
self.tempFile = self.tempFile.replace( QRegExp( "\.[a-zA-Z]{2,4}$" ), ".tif" ).append( ".tmp" ) self.tempFile = self.tempFile.replace( QRegExp( "\.[a-zA-Z]{2,4}$" ), ".tif" ).append( ".tmp" )
self.needOverwrite = True
else:
self.tempFile = self.tempFile.replace( QRegExp( "\.[a-zA-Z]{2,4}$" ), ".tif" )
arguments << self.tempFile arguments << self.tempFile
return arguments return arguments
def finished( self ):
outFn = self.getOutputFileName()
if self.needOverwrite:
oldFile = QFile( outFn )
newFile = QFile( self.tempFile )
if oldFile.remove():
newFile.rename( outFn )
fileInfo = QFileInfo( outFn )
if fileInfo.exists():
if self.base.loadCheckBox.isChecked():
self.addLayerIntoCanvas( fileInfo )
QMessageBox.information( self, self.tr( "Finished" ), self.tr( "Processing completed." ) )
else:
QMessageBox.warning( self, self.tr( "Warning" ), self.tr( "%1 not created." ).arg( outFn ) )
def getInputFileName(self): def getInputFileName(self):
return self.inSelector.filename() return self.inSelector.filename()
@ -149,10 +167,3 @@ class GdalToolsDialog( QWidget, Ui_Widget, BaseBatchWidget ):
self.progressBar.setValue(index + 1) self.progressBar.setValue(index + 1)
else: else:
self.progressBar.setValue(0) self.progressBar.setValue(0)
def finished( self ):
oldFile = QFile( self.getInputFileName() )
newFile = QFile( self.tempFile )
if oldFile.remove():
newFile.rename( self.getInputFileName() )