Merge pull request #8444 from NaturalGIS/reenable_grass_r_mapcalculator

add GRASS r.mapcalculator, remove r.mapcalc
qgis · Jan 7, 2019 · 83c6a2c · 83c6a2c
2 parents 1ba6b97 + a57fec8
commit 83c6a2c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 74 deletions.
diff --git a/python/plugins/processing/algs/grass7/description/r.mapcalc.simple.txt b/python/plugins/processing/algs/grass7/description/r.mapcalc.simple.txt
@@ -0,0 +1,11 @@
+r.mapcalc.simple
+Calculate new raster map from a r.mapcalc expression.
+Raster (r.*)
+QgsProcessingParameterRasterLayer|a|Raster layer A|False
+QgsProcessingParameterRasterLayer|b|Raster layer B|True
+QgsProcessingParameterRasterLayer|c|Raster layer C|True
+QgsProcessingParameterRasterLayer|d|Raster layer D|True
+QgsProcessingParameterRasterLayer|e|Raster layer E|True
+QgsProcessingParameterRasterLayer|f|Raster layer F|True
+QgsProcessingParameterString|expression|Formula|A*2
+QgsProcessingParameterRasterDestination|output|Calculated
diff --git a/python/plugins/processing/algs/grass7/description/r.mapcalc.txt b/python/plugins/processing/algs/grass7/description/r.mapcalc.txt
diff --git a/python/plugins/processing/algs/grass7/ext/r_mapcalc.py b/python/plugins/processing/algs/grass7/ext/r_mapcalc.py