24 changes: 12 additions & 12 deletions python/plugins/GdalTools/tools/doPctRgb.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,15 @@ def onLayersChanged(self):
def fillInputFile(self):
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
inputFile = Utils.FileDialog.getOpenFileName(self, self.tr( "Select the input file for convert" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
if inputFile.isEmpty():
if not inputFile:
return
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)
self.inSelector.setFilename(inputFile)

def fillOutputFileEdit(self):
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
if outputFile.isEmpty():
if not outputFile:
return
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

Expand All @@ -119,30 +119,30 @@ def fillOutputFileEdit(self):

def fillInputDir( self ):
inputDir = Utils.FileDialog.getExistingDirectory( self, self.tr( "Select the input directory with files for convert" ))
if inputDir.isEmpty():
if not inputDir:
return
self.inSelector.setFilename( inputDir )

def fillOutputDir( self ):
outputDir = Utils.FileDialog.getExistingDirectory( self, self.tr( "Select the output directory to save the results to" ))
if outputDir.isEmpty():
if not outputDir:
return
self.outSelector.setFilename( outputDir )

def getArguments(self):
arguments = QStringList()
arguments = []
if self.bandCheck.isChecked():
arguments << "-b"
arguments << str( self.bandSpin.value() )
arguments.append( "-b")
arguments.append( str( self.bandSpin.value() ))
if self.isBatchEnabled():
return arguments

outputFn = self.getOutputFileName()
if not outputFn.isEmpty():
arguments << "-of"
arguments << self.outputFormat
arguments << self.getInputFileName()
arguments << outputFn
if outputFn:
arguments.append( "-of")
arguments.append( self.outputFormat)
arguments.append( self.getInputFileName())
arguments.append( outputFn)
return arguments

def getInputFileName(self):
Expand Down
14 changes: 7 additions & 7 deletions python/plugins/GdalTools/tools/doPolygonize.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def onLayersChanged(self):
def fillInputFileEdit(self):
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
inputFile = Utils.FileDialog.getOpenFileName(self, self.tr( "Select the input file for Polygonize" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
if inputFile.isEmpty():
if not inputFile:
return
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

Expand All @@ -74,7 +74,7 @@ def fillInputFileEdit(self):
def fillOutputFileEdit(self):
lastUsedFilter = Utils.FileFilter.lastUsedVectorFilter()
outputFile, encoding = Utils.FileDialog.getSaveFileName(self, self.tr( "Select where to save the Polygonize output" ), Utils.FileFilter.allVectorsFilter(), lastUsedFilter, True)
if outputFile.isEmpty():
if not outputFile:
return
Utils.FileFilter.setLastUsedVectorFilter(lastUsedFilter)

Expand All @@ -85,7 +85,7 @@ def fillOutputFileEdit(self):
def fillMaskFileEdit(self):
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
maskFile = Utils.FileDialog.getOpenFileName(self, self.tr( "Select the input file for Polygonize" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
if maskFile.isEmpty():
if not maskFile():
return
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

Expand All @@ -96,16 +96,16 @@ def getArguments(self):
arguments.append( self.getInputFileName() )
outputFn = self.getOutputFileName()
maskFn = self.getMaskFileName()
if self.maskCheck.isChecked() and not maskFn.isEmpty():
if self.maskCheck.isChecked() and maskFn:
arguments.append( "-mask" )
arguments.append( maskFn )
if not outputFn.isEmpty():
if outputFn:
arguments.append( "-f" )
arguments.append( self.outputFormat )
arguments.append( outputFn )
if not outputFn.isEmpty():
if outputFn:
arguments.append( QFileInfo( outputFn ).baseName() )
if self.fieldCheck.isChecked() and not self.fieldEdit.text().isEmpty():
if self.fieldCheck.isChecked() and self.fieldEdit.text()):
arguments.append( self.fieldEdit.text() )
return arguments

Expand Down
38 changes: 19 additions & 19 deletions python/plugins/GdalTools/tools/doProximity.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def onLayersChanged(self):
def fillInputFileEdit(self):
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
inputFile = Utils.FileDialog.getOpenFileName(self, self.tr( "Select the input file for Proximity" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
if inputFile.isEmpty():
if not inputFile:
return
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

Expand All @@ -77,38 +77,38 @@ def fillInputFileEdit(self):
def fillOutputFileEdit(self):
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter)
if outputFile.isEmpty():
if not outputFile:
return
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

self.outputFormat = Utils.fillRasterOutputFormat( lastUsedFilter, outputFile )
self.outSelector.setFilename(outputFile)

def getArguments(self):
arguments = QStringList()
arguments << self.getInputFileName()
arguments = []
arguments.append( self.getInputFileName())
outputFn = self.getOutputFileName()
arguments << outputFn
arguments.append( outputFn)
if self.valuesCheck.isChecked():
values = self.valuesEdit.text().trimmed()
if not values.isEmpty():
arguments << "-values"
arguments << values.replace(' ', ',')
if values:
arguments.append( "-values")
arguments.append( values.replace(' ', ','))
if self.distUnitsCheck.isChecked() and self.distUnitsCombo.currentIndex() >= 0:
arguments << "-distunits"
arguments << self.distUnitsCombo.currentText()
arguments.append( "-distunits")
arguments.append( self.distUnitsCombo.currentText())
if self.maxDistCheck.isChecked():
arguments << "-maxdist"
arguments << str(self.maxDistSpin.value())
arguments.append( "-maxdist")
arguments.append( str(self.maxDistSpin.value()))
if self.noDataCheck.isChecked():
arguments << "-nodata"
arguments << str(self.noDataSpin.value())
arguments.append( "-nodata")
arguments.append( str(self.noDataSpin.value()))
if self.fixedBufValCheck.isChecked():
arguments << "-fixed-buf-val"
arguments << str(self.fixedBufValSpin.value())
if not outputFn.isEmpty():
arguments << "-of"
arguments << self.outputFormat
arguments.append( "-fixed-buf-val")
arguments.append( str(self.fixedBufValSpin.value()))
if outputFn:
arguments.append( "-of")
arguments.append( self.outputFormat)
return arguments

def getOutputFileName(self):
Expand Down
24 changes: 12 additions & 12 deletions python/plugins/GdalTools/tools/doRgbPct.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ def onLayersChanged(self):
def fillInputFile(self):
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
inputFile = Utils.FileDialog.getOpenFileName(self, self.tr( "Select the input file for convert" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
if inputFile.isEmpty():
if not inputFile:
return
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)
self.inSelector.setFilename(inputFile)

def fillOutputFileEdit(self):
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
if outputFile.isEmpty():
if not outputFile:
return
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

Expand All @@ -116,30 +116,30 @@ def fillOutputFileEdit(self):

def fillInputDir( self ):
inputDir = Utils.FileDialog.getExistingDirectory( self, self.tr( "Select the input directory with files for convert" ))
if inputDir.isEmpty():
if not inputDir:
return
self.inSelector.setFilename( inputDir )

def fillOutputDir( self ):
outputDir = Utils.FileDialog.getExistingDirectory( self, self.tr( "Select the output directory to save the results to" ))
if outputDir.isEmpty():
if not outputDir:
return
self.outSelector.setFilename( outputDir )

def getArguments(self):
arguments = QStringList()
arguments = []
if self.colorsCheck.isChecked():
arguments << "-n"
arguments << str( self.colorsSpin.value() )
arguments.append( "-n")
arguments.append( str( self.colorsSpin.value() ))
if self.isBatchEnabled():
return arguments

outputFn = self.getOutputFileName()
if not outputFn.isEmpty():
arguments << "-of"
arguments << self.outputFormat
arguments << self.getInputFileName()
arguments << outputFn
if outputFn:
arguments.append( "-of")
arguments.append( self.outputFormat)
arguments.append( self.getInputFileName())
arguments.append( outputFn)
return arguments

def getInputFileName(self):
Expand Down
6 changes: 3 additions & 3 deletions python/plugins/GdalTools/tools/doSettings.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,21 +71,21 @@ def __init__( self, iface ):

def setBinPath( self ):
inputDir = Utils.FileDialog.getExistingDirectory( self, self.tr( "Select directory with GDAL executables" ) )
if inputDir.isEmpty():
if not inputDir:
return

self.leGdalBinPath.setText( inputDir )

def setPymodPath( self ):
inputDir = Utils.FileDialog.getExistingDirectory( self, self.tr( "Select directory with GDAL python modules" ) )
if inputDir.isEmpty():
if not inputDir:
return

self.leGdalPymodPath.setText( inputDir )

def setHelpPath( self ):
inputDir = Utils.FileDialog.getExistingDirectory( self, self.tr( "Select directory with the GDAL documentation" ) )
if inputDir.isEmpty():
if not inputDir:
return

self.leGdalHelpPath.setText( inputDir )
Expand Down
22 changes: 11 additions & 11 deletions python/plugins/GdalTools/tools/doSieve.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def onLayersChanged(self):
def fillInputFileEdit(self):
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
inputFile = Utils.FileDialog.getOpenFileName(self, self.tr( "Select the input file for Sieve" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter)
if inputFile.isEmpty():
if not inputFile:
return
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

Expand All @@ -72,26 +72,26 @@ def fillInputFileEdit(self):
def fillOutputFileEdit(self):
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
if outputFile.isEmpty():
if not outputFile:
return
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

self.outputFormat = Utils.fillRasterOutputFormat( lastUsedFilter, outputFile )
self.outSelector.setFilename(outputFile)

def getArguments(self):
arguments = QStringList()
arguments = []
if self.thresholdCheck.isChecked():
arguments << "-st"
arguments << str(self.thresholdSpin.value())
arguments.append( "-st")
arguments.append( str(self.thresholdSpin.value()))
if self.connectionsCheck.isChecked() and self.connectionsCombo.currentIndex() >= 0:
arguments << "-" + self.connectionsCombo.currentText()
arguments.append( "-" + self.connectionsCombo.currentText())
outputFn = self.getOutputFileName()
if not outputFn.isEmpty():
arguments << "-of"
arguments << self.outputFormat
arguments << self.getInputFileName()
arguments << outputFn
if outputFn:
arguments.append( "-of")
arguments.append( self.outputFormat)
arguments.append( self.getInputFileName())
arguments.append( outputFn)
return arguments

def getOutputFileName(self):
Expand Down
70 changes: 35 additions & 35 deletions python/plugins/GdalTools/tools/doTranslate.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def onLayersChanged(self):
def fillInputFile( self ):
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
inputFile = Utils.FileDialog.getOpenFileName( self, self.tr( "Select the input file for Translate" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
if inputFile.isEmpty():
if not inputFile:
return
Utils.FileFilter.setLastUsedRasterFilter( lastUsedFilter )

Expand All @@ -137,7 +137,7 @@ def fillInputFile( self ):

def fillInputDir( self ):
inputDir = Utils.FileDialog.getExistingDirectory( self, self.tr( "Select the input directory with files to Translate" ))
if inputDir.isEmpty():
if not inputDir:
return
self.inSelector.setFilename( inputDir )

Expand All @@ -151,15 +151,15 @@ def fillInputDir( self ):
for fname in workDir.entryList():
fl = inputDir + "/" + fname
srs = Utils.getRasterSRS( self, fl )
if not srs.isEmpty():
if srs:
break
self.targetSRSEdit.setText( srs )


def fillOutputFileEdit(self):
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
outputFile = Utils.FileDialog.getSaveFileName(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter )
if outputFile.isEmpty():
if not outputFile:
return
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)

Expand All @@ -168,7 +168,7 @@ def fillOutputFileEdit(self):

def fillOutputDir( self ):
outputDir = Utils.FileDialog.getExistingDirectory( self, self.tr( "Select the output directory to save the results to" ) )
if outputDir.isEmpty():
if not outputDir:
return
self.outSelector.setFilename( outputDir )

Expand All @@ -186,65 +186,65 @@ def fillTargetSRSEdit(self):
self.targetSRSEdit.setText(dialog.getProjection())

def getArguments(self):
arguments = QStringList()
if self.targetSRSCheck.isChecked() and not self.targetSRSEdit.text().isEmpty():
arguments << "-a_srs"
arguments << self.targetSRSEdit.text()
arguments = []
if self.targetSRSCheck.isChecked() and self.targetSRSEdit.text():
arguments.append( "-a_srs")
arguments.append( self.targetSRSEdit.text())
if self.creationOptionsGroupBox.isChecked():
for opt in self.creationOptionsWidget.options():
arguments << "-co" << opt
arguments.extend( "-co", opt)
if self.outsizeCheck.isChecked() and self.outsizeSpin.value() != 100:
arguments << "-outsize"
arguments << self.outsizeSpin.text()
arguments << self.outsizeSpin.text()
arguments.append( "-outsize")
arguments.append( self.outsizeSpin.text())
arguments.append( self.outsizeSpin.text())
if self.expandCheck.isChecked():
arguments << "-expand"
arguments << self.expand_method[self.expandCombo.currentIndex()]
arguments.append( "-expand")
arguments.append( self.expand_method[self.expandCombo.currentIndex()])
if self.nodataCheck.isChecked():
arguments << "-a_nodata"
arguments << str(self.nodataSpin.value())
arguments.append( "-a_nodata")
arguments.append( str(self.nodataSpin.value()))
if self.sdsCheck.isChecked():
arguments << "-sds"
if self.srcwinCheck.isChecked() and not self.srcwinEdit.text().isEmpty():
arguments.append( "-sds")
if self.srcwinCheck.isChecked() and self.srcwinEdit.text():
coordList = self.srcwinEdit.text().split( ' ', QString.SkipEmptyParts )
if len(coordList) == 4 and not coordList[3].isEmpty():
if len(coordList) == 4 and coordList[3]:
try:
for x in coordList:
test = int(x)
except ValueError:
#print "Coordinates must be integer numbers."
QMessageBox.critical(self, self.tr("Translate - srcwin"), self.tr("Image coordinates (pixels) must be integer numbers."))
else:
arguments << "-srcwin"
arguments.append( "-srcwin")
for x in coordList:
arguments << x
if self.prjwinCheck.isChecked() and not self.prjwinEdit.text().isEmpty():
arguments.append( x)
if self.prjwinCheck.isChecked() and self.prjwinEdit.text():
coordList = self.prjwinEdit.text().split( ' ', QString.SkipEmptyParts )
if len(coordList) == 4 and not coordList[3].isEmpty():
if len(coordList) == 4 and coordList[3]:
try:
for x in coordList:
test = float(x)
except ValueError:
#print "Coordinates must be integer numbers."
QMessageBox.critical(self, self.tr("Translate - prjwin"), self.tr("Image coordinates (geographic) must be numbers."))
else:
arguments << "-projwin"
arguments.append( "-projwin")
for x in coordList:
arguments << x
arguments.append( x)
if self.isBatchEnabled():
if self.formatCombo.currentIndex() != 0:
arguments << "-of"
arguments << Utils.fillRasterOutputFormat( self.formatCombo.currentText() )
arguments.append( "-of")
arguments.append( Utils.fillRasterOutputFormat( self.formatCombo.currentText() ))
return arguments
else:
return arguments

outputFn = self.getOutputFileName()
if not outputFn.isEmpty():
arguments << "-of"
arguments << self.outputFormat
arguments << self.getInputFileName()
arguments << outputFn
if outputFn:
arguments.append( "-of")
arguments.append( self.outputFormat)
arguments.append( self.getInputFileName())
arguments.append( outputFn)

# set creation options filename/layer for validation
if self.inSelector.layer():
Expand Down Expand Up @@ -277,7 +277,7 @@ def updateProgress(self, index, total):

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

self.errors = QStringList()
self.errors = []
self.batchIndex = 0
self.batchTotal = len( self.inFiles )
self.setProgressRange( self.batchTotal )
Expand Down
8 changes: 4 additions & 4 deletions python/plugins/GdalTools/tools/optionsTable.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,16 @@ def deleteRow(self):
self.emit(SIGNAL("rowRemoved()"))

def options(self):
options = QStringList()
options = []
for row in range(0, self.table.rowCount()):
name = self.table.item(row, 0)
if name == None or name.text().isEmpty():
if not name:
continue

value = self.table.item(row, 1)
if value == None or value.text().isEmpty():
if not value:
continue

options << name.text() + "=" + value.text()
options.append( name.text() + "=" + value.text())
return options