[GRASS-SVN] r73803 - in grass/branches/releasebranch_7_6: raster/r.mapcalc scripts scripts/r.mapcalc.simple

[svn_grass at osgeo.org]

Author: neteler
Date: 2018-12-14 13:43:04 -0800 (Fri, 14 Dec 2018)
New Revision: 73803

Added:
   grass/branches/releasebranch_7_6/scripts/r.mapcalc.simple/
Modified:
   grass/branches/releasebranch_7_6/raster/r.mapcalc/r.mapcalc.html
   grass/branches/releasebranch_7_6/scripts/Makefile
   grass/branches/releasebranch_7_6/scripts/r.mapcalc.simple/r.mapcalc.simple.py
Log:
r.mapcalc.simple: added from https://svn.osgeo.org/grass/sandbox/wenzeslaus/r.mapcalculator as r.mapcalc.simple (#3431; trunk r73791, r73794, r73802)

Modified: grass/branches/releasebranch_7_6/raster/r.mapcalc/r.mapcalc.html
===================================================================
--- grass/branches/releasebranch_7_6/raster/r.mapcalc/r.mapcalc.html	2018-12-14 21:41:06 UTC (rev 73802)
+++ grass/branches/releasebranch_7_6/raster/r.mapcalc/r.mapcalc.html	2018-12-14 21:43:04 UTC (rev 73803)
@@ -805,7 +805,8 @@
 <a href="r.bitpattern.html">r.bitpattern</a>,
 <a href="r.blend.html">r.blend</a>,
 <a href="r.colors.html">r.colors</a>,
-<a href="r.fillnulls.html">r.fillnulls</a>
+<a href="r.fillnulls.html">r.fillnulls</a>,
+<a href="r.mapcalc.simple.html">r.mapcalc.simple</a>
 </em>
 
 

Modified: grass/branches/releasebranch_7_6/scripts/Makefile
===================================================================
--- grass/branches/releasebranch_7_6/scripts/Makefile	2018-12-14 21:41:06 UTC (rev 73802)
+++ grass/branches/releasebranch_7_6/scripts/Makefile	2018-12-14 21:43:04 UTC (rev 73803)
@@ -40,6 +40,7 @@
 	r.in.aster \
 	r.in.srtm \
 	r.in.wms \
+	r.mapcalc.simple \
 	r.mask \
 	r.out.xyz \
 	r.pack \

Modified: grass/branches/releasebranch_7_6/scripts/r.mapcalc.simple/r.mapcalc.simple.py
===================================================================
--- grass/trunk/scripts/r.mapcalc.simple/r.mapcalc.simple.py	2018-12-11 06:28:51 UTC (rev 73791)
+++ grass/branches/releasebranch_7_6/scripts/r.mapcalc.simple/r.mapcalc.simple.py	2018-12-14 21:43:04 UTC (rev 73803)
@@ -18,9 +18,10 @@
 """
 
 #%module
-#% description: Calculate new raster map from a r.mapcalc expression
+#% description: Calculates a new raster map from a simple r.mapcalc expression.
 #% keyword: raster
 #% keyword: algebra
+#% keyword: simple
 #%end
 #%option
 #% key: expression
@@ -30,38 +31,41 @@
 #%end
 #%option G_OPT_R_INPUT
 #% key: a
-#% description: A
+#% description: Name of input A raster map
 #% required : no
+#% guisection: Input maps
 #%end
 #%option G_OPT_R_INPUT
 #% key: b
-#% description: B
+#% description: Name of input B raster map
 #% required : no
+#% guisection: Input maps
 #%end
 #%option G_OPT_R_INPUT
 #% key: c
-#% description: C
+#% description: Name of input C raster map
 #% required : no
+#% guisection: Input maps
 #%end
 #%option G_OPT_R_INPUT
 #% key: d
-#% description: D
+#% description: Name of input D raster map
 #% required : no
+#% guisection: Input maps
 #%end
 #%option G_OPT_R_INPUT
 #% key: e
-#% description: E
+#% description: Name of input E raster map
 #% required : no
+#% guisection: Input maps
 #%end
 #%option G_OPT_R_INPUT
 #% key: f
-#% description: F
+#% description: Name of input F raster map
 #% required : no
+#% guisection: Input maps
 #%end
-#%option
-#% key: output
-#% description: Name for output raster map
-#% required : yes
+#%option G_OPT_R_OUTPUT
 #%end
 #%option
 #% key: seed
@@ -69,14 +73,17 @@
 #% required: no
 #% multiple: no
 #% description: Seed for rand() function
+#% guisection: Random
 #%end
 #%flag
 #% key: s
 #% description: Generate random seed (result is non-deterministic)
+#% guisection: Random
 #%end
 #%flag
 #% key: q
 #% description: Quote the map names
+#% guisection: Input maps
 #%end
 #%flag
 #% key: c