Skip to content

Commit f6ae6c4

Browse files
committed
[Gdaltools] SIP API update (Fix #8074)
1 parent b96f67b commit f6ae6c4

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

python/plugins/GdalTools/tools/dialogBase.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ def onHelp(self):
146146

147147
# called when a value in the plugin widget interface changed
148148
def refreshArgs(self, args):
149-
self.arguments = args
149+
self.arguments = [unicode(a) for a in args]
150150

151151
if not self.commandIsEnabled():
152152
self.textEditCommand.setPlainText(self.command)

python/plugins/GdalTools/tools/doPolygonize.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -92,21 +92,21 @@ def fillMaskFileEdit(self):
9292
self.maskSelector.setFilename(maskFile)
9393

9494
def getArguments(self):
95-
arguments = QStringList()
96-
arguments << self.getInputFileName()
95+
arguments = []
96+
arguments.append( self.getInputFileName() )
9797
outputFn = self.getOutputFileName()
9898
maskFn = self.getMaskFileName()
9999
if self.maskCheck.isChecked() and not maskFn.isEmpty():
100-
arguments << "-mask"
101-
arguments << maskFn
100+
arguments.append( "-mask" )
101+
arguments.append( maskFn )
102102
if not outputFn.isEmpty():
103-
arguments << "-f"
104-
arguments << self.outputFormat
105-
arguments << outputFn
103+
arguments.append( "-f" )
104+
arguments.append( self.outputFormat )
105+
arguments.append( outputFn )
106106
if not outputFn.isEmpty():
107-
arguments << QFileInfo( outputFn ).baseName()
107+
arguments.append( QFileInfo( outputFn ).baseName() )
108108
if self.fieldCheck.isChecked() and not self.fieldEdit.text().isEmpty():
109-
arguments << self.fieldEdit.text()
109+
arguments.append( self.fieldEdit.text() )
110110
return arguments
111111

112112
def getOutputFileName(self):

python/plugins/GdalTools/tools/doRasterize.py

+17-17
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def fillFieldsCombo(self):
8080
def fillInputFileEdit(self):
8181
lastUsedFilter = Utils.FileFilter.lastUsedVectorFilter()
8282
inputFile, encoding = Utils.FileDialog.getOpenFileName(self, self.tr( "Select the input file for Rasterize" ), Utils.FileFilter.allVectorsFilter(), lastUsedFilter, True)
83-
if inputFile.isEmpty():
83+
if not inputFile:
8484
return
8585
Utils.FileFilter.setLastUsedVectorFilter(lastUsedFilter)
8686

@@ -100,7 +100,7 @@ def fillOutputFileEdit(self):
100100
fileDialogFunc = Utils.FileDialog.getOpenFileName
101101

102102
outputFile = fileDialogFunc(self, self.tr( "Select the raster file to save the results to" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter)
103-
if outputFile.isEmpty():
103+
if not outputFile:
104104
return
105105
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)
106106

@@ -113,24 +113,24 @@ def fillOutputFileEdit(self):
113113
self.radioSetSize.setChecked(True)
114114

115115
def getArguments(self):
116-
arguments = QStringList()
116+
arguments = []
117117
if self.attributeComboBox.currentIndex() >= 0:
118-
arguments << "-a"
119-
arguments << self.attributeComboBox.currentText()
118+
arguments.append( "-a" )
119+
arguments.append( self.attributeComboBox.currentText() )
120120
if self.radioSetSize.isChecked():
121-
arguments << "-ts"
122-
arguments << str( self.widthSpin.value() )
123-
arguments << str( self.heightSpin.value() )
121+
arguments.append( "-ts" )
122+
arguments.append( self.widthSpin.value() )
123+
arguments.append( self.heightSpin.value() )
124124
if self.radioSetResolution.isChecked():
125-
arguments << "-tr"
126-
arguments << str( self.horizresSpin.value() )
127-
arguments << str( self.vertresSpin.value() )
125+
arguments.append( "-tr" )
126+
arguments.append( self.horizresSpin.value() )
127+
arguments.append( self.vertresSpin.value() )
128128
inputFn = self.getInputFileName()
129-
if not inputFn.isEmpty():
130-
arguments << "-l"
131-
arguments << QFileInfo( inputFn ).baseName()
132-
arguments << inputFn
133-
arguments << self.getOutputFileName()
129+
if inputFn:
130+
arguments.append( "-l" )
131+
arguments.append( QFileInfo( inputFn ).baseName() )
132+
arguments.append( inputFn )
133+
arguments.append( self.getOutputFileName() )
134134
return arguments
135135

136136
def getInputFileName(self):
@@ -145,7 +145,7 @@ def addLayerIntoCanvas(self, fileInfo):
145145
def loadFields(self, vectorFile):
146146
self.attributeComboBox.clear()
147147

148-
if vectorFile.isEmpty():
148+
if not vectorFile:
149149
return
150150

151151
try:

0 commit comments

Comments
 (0)