Merge pull request #8803 from NaturalGIS/release-3_4

re-add the r.mapcalculator momodule (as r.mapcalc.simple) and remove the not working r.mapcalc
qgis · Jan 7, 2019 · b557cc2 · b557cc2
2 parents c710e0b + 63a5320
commit b557cc2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 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