split the tool

qgis · Nov 4, 2019 · 7b4062f · 7b4062f
1 parent afa570d
commit 7b4062f
Show file tree

Hide file tree

Showing 3 changed files with 128 additions and 15 deletions.
diff --git a/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py b/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py
@@ -67,6 +67,7 @@
 from .tri import tri
 from .warp import warp
 from .pansharp import pansharp
+from .rasterize_over_fixed_value import rasterize_over_fixed_value
 
 from .extractprojection import ExtractProjection
 from .rasterize_over import rasterize_over
@@ -175,6 +176,7 @@ def loadAlgorithms(self):
             # rasterize(),
             ExtractProjection(),
             rasterize_over(),
+            rasterize_over_fixed_value(),
             # ----- OGR tools -----
             Buffer(),
             ClipVectorByExtent(),

diff --git a/python/plugins/processing/algs/gdal/rasterize_over.py b/python/plugins/processing/algs/gdal/rasterize_over.py
@@ -46,7 +46,6 @@ class rasterize_over(GdalAlgorithm):
     INPUT_RASTER = 'INPUT_RASTER'
     ADD = 'ADD'
     EXTRA = 'EXTRA'
-    BURN = 'BURN'
 
     def __init__(self):
         super().__init__()
@@ -65,13 +64,7 @@ def initAlgorithm(self, config=None):
                                                       None,
                                                       self.INPUT,
                                                       QgsProcessingParameterField.Numeric,
-                                                      optional=True))
-
-        self.addParameter(QgsProcessingParameterNumber(self.BURN,
-                                                       self.tr('A fixed value to burn'),
-                                                       type=QgsProcessingParameterNumber.Double,
-                                                       defaultValue=0.0,
-                                                       optional=True))
+                                                      optional=False))
 
         add_param = QgsProcessingParameterBoolean(self.ADD,
                                                      self.tr('Add burn in values to existing raster values'),
@@ -90,7 +83,7 @@ def name(self):
         return 'rasterize_over'
 
     def displayName(self):
-        return self.tr('Rasterize (write over existing raster)')
+        return self.tr('Rasterize (write attribute value over existing raster)')
 
     def group(self):
         return self.tr('Vector conversion')
@@ -112,12 +105,9 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
         arguments.append(layerName)
 
         fieldName = self.parameterAsString(parameters, self.FIELD, context)
-        if fieldName:
-            arguments.append('-a')
-            arguments.append(fieldName)
-        else:
-            arguments.append('-burn')
-            arguments.append(self.parameterAsDouble(parameters, self.BURN, context))
+
+        arguments.append('-a')
+        arguments.append(fieldName)
 
         if self.parameterAsBool(parameters, self.ADD, context):
             arguments.append('-add')

diff --git a/python/plugins/processing/algs/gdal/rasterize_over_fixed_value.py b/python/plugins/processing/algs/gdal/rasterize_over_fixed_value.py
@@ -0,0 +1,121 @@
+# -*- coding: utf-8 -*-
+
+"""
+***************************************************************************
+    rasterize_over.py
+    ---------------------
+    Date                 : September 2013
+    Copyright            : (C) 2013 by Alexander Bruy
+    Email                : alexander dot bruy at gmail dot com
+***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************
+"""
+
+__author__ = 'Alexander Bruy'
+__date__ = 'September 2013'
+__copyright__ = '(C) 2013, Alexander Bruy'
+
+import os
+
+from qgis.PyQt.QtGui import QIcon
+
+from qgis.core import (QgsRasterFileWriter,
+                       QgsProcessingParameterDefinition,
+                       QgsProcessingParameterFeatureSource,
+                       QgsProcessingParameterField,
+                       QgsProcessingParameterRasterLayer,
+                       QgsProcessingParameterNumber,
+                       QgsProcessingParameterString,
+                       QgsProcessingParameterBoolean)
+from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
+from processing.algs.gdal.GdalUtils import GdalUtils
+
+pluginPath = os.path.split(os.path.split(os.path.dirname(__file__))[0])[0]
+
+
+class rasterize_over_fixed_value(GdalAlgorithm):
+
+    INPUT = 'INPUT'
+    INPUT_RASTER = 'INPUT_RASTER'
+    ADD = 'ADD'
+    EXTRA = 'EXTRA'
+    BURN = 'BURN'
+
+    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(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)
+
+        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_fixed_value'
+
+    def displayName(self):
+        return self.tr('Rasterize (write fixed value over existing raster)')
+
+    def group(self):
+        return self.tr('Vector conversion')
+
+    def groupId(self):
+        return 'vectorconversion'
+
+    def icon(self):
+        return QIcon(os.path.join(pluginPath, 'images', 'gdaltools', 'rasterize.png'))
+
+    def commandName(self):
+        return 'gdal_rasterize'
+
+    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)
+
+        arguments = ['-l']
+        arguments.append(layerName)
+
+        fieldName = self.parameterAsString(parameters, self.FIELD, context)
+
+        arguments.append('-burn')
+        arguments.append(self.parameterAsDouble(parameters, self.BURN, context))
+
+        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())
+
+        return [self.commandName(), GdalUtils.escapeAndJoin(arguments)]