sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-04 00:06:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

[processing][gdal] Fix parsing of creation options

Browse Source 
Creation options must be specified one at a time - the
current approach causes them to be specified once embedded
in quotation marks, which is not valid input for gdal
This commit is contained in:
Nyall Dawson 2018-03-21 15:02:39 +10:00
parent 51ce2fb79e
commit 00bb177f3d
22 changed files with 29 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/plugins/processing/algs/gdal/ClipRasterByExtent.py
View File

@ -132,8 +132,7 @@ class ClipRasterByExtent(GdalAlgorithm):
arguments.append(QgsRasterFileWriter.driverForExtension(os.path.splitext(out)[1]))
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
arguments.append(inLayer.source())
arguments.append(out)

3
python/plugins/processing/algs/gdal/ClipRasterByMask.py
View File

@ -154,8 +154,7 @@ class ClipRasterByMask(GdalAlgorithm):
arguments.append('-dstnodata {}'.format(nodata))
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
arguments.append(inLayer.source())
arguments.append(out)

8
python/plugins/processing/algs/gdal/GdalUtils.py
View File

@ -389,3 +389,11 @@ class GdalUtils:
name = ly.GetName()
ds = None
return name
@staticmethod
def parseCreationOptions(value):
parts = value.split('|')
options = []
for p in parts:
options.extend(['-co', p])
return options

3
python/plugins/processing/algs/gdal/GridAverage.py
View File

@ -167,8 +167,7 @@ class GridAverage(GdalAlgorithm):
options = self.parameterAsString(parameters, self.OPTIONS, context)
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
arguments.append(ogrLayer)
arguments.append(out)

3
python/plugins/processing/algs/gdal/GridDataMetrics.py
View File

@ -181,8 +181,7 @@ class GridDataMetrics(GdalAlgorithm):
options = self.parameterAsString(parameters, self.OPTIONS, context)
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
arguments.append(ogrLayer)
arguments.append(out)

3
python/plugins/processing/algs/gdal/GridInverseDistance.py
View File

@ -190,8 +190,7 @@ class GridInverseDistance(GdalAlgorithm):
options = self.parameterAsString(parameters, self.OPTIONS, context)
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
arguments.append(ogrLayer)
arguments.append(out)

3
python/plugins/processing/algs/gdal/GridInverseDistanceNearestNeighbor.py
View File

@ -175,8 +175,7 @@ class GridInverseDistanceNearestNeighbor(GdalAlgorithm):
options = self.parameterAsString(parameters, self.OPTIONS, context)
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
arguments.append(ogrLayer)
arguments.append(out)

3
python/plugins/processing/algs/gdal/GridLinear.py
View File

@ -146,8 +146,7 @@ class GridLinear(GdalAlgorithm):
options = self.parameterAsString(parameters, self.OPTIONS, context)
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
arguments.append(ogrLayer)
arguments.append(out)

3
python/plugins/processing/algs/gdal/GridNearestNeighbor.py
View File

@ -161,8 +161,7 @@ class GridNearestNeighbor(GdalAlgorithm):
options = self.parameterAsString(parameters, self.OPTIONS, context)
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
arguments.append(ogrLayer)
arguments.append(out)

3
python/plugins/processing/algs/gdal/aspect.py
View File

@ -125,7 +125,6 @@ class aspect(GdalAlgorithm):
options = self.parameterAsString(parameters, self.OPTIONS, context)
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
return ['gdaldem', GdalUtils.escapeAndJoin(arguments)]

3
python/plugins/processing/algs/gdal/hillshade.py
View File

@ -160,7 +160,6 @@ class hillshade(GdalAlgorithm):
options = self.parameterAsString(parameters, self.OPTIONS, context)
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
return ['gdaldem', GdalUtils.escapeAndJoin(arguments)]

3
python/plugins/processing/algs/gdal/merge.py
View File

@ -123,8 +123,7 @@ class merge(GdalAlgorithm):
options = self.parameterAsString(parameters, self.OPTIONS, context)
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
arguments.append('-o')
arguments.append(out)

3
python/plugins/processing/algs/gdal/nearblack.py
View File

@ -112,7 +112,6 @@ class nearblack(GdalAlgorithm):
options = self.parameterAsString(parameters, self.OPTIONS, context)
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
return ['nearblack', GdalUtils.escapeAndJoin(arguments)]

3
python/plugins/processing/algs/gdal/proximity.py
View File

@ -170,8 +170,7 @@ class proximity(GdalAlgorithm):
arguments.append(QgsRasterFileWriter.driverForExtension(os.path.splitext(out)[1]))
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
arguments.append(inLayer.source())
arguments.append(out)

3
python/plugins/processing/algs/gdal/rasterize.py
View File

@ -214,8 +214,7 @@ class rasterize(GdalAlgorithm):
options = self.parameterAsString(parameters, self.OPTIONS, context)
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
arguments.append(ogrLayer)
arguments.append(out)

3
python/plugins/processing/algs/gdal/retile.py
View File

@ -187,8 +187,7 @@ class retile(GdalAlgorithm):
options = self.parameterAsString(parameters, self.OPTIONS, context)
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
if self.parameterAsBool(parameters, self.DIR_FOR_ROW, context):
arguments.append('-pyramidOnly')

3
python/plugins/processing/algs/gdal/slope.py
View File

@ -129,7 +129,6 @@ class slope(GdalAlgorithm):
options = self.parameterAsString(parameters, self.OPTIONS, context)
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
return ['gdaldem', GdalUtils.escapeAndJoin(arguments)]

3
python/plugins/processing/algs/gdal/tpi.py
View File

@ -99,7 +99,6 @@ class tpi(GdalAlgorithm):
options = self.parameterAsString(parameters, self.OPTIONS, context)
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
return ['gdaldem', GdalUtils.escapeAndJoin(arguments)]

3
python/plugins/processing/algs/gdal/translate.py
View File

@ -137,8 +137,7 @@ class translate(GdalAlgorithm):
options = self.parameterAsString(parameters, self.OPTIONS, context)
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
arguments.append(inLayer.source())
arguments.append(out)

3
python/plugins/processing/algs/gdal/tri.py
View File

@ -98,7 +98,6 @@ class tri(GdalAlgorithm):
options = self.parameterAsString(parameters, self.OPTIONS, context)
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
return ['gdaldem', GdalUtils.escapeAndJoin(arguments)]

2
python/plugins/processing/algs/gdal/ui/RasterOptionsWidget.py
View File

@ -70,4 +70,4 @@ class RasterOptionsWidgetWrapper(WidgetWrapper):
elif self.dialogType == DIALOG_BATCH:
return self.widget.text()
else:
return ' '.join(self.widget.options())
return '|'.join(self.widget.options())

3
python/plugins/processing/algs/gdal/warp.py
View File

@ -212,8 +212,7 @@ class warp(GdalAlgorithm):
options = self.parameterAsString(parameters, self.OPTIONS, context)
if options:
arguments.append('-co')
arguments.append(options)
arguments.extend(GdalUtils.parseCreationOptions(options))
arguments.append(inLayer.source())
arguments.append(out)