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

[GDALTools] pass output format to gdal_contour (fix #6695)

Browse Source
This commit is contained in:
Alexander Bruy 2016-06-21 21:11:04 +03:00
parent 7eacd444d0
commit 803cbada13
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,6 +47,8 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget):
self.outSelector.setType(self.outSelector.FILE)
self.outputFormat = Utils.fillVectorOutputFormat()
# set the default QSpinBoxes value
self.intervalDSpinBox.setValue(10.0)
@ -85,6 +87,7 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget):
if not self.useDirAsOutput:
Utils.FileFilter.setLastUsedVectorFilter(lastUsedFilter)
self.outputFormat = Utils.fillVectorOutputFormat(lastUsedFilter, outputFile)
self.outSelector.setFilename(outputFile)
self.lastEncoding = encoding
@ -96,8 +99,15 @@ class GdalToolsDialog(QWidget, Ui_Widget, BasePluginWidget):
if True: # XXX in this moment the -i argument is not optional
arguments.append("-i")
arguments.append(unicode(self.intervalDSpinBox.value()))
outputFn = self.getOutputFileName()
if outputFn:
arguments.append("-f")
arguments.append(self.outputFormat)
arguments.append(self.getInputFileName())
arguments.append(self.outSelector.filename())
return arguments
def getInputFileName(self):