Skip to content

Commit

Permalink
add missed outputs to algorithms
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexbruy @nyalldawson
alexbruy authored and nyalldawson committed Nov 5, 2019
1 parent 88972d3 commit acae312
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 44 deletions.
39 changes: 19 additions & 20 deletions python/plugins/processing/algs/gdal/rasterize_over.py
View file
Expand Up @@ -32,7 +32,8 @@
QgsProcessingParameterRasterLayer,
QgsProcessingParameterNumber,
QgsProcessingParameterString,
QgsProcessingParameterBoolean)
QgsProcessingParameterBoolean,
QgsProcessingOutputRasterLayer)
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.algs.gdal.GdalUtils import GdalUtils

Expand All @@ -46,38 +47,37 @@ class rasterize_over(GdalAlgorithm):
INPUT_RASTER = 'INPUT_RASTER'
ADD = 'ADD'
EXTRA = 'EXTRA'
OUTPUT = 'OUTPUT'

def __init__(self):
super().__init__()

def initAlgorithm(self, config=None):
self.units = [self.tr("Pixels"),
self.tr("Georeferenced units")]

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

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

self.addParameter(QgsProcessingParameterRasterLayer(self.INPUT_RASTER,
self.tr('Input raster layer')))
self.addParameter(QgsProcessingParameterField(self.FIELD,
self.tr('Field to use for burn in value'),
None,
self.INPUT,
QgsProcessingParameterField.Numeric,
optional=False))

add_param = QgsProcessingParameterBoolean(self.ADD,
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,
params = []
params.append(QgsProcessingParameterBoolean(self.ADD,
self.tr('Add burn in values to existing raster values'),
defaultValue=False))
params.append(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)
optional=True))
for p in params:
p.setFlags(p.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
self.addParameter(p)

self.addOutput(QgsProcessingOutputRasterLayer(self.OUTPUT,
self.tr('Rasterized')))

def name(self):
return 'rasterize_over'
Expand All @@ -100,12 +100,11 @@ def commandName(self):
def getConsoleCommands(self, parameters, context, feedback, executing=True):
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback, executing)
inLayer = self.parameterAsRasterLayer(parameters, self.INPUT_RASTER, context)
fieldName = self.parameterAsString(parameters, self.FIELD, context)
self.setOutputValue(self.OUTPUT, inLayer.source())

arguments = ['-l']
arguments.append(layerName)

fieldName = self.parameterAsString(parameters, self.FIELD, context)

arguments.append('-a')
arguments.append(fieldName)

Expand Down
45 changes: 21 additions & 24 deletions python/plugins/processing/algs/gdal/rasterize_over_fixed_value.py
View file
Expand Up @@ -2,7 +2,7 @@

"""
***************************************************************************
rasterize_over.py
rasterize_over_fixed_value.py
---------------------
Date : September 2013
Copyright : (C) 2013 by Alexander Bruy
Expand Down Expand Up @@ -32,7 +32,8 @@
QgsProcessingParameterRasterLayer,
QgsProcessingParameterNumber,
QgsProcessingParameterString,
QgsProcessingParameterBoolean)
QgsProcessingParameterBoolean,
QgsProcessingOutputRasterLayer)
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
from processing.algs.gdal.GdalUtils import GdalUtils

Expand All @@ -46,37 +47,35 @@ class rasterize_over_fixed_value(GdalAlgorithm):
ADD = 'ADD'
EXTRA = 'EXTRA'
BURN = 'BURN'
OUTPUT = 'OUTPUT'

def __init__(self):
super().__init__()

def initAlgorithm(self, config=None):
self.units = [self.tr("Pixels"),
self.tr("Georeferenced units")]

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

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

self.addParameter(QgsProcessingParameterRasterLayer(self.INPUT_RASTER,
self.tr('Input raster layer')))
self.addParameter(QgsProcessingParameterNumber(self.BURN,
self.tr('A fixed value to burn'),
type=QgsProcessingParameterNumber.Double,
defaultValue=0.0,
optional=False))

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

extra_param = QgsProcessingParameterString(self.EXTRA,
params = []
params.append(QgsProcessingParameterBoolean(self.ADD,
self.tr('Add burn in values to existing raster values'),
defaultValue=False))
params.append(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)
optional=True))
for p in params:
p.setFlags(p.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
self.addParameter(p)

self.addOutput(QgsProcessingOutputRasterLayer(self.OUTPUT,
self.tr('Rasterized')))

def name(self):
return 'rasterize_over_fixed_value'
Expand All @@ -99,14 +98,12 @@ def commandName(self):
def getConsoleCommands(self, parameters, context, feedback, executing=True):
ogrLayer, layerName = self.getOgrCompatibleSource(self.INPUT, parameters, context, feedback, executing)
inLayer = self.parameterAsRasterLayer(parameters, self.INPUT_RASTER, context)
self.setOutputValue(self.OUTPUT, inLayer.source())

arguments = ['-l']
arguments.append(layerName)

fieldName = self.parameterAsString(parameters, self.FIELD, context)

arguments.append('-burn')
arguments.append(self.parameterAsDouble(parameters, self.BURN, context))
arguments.append(str(self.parameterAsDouble(parameters, self.BURN, context)))

if self.parameterAsBool(parameters, self.ADD, context):
arguments.append('-add')
Expand Down

0 comments on commit acae312

Please sign in to comment.