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

fix gdal_rasterize: remove duplicate options

Browse Source
This commit is contained in:
Giovanni Manghi 2015-04-10 18:03:55 +01:00
parent fa99a96084
commit ed784d94f9
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,6 @@ class rasterize(OgrAlgorithm):
DIMENSIONS = 'DIMENSIONS' DIMENSIONS = 'DIMENSIONS'
WIDTH = 'WIDTH' WIDTH = 'WIDTH'
HEIGHT = 'HEIGHT' HEIGHT = 'HEIGHT'
WRITEOVER = 'WRITEOVER'
RTYPE = 'RTYPE' RTYPE = 'RTYPE'
OUTPUT = 'OUTPUT' OUTPUT = 'OUTPUT'
TYPE = ['Byte', 'Int16', 'UInt16', 'UInt32', 'Int32', 'Float32', 'Float64'] TYPE = ['Byte', 'Int16', 'UInt16', 'UInt32', 'Int32', 'Float32', 'Float64']
@ -71,8 +70,6 @@ class rasterize(OgrAlgorithm):
self.addParameter(ParameterVector(self.INPUT, self.tr('Input layer'))) self.addParameter(ParameterVector(self.INPUT, self.tr('Input layer')))
self.addParameter(ParameterTableField(self.FIELD, self.addParameter(ParameterTableField(self.FIELD,
self.tr('Attribute field'), self.INPUT)) self.tr('Attribute field'), self.INPUT))
self.addParameter(ParameterBoolean(self.WRITEOVER,
self.tr('Write values inside an existing raster layer(*)'), False))
self.addParameter(ParameterSelection(self.DIMENSIONS, self.addParameter(ParameterSelection(self.DIMENSIONS,
self.tr('Set output raster size (ignored if above option is checked)'), self.tr('Set output raster size (ignored if above option is checked)'),
['Output size in pixels', 'Output resolution in map units per pixel'], 1)) ['Output size in pixels', 'Output resolution in map units per pixel'], 1))
@ -103,10 +100,9 @@ class rasterize(OgrAlgorithm):
self.addParameter(ParameterBoolean(self.TFW, self.addParameter(ParameterBoolean(self.TFW,
self.tr('Force the generation of an associated ESRI world file (.tfw)'), False)) self.tr('Force the generation of an associated ESRI world file (.tfw)'), False))
self.addOutput(OutputRaster(self.OUTPUT, self.addOutput(OutputRaster(self.OUTPUT,
self.tr('Output layer: mandatory to choose an existing raster layer if the (*) option is selected'))) self.tr('Rasterized')))
def processAlgorithm(self, progress): def processAlgorithm(self, progress):
writeOver = self.getParameterValue(self.WRITEOVER)
inLayer = self.getParameterValue(self.INPUT) inLayer = self.getParameterValue(self.INPUT)
ogrLayer = self.ogrConnectionString(inLayer)[1:-1] ogrLayer = self.ogrConnectionString(inLayer)[1:-1]
noData = str(self.getParameterValue(self.NO_DATA)) noData = str(self.getParameterValue(self.NO_DATA))
@ -123,27 +119,26 @@ class rasterize(OgrAlgorithm):
arguments.append('-a') arguments.append('-a')
arguments.append(str(self.getParameterValue(self.FIELD))) arguments.append(str(self.getParameterValue(self.FIELD)))
if not writeOver:
arguments.append('-ot') arguments.append('-ot')
arguments.append(self.TYPE[self.getParameterValue(self.RTYPE)]) arguments.append(self.TYPE[self.getParameterValue(self.RTYPE)])
dimType = self.getParameterValue(self.DIMENSIONS) dimType = self.getParameterValue(self.DIMENSIONS)
if not writeOver: if dimType == 0:
if dimType == 0: # size in pixels
# size in pixels arguments.append('-ts')
arguments.append('-ts') arguments.append(str(self.getParameterValue(self.WIDTH)))
arguments.append(str(self.getParameterValue(self.WIDTH))) arguments.append(str(self.getParameterValue(self.HEIGHT)))
arguments.append(str(self.getParameterValue(self.HEIGHT))) else:
else: # resolution in map units per pixel
# resolution in map units per pixel arguments.append('-tr')
arguments.append('-tr') arguments.append(str(self.getParameterValue(self.WIDTH)))
arguments.append(str(self.getParameterValue(self.WIDTH))) arguments.append(str(self.getParameterValue(self.HEIGHT)))
arguments.append(str(self.getParameterValue(self.HEIGHT)))
if len(noData) > 0: if len(noData) > 0:
arguments.append('-a_nodata') arguments.append('-a_nodata')
arguments.append(noData) arguments.append(noData)
if (GdalUtils.getFormatShortNameFromFilename(out) == "GTiff") and (writeOver is False): if (GdalUtils.getFormatShortNameFromFilename(out) == "GTiff"):
arguments.append("-co COMPRESS="+compress) arguments.append("-co COMPRESS="+compress)
if compress == 'JPEG': if compress == 'JPEG':
arguments.append("-co JPEG_QUALITY="+jpegcompression) arguments.append("-co JPEG_QUALITY="+jpegcompression)