From 4386860998f981645707c067e9751bc4c58a025b Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 17 Jun 2013 15:27:54 +0200 Subject: [PATCH] [gdaltools] More SIP API update --- .../GdalTools/tools/GdalTools_utils.py | 6 +- python/plugins/GdalTools/tools/doClipper.py | 2 +- python/plugins/GdalTools/tools/doDEM.py | 50 ++++++------- .../plugins/GdalTools/tools/doFillNodata.py | 50 ++++++------- python/plugins/GdalTools/tools/doGrid.py | 52 +++++++------- python/plugins/GdalTools/tools/doNearBlack.py | 18 ++--- python/plugins/GdalTools/tools/doPctRgb.py | 24 +++---- .../plugins/GdalTools/tools/doPolygonize.py | 14 ++-- python/plugins/GdalTools/tools/doProximity.py | 38 +++++----- python/plugins/GdalTools/tools/doRgbPct.py | 24 +++---- python/plugins/GdalTools/tools/doSettings.py | 6 +- python/plugins/GdalTools/tools/doSieve.py | 22 +++--- python/plugins/GdalTools/tools/doTranslate.py | 70 +++++++++---------- .../plugins/GdalTools/tools/optionsTable.py | 8 +-- 14 files changed, 192 insertions(+), 192 deletions(-) diff --git a/python/plugins/GdalTools/tools/GdalTools_utils.py b/python/plugins/GdalTools/tools/GdalTools_utils.py index de2aae93d3d..1b6d6cce87d 100644 --- a/python/plugins/GdalTools/tools/GdalTools_utils.py +++ b/python/plugins/GdalTools/tools/GdalTools_utils.py @@ -293,7 +293,7 @@ def getRasterSRS( parent, fileName ): if processSRS.waitForFinished(): arr = processSRS.readAllStandardOutput() processSRS.close() - + arr = str(arr) if arr == '': return '' @@ -545,7 +545,7 @@ class GdalConfig: # XXX add check for SDTS; in that case we want (*CATD.DDF) #TODO fix and test - #glob << QString("*." + extensions.replace("/", " *.")).split(" ") + #glob.append( QString("*." + extensions.replace("/", " *.")).split(" ")) glob.append(string.split("*." + string.replace(extensions,"/", " *."), sep=(" "))) # Add only the first JP2 driver found to the filter list (it's the one GDAL uses) @@ -837,7 +837,7 @@ def setProcessEnvironment(process): if env.contains( QRegExp( "^%s=(.*)" % name, Qt.CaseInsensitive ) ): env.replaceInStrings( QRegExp( "^%s=(.*)" % name, Qt.CaseInsensitive ), "%s=\\1%s%s" % (name, sep, gdalPath) ) else: - env << "%s=%s" % (name, val) + env.append( "%s=%s" % (name, val)) process.setEnvironment( env ) diff --git a/python/plugins/GdalTools/tools/doClipper.py b/python/plugins/GdalTools/tools/doClipper.py index 697c8d26111..4c1d576b913 100644 --- a/python/plugins/GdalTools/tools/doClipper.py +++ b/python/plugins/GdalTools/tools/doClipper.py @@ -140,7 +140,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): arguments = [] if self.noDataCheck.isChecked(): arguments.append("-a_nodata") - arguments << str(self.noDataSpin.value()) + arguments.append( str(self.noDataSpin.value())) if self.extentModeRadio.isChecked() and self.extentSelector.isCoordsValid(): rect = self.extentSelector.getExtent() if rect != None: diff --git a/python/plugins/GdalTools/tools/doDEM.py b/python/plugins/GdalTools/tools/doDEM.py index 88995bbf7ad..271401171d5 100644 --- a/python/plugins/GdalTools/tools/doDEM.py +++ b/python/plugins/GdalTools/tools/doDEM.py @@ -99,7 +99,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): def fillInputFileEdit(self): lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter() inputFile = Utils.FileDialog.getOpenFileName(self, self.tr( "Select the file for DEM" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter) - if inputFile.isEmpty(): + if not inputFile: return Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter) @@ -109,7 +109,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): 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) @@ -119,52 +119,52 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): def fillColorConfigFileEdit(self): configFile = Utils.FileDialog.getOpenFileName(self, self.tr( "Select the color configuration file" )) - if configFile.isEmpty(): + if not configFile: return self.configSelector.setFilename(configFile) def getArguments(self): mode = self.modes[ self.modeCombo.currentIndex() ] - arguments = QStringList() - arguments << mode - arguments << self.getInputFileName() + arguments = [] + arguments.append( mode) + arguments.append( self.getInputFileName()) if mode == "color-relief": - arguments << self.configSelector.filename() + arguments.append( self.configSelector.filename()) outputFn = self.getOutputFileName() - arguments << outputFn + arguments.append( outputFn) if mode == "hillshade": - arguments << "-z" << str(self.hillshadeZFactorSpin.value()) - arguments << "-s" << str(self.hillshadeScaleSpin.value()) - arguments << "-az" << str(self.hillshadeAzimuthSpin.value()) - arguments << "-alt" << str(self.hillshadeAltitudeSpin.value()) + arguments.extend( "-z", self.hillshadeZFactorSpin.value()) + arguments.extend( "-s" , self.hillshadeScaleSpin.value()) + arguments.extend( "-az" , self.hillshadeAzimuthSpin.value()) + arguments.extend( "-alt" , self.hillshadeAltitudeSpin.value()) elif mode == "slope": if self.slopePercentCheck.isChecked(): - arguments << "-p" - arguments << "-s" << str(self.slopeScaleSpin.value()) + arguments.append( "-p") + arguments.extend( "-s" , self.slopeScaleSpin.value()) elif mode == "aspect": if self.aspectTrigonometricCheck.isChecked(): - arguments << "-trigonometric" + arguments.append( "-trigonometric") if self.aspectZeroForFlatCheck.isChecked(): - arguments << "-zero_for_flat" + arguments.append( "-zero_for_flat") elif mode == "color-relief": if self.colorAlphaCheck.isChecked(): - arguments << "-alpha" + arguments.append( "-alpha") if self.colorMatchGroupBox.isChecked(): if self.colorExactRadio.isChecked(): - arguments << "-exact_color_entry" + arguments.append( "-exact_color_entry") elif self.colorNearestRadio.isChecked(): - arguments << "-nearest_color_entry" + arguments.append( "-nearest_color_entry") if self.algorithmCheck.isChecked(): - arguments << "-alg" << "ZevenbergenThorne" + arguments.extend( "-alg", "ZevenbergenThorne") if self.computeEdgesCheck.isChecked(): - arguments << "-compute_edges" + arguments.append( "-compute_edges") if self.bandCheck.isChecked(): - arguments << "-b" << str(self.bandSpin.value()) - if not outputFn.isEmpty(): - arguments << "-of" << self.outputFormat + arguments.extend( "-b" , self.bandSpin.value()) + if outputFn: + arguments.extend( "-of", self.outputFormat) if self.creationOptionsGroupBox.isChecked(): for opt in self.creationOptionsWidget.options(): - arguments << "-co" << opt + arguments.extend( "-co", opt) # set creation options filename/layer for validation if self.inSelector.layer(): self.creationOptionsWidget.setRasterLayer(self.inSelector.layer()) diff --git a/python/plugins/GdalTools/tools/doFillNodata.py b/python/plugins/GdalTools/tools/doFillNodata.py index 002f6fb2d5f..06d5781f76f 100644 --- a/python/plugins/GdalTools/tools/doFillNodata.py +++ b/python/plugins/GdalTools/tools/doFillNodata.py @@ -111,7 +111,7 @@ class GdalToolsDialog( QWidget, Ui_Widget, BaseBatchWidget ): self.tr( "Select the files to analyse" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter ) - if inputFile.isEmpty(): + if not inputFile: return Utils.FileFilter.setLastUsedRasterFilter( lastUsedFilter ) self.inSelector.setFilename( inputFile ) @@ -119,7 +119,7 @@ class GdalToolsDialog( QWidget, Ui_Widget, BaseBatchWidget ): def fillOutputFile( 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 ) @@ -132,52 +132,52 @@ class GdalToolsDialog( QWidget, Ui_Widget, BaseBatchWidget ): self.tr( "Select the files to analyse" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter ) - if inputFile.isEmpty(): + if not inputFile: return Utils.FileFilter.setLastUsedRasterFilter( lastUsedFilter ) self.maskSelector.setFilename( inputFile ) def fillInputDir( self ): inputDir = Utils.FileDialog.getExistingDirectory( self, self.tr( "Select the input directory with files" )) - 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 = [] maskFile = self.maskSelector.filename() if self.distanceCheck.isChecked() and self.distanceSpin.value() != 0: - arguments << "-md" - arguments << self.distanceSpin.text() + arguments.append( "-md") + arguments.append( self.distanceSpin.text()) if self.smoothCheck.isChecked() and self.smoothSpin.value() != 0: - arguments << "-si" - arguments << str( self.smoothSpin.value() ) + arguments.append( "-si") + arguments.append( str( self.smoothSpin.value() )) if self.bandCheck.isChecked() and self.bandSpin.value() != 0: - arguments << "-b" - arguments << str( self.bandSpin.value() ) - if self.maskCheck.isChecked() and not maskFile.isEmpty(): - arguments << "-mask" - arguments << maskFile + arguments.append( "-b") + arguments.append( str( self.bandSpin.value() )) + if self.maskCheck.isChecked() and maskFile: + arguments.append( "-mask") + arguments.append( maskFile) if self.nomaskCheck.isChecked(): - arguments << "-nomask" + arguments.append( "-nomask") 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: 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 onLayersChanged( self ): @@ -206,7 +206,7 @@ class GdalToolsDialog( QWidget, Ui_Widget, BaseBatchWidget ): 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" @@ -232,7 +232,7 @@ class GdalToolsDialog( QWidget, Ui_Widget, BaseBatchWidget ): outFile = re.sub( f, "\.[a-zA-Z0-9]{2,4}", outExt ) self.outFiles.append( outDir + "/" + outFile ) - self.errors = QStringList() + self.errors = [] self.batchIndex = 0 self.batchTotal = len( self.inFiles ) self.setProgressRange( self.batchTotal ) diff --git a/python/plugins/GdalTools/tools/doGrid.py b/python/plugins/GdalTools/tools/doGrid.py index 60501c53a78..accb680ec1e 100644 --- a/python/plugins/GdalTools/tools/doGrid.py +++ b/python/plugins/GdalTools/tools/doGrid.py @@ -102,7 +102,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): def fillInputFileEdit(self): lastUsedFilter = Utils.FileFilter.lastUsedVectorFilter() inputFile, encoding = Utils.FileDialog.getOpenFileName(self, self.tr( "Select the input file for Grid" ), Utils.FileFilter.allVectorsFilter(), lastUsedFilter, True) - if inputFile.isEmpty(): + if not inputFile: return Utils.FileFilter.setLastUsedVectorFilter(lastUsedFilter) @@ -114,7 +114,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): 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) @@ -122,36 +122,36 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): self.outSelector.setFilename(outputFile) def getArguments(self): - arguments = QStringList() + arguments = [] if self.zfieldCheck.isChecked() and self.zfieldCombo.currentIndex() >= 0: - arguments << "-zfield" - arguments << self.zfieldCombo.currentText() + arguments.append( "-zfield") + arguments.append( self.zfieldCombo.currentText()) inputFn = self.getInputFileName() - if not inputFn.isEmpty(): - arguments << "-l" - arguments << QFileInfo( inputFn ).baseName() + if inputFn: + arguments.append( "-l") + arguments.append( QFileInfo( inputFn ).baseName()) if self.extentGroup.isChecked(): rect = self.extentSelector.getExtent() if rect != None: - arguments << "-txe" - arguments << str(rect.xMinimum()) - arguments << str(rect.xMaximum()) - arguments << "-tye" - arguments << str(rect.yMaximum()) - arguments << str(rect.yMinimum()) + arguments.append( "-txe") + arguments.append( str(rect.xMinimum())) + arguments.append( str(rect.xMaximum())) + arguments.append( "-tye") + arguments.append( str(rect.yMaximum())) + arguments.append( str(rect.yMinimum())) if self.algorithmCheck.isChecked() and self.algorithmCombo.currentIndex() >= 0: - arguments << "-a" - arguments << self.algorithmArguments(self.algorithmCombo.currentIndex()) + arguments.append( "-a") + arguments.append( self.algorithmArguments(self.algorithmCombo.currentIndex())) if self.resizeGroupBox.isChecked(): - arguments << "-outsize" - arguments << str( self.widthSpin.value() ) - arguments << str( self.heightSpin.value() ) + arguments.append( "-outsize") + arguments.append( str( self.widthSpin.value() )) + arguments.append( str( self.heightSpin.value() )) outputFn = self.getOutputFileName() - if not outputFn.isEmpty(): - arguments << "-of" - arguments << self.outputFormat - arguments << inputFn - arguments << outputFn + if outputFn: + arguments.append( "-of") + arguments.append( self.outputFormat) + arguments.append( inputFn) + arguments.append( outputFn) return arguments def getInputFileName(self): @@ -165,7 +165,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): def algorithmArguments(self, index): algorithm = self.algorithm[index] - arguments = QStringList() + arguments = [] if algorithm == "invdist": arguments.append(algorithm) arguments.append("power=" + str(self.invdistPowerSpin.value())) @@ -201,7 +201,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): def loadFields(self, vectorFile = ''): self.zfieldCombo.clear() - if vectorFile.isEmpty(): + if not vectorFile: return try: diff --git a/python/plugins/GdalTools/tools/doNearBlack.py b/python/plugins/GdalTools/tools/doNearBlack.py index 69ff0284adc..d23f41ce478 100644 --- a/python/plugins/GdalTools/tools/doNearBlack.py +++ b/python/plugins/GdalTools/tools/doNearBlack.py @@ -65,7 +65,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): def fillInputFileEdit(self): lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter() inputFile = Utils.FileDialog.getOpenFileName(self, self.tr( "Select the input file for Near Black" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter ) - if inputFile.isEmpty(): + if not inputFile: return Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter) @@ -74,22 +74,22 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): 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.outSelector.setFilename(outputFile) def getArguments(self): - arguments = QStringList() + arguments = [] if self.whiteCheckBox.isChecked(): - arguments << "-white" + arguments.append( "-white") if self.nearCheck.isChecked(): - arguments << "-near" - arguments << str(self.nearSpin.value()) - arguments << "-o" - arguments << self.getOutputFileName() - arguments << self.getInputFileName() + arguments.append( "-near") + arguments.append( str(self.nearSpin.value())) + arguments.append( "-o") + arguments.append( self.getOutputFileName()) + arguments.append( self.getInputFileName()) return arguments def getOutputFileName(self): diff --git a/python/plugins/GdalTools/tools/doPctRgb.py b/python/plugins/GdalTools/tools/doPctRgb.py index 2da91bbf635..c5bd7cd7b64 100644 --- a/python/plugins/GdalTools/tools/doPctRgb.py +++ b/python/plugins/GdalTools/tools/doPctRgb.py @@ -102,7 +102,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BaseBatchWidget): 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) @@ -110,7 +110,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BaseBatchWidget): 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) @@ -119,30 +119,30 @@ class GdalToolsDialog(QWidget, Ui_Widget, BaseBatchWidget): 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): diff --git a/python/plugins/GdalTools/tools/doPolygonize.py b/python/plugins/GdalTools/tools/doPolygonize.py index 34941a66310..e4ce3307105 100644 --- a/python/plugins/GdalTools/tools/doPolygonize.py +++ b/python/plugins/GdalTools/tools/doPolygonize.py @@ -65,7 +65,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): 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) @@ -74,7 +74,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): 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) @@ -85,7 +85,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): 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) @@ -96,16 +96,16 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): 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 diff --git a/python/plugins/GdalTools/tools/doProximity.py b/python/plugins/GdalTools/tools/doProximity.py index c72ab506991..8ace2eed26d 100644 --- a/python/plugins/GdalTools/tools/doProximity.py +++ b/python/plugins/GdalTools/tools/doProximity.py @@ -68,7 +68,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): 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) @@ -77,7 +77,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): 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) @@ -85,30 +85,30 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): 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): diff --git a/python/plugins/GdalTools/tools/doRgbPct.py b/python/plugins/GdalTools/tools/doRgbPct.py index ff442864b0a..c415f1531ad 100644 --- a/python/plugins/GdalTools/tools/doRgbPct.py +++ b/python/plugins/GdalTools/tools/doRgbPct.py @@ -99,7 +99,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BaseBatchWidget): 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) @@ -107,7 +107,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BaseBatchWidget): 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) @@ -116,30 +116,30 @@ class GdalToolsDialog(QWidget, Ui_Widget, BaseBatchWidget): 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): diff --git a/python/plugins/GdalTools/tools/doSettings.py b/python/plugins/GdalTools/tools/doSettings.py index 5e2ebca2422..3dfad9665f0 100644 --- a/python/plugins/GdalTools/tools/doSettings.py +++ b/python/plugins/GdalTools/tools/doSettings.py @@ -71,21 +71,21 @@ when pressing on the tool dialog's Help button.""") ) 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 ) diff --git a/python/plugins/GdalTools/tools/doSieve.py b/python/plugins/GdalTools/tools/doSieve.py index 452fe5339ea..9cf618e391d 100644 --- a/python/plugins/GdalTools/tools/doSieve.py +++ b/python/plugins/GdalTools/tools/doSieve.py @@ -63,7 +63,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): 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) @@ -72,7 +72,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): 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) @@ -80,18 +80,18 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget): 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): diff --git a/python/plugins/GdalTools/tools/doTranslate.py b/python/plugins/GdalTools/tools/doTranslate.py index e2b1aadb2bf..c6ef7738092 100644 --- a/python/plugins/GdalTools/tools/doTranslate.py +++ b/python/plugins/GdalTools/tools/doTranslate.py @@ -126,7 +126,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BaseBatchWidget): 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 ) @@ -137,7 +137,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BaseBatchWidget): 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 ) @@ -151,7 +151,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BaseBatchWidget): for fname in workDir.entryList(): fl = inputDir + "/" + fname srs = Utils.getRasterSRS( self, fl ) - if not srs.isEmpty(): + if srs: break self.targetSRSEdit.setText( srs ) @@ -159,7 +159,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BaseBatchWidget): 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) @@ -168,7 +168,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BaseBatchWidget): 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 ) @@ -186,28 +186,28 @@ class GdalToolsDialog(QWidget, Ui_Widget, BaseBatchWidget): 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) @@ -215,12 +215,12 @@ class GdalToolsDialog(QWidget, Ui_Widget, BaseBatchWidget): #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) @@ -228,23 +228,23 @@ class GdalToolsDialog(QWidget, Ui_Widget, BaseBatchWidget): #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(): @@ -277,7 +277,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BaseBatchWidget): 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" @@ -303,7 +303,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BaseBatchWidget): 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 ) diff --git a/python/plugins/GdalTools/tools/optionsTable.py b/python/plugins/GdalTools/tools/optionsTable.py index 424927dcc61..d4fb078d934 100644 --- a/python/plugins/GdalTools/tools/optionsTable.py +++ b/python/plugins/GdalTools/tools/optionsTable.py @@ -64,16 +64,16 @@ class GdalToolsOptionsTable(QWidget, Ui_OptionsTable): 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