sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix GdalTools contour

Browse Source
This commit is contained in:
Etienne Tourigny 2013-06-14 16:02:44 -03:00
parent 684aa98e96
commit 07ea0aa107
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
python/plugins/GdalTools/tools/doContour.py
View File

@ -69,7 +69,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 Contour" ), Utils.FileFilter.allRastersFilter(), lastUsedFilter)
if inputFile.isEmpty():
if not inputFile:
return
Utils.FileFilter.setLastUsedRasterFilter(lastUsedFilter)
@ -82,7 +82,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget):
else:
outputFile, encoding = Utils.FileDialog.getExistingDirectory(self, self.tr( "Select where to save the Contour output" ), True)
if outputFile.isEmpty():
if not outputFile:
return
if not self.useDirAsOutput:
@ -92,15 +92,15 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget):
self.lastEncoding = encoding
def getArguments(self):
arguments = QStringList()
if self.attributeCheck.isChecked() and not self.attributeEdit.text().isEmpty():
arguments << "-a"
arguments << self.attributeEdit.text()
arguments = []
if self.attributeCheck.isChecked() and self.attributeEdit.text():
arguments.append("-a")
arguments.append(self.attributeEdit.text())
if True: # XXX in this moment the -i argument is not optional
arguments << "-i"
arguments << unicode(self.intervalDSpinBox.value())
arguments << self.getInputFileName()
arguments << self.outSelector.filename()
arguments.append("-i")
arguments.append(str(self.intervalDSpinBox.value()))
arguments.append(self.getInputFileName())
arguments.append(self.outSelector.filename())
return arguments
def getInputFileName(self):
@ -109,7 +109,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget):
def getOutputFileName(self):
if self.useDirAsOutput:
fn = self.outSelector.filename()
return fn if fn.isEmpty() else fn + QDir.separator() + "contour.shp"
return fn if not fn else fn + QDir.separator() + "contour.shp"
return self.outSelector.filename()
def addLayerIntoCanvas(self, fileInfo):