Skip to content

Commit

Permalink
implement few suggested changes
Browse files Browse the repository at this point in the history
  • Loading branch information
gioman authored and alexbruy committed Nov 4, 2019
1 parent ee8151a commit fbf0ee5
Showing 1 changed file with 18 additions and 10 deletions.
28 changes: 18 additions & 10 deletions python/plugins/processing/algs/gdal/rasterize_over.py
Expand Up @@ -21,10 +21,6 @@
__date__ = 'September 2013'
__copyright__ = '(C) 2013, Alexander Bruy'

# This will get replaced with a git SHA1 when you do a git archive

__revision__ = '$Format:%H$'

import os

from qgis.PyQt.QtGui import QIcon
Expand All @@ -36,10 +32,7 @@
QgsProcessingParameterRasterLayer,
QgsProcessingParameterNumber,
QgsProcessingParameterString,
QgsProcessingParameterEnum,
QgsProcessingParameterExtent,
QgsProcessingParameterBoolean,
QgsProcessingParameterRasterDestination)
QgsProcessingParameterBoolean)
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.algs.gdal.GdalUtils import GdalUtils

Expand All @@ -52,6 +45,7 @@ class rasterize_over(GdalAlgorithm):
FIELD = 'FIELD'
INPUT_RASTER = 'INPUT_RASTER'
ADD = 'ADD'
EXTRA = 'EXTRA'

def __init__(self):
super().__init__()
Expand All @@ -62,19 +56,29 @@ def initAlgorithm(self, config=None):

self.addParameter(QgsProcessingParameterFeatureSource(self.INPUT,
self.tr('Input vector layer')))

self.addParameter(QgsProcessingParameterRasterLayer(self.INPUT_RASTER, self.tr('Input raster layer')))

self.addParameter(QgsProcessingParameterField(self.FIELD,
self.tr('Field to use for a burn-in value'),
self.tr('Field to use for burn in value'),
None,
self.INPUT,
QgsProcessingParameterField.Numeric,
optional=False))

add_param = QgsProcessingParameterBoolean(self.ADD,
self.tr('Adds the new value to the existing raster'),
self.tr('Add burn in values to existing raster values'),
defaultValue=False)
add_param.setFlags(add_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
self.addParameter(add_param)

extra_param = QgsProcessingParameterString(self.EXTRA,
self.tr('Additional command-line parameters'),
defaultValue=None,
optional=True)
extra_param.setFlags(extra_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
self.addParameter(extra_param)

def name(self):
return 'rasterize_over'

Expand Down Expand Up @@ -108,6 +112,10 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
if self.parameterAsBool(parameters, self.ADD, context):
arguments.append('-add')

if self.EXTRA in parameters and parameters[self.EXTRA] not in (None, ''):
extra = self.parameterAsString(parameters, self.EXTRA, context)
arguments.append(extra)

arguments.append(ogrLayer)
arguments.append(inLayer.source())

Expand Down

0 comments on commit fbf0ee5

Please sign in to comment.