[GRASS-SVN] r68275 - grass/trunk/raster/r.mapcalc
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Apr 17 14:59:51 PDT 2016
Author: neteler
Date: 2016-04-17 14:59:51 -0700 (Sun, 17 Apr 2016)
New Revision: 68275
Modified:
grass/trunk/raster/r.mapcalc/r.mapcalc.html
grass/trunk/raster/r.mapcalc/r3.mapcalc.html
Log:
r.mapcalc/r3.mapcalc manual: fix HTML style of r68268
Modified: grass/trunk/raster/r.mapcalc/r.mapcalc.html
===================================================================
--- grass/trunk/raster/r.mapcalc/r.mapcalc.html 2016-04-17 17:47:41 UTC (rev 68274)
+++ grass/trunk/raster/r.mapcalc/r.mapcalc.html 2016-04-17 21:59:51 UTC (rev 68275)
@@ -4,7 +4,6 @@
involving existing raster map layers, integer or floating point constants,
and functions.
-
<h3>Program use</h3>
<em>r.mapcalc</em> expression have the form:
@@ -682,20 +681,24 @@
<h2>KNOWN ISSUES</h2>
-<p>The <em>result</em> variable on the left hand side of the equation should not
+The <em>result</em> variable on the left hand side of the equation should not
appear in the <em>expression</em> on the right hand side.
+
<div class="code"><pre>
-<s>mymap = if( mymap > 0, mymap, 0)</s>
+<s>mymap = if( mymap > 0, mymap, 0)</s>
</pre></div>
-<p>Any maps generated by an r.mapcalc command only exist after the entire
+
+<p>Any maps generated by a <em>r.mapcalc</em> command only exist after the entire
command has completed. All maps are generated concurrently, row-by-row
(i.e. there is an implicit "for row in rows {...}" around the entire expression).
-Thus #, @ and [ ] operators can not be used on a map generated within same
-r.mapcalc command run.
+Thus the <tt>#</tt>, <tt>@</tt>, and <tt>[ ]</tt> operators cannot be used on a map
+generated within same <em>r.mapcalc</em> command run.
+
<div class="code"><pre>
newmap = oldmap * 3.14
<s>othermap = newmap[-1, 0] / newmap[1, 0]</s>
</pre></div>
+
<p>Continuation lines must end with a <tt>\</tt> and have <em>no</em> trailing
white space (blanks or tabs). If the user does leave white space at the end of
continuation lines, the error messages produced by <em>r.mapcalc</em> will
Modified: grass/trunk/raster/r.mapcalc/r3.mapcalc.html
===================================================================
--- grass/trunk/raster/r.mapcalc/r3.mapcalc.html 2016-04-17 17:47:41 UTC (rev 68274)
+++ grass/trunk/raster/r.mapcalc/r3.mapcalc.html 2016-04-17 21:59:51 UTC (rev 68275)
@@ -1,10 +1,10 @@
<h2>DESCRIPTION</h2>
+
<em>r3.mapcalc</em> performs arithmetic on raster map layers.
New raster map layers can be created which are arithmetic expressions
involving existing raster map layers, integer or floating point constants,
and functions.
-
<h3>Program use</h3>
<em>r3.mapcalc</em> expression have the form:
@@ -555,13 +555,24 @@
<h2>KNOWN ISSUES</h2>
-<p>The <em>result</em> variable on the left hand side of the equation should not
+The <em>result</em> variable on the left hand side of the equation should not
appear in the <em>expression</em> on the right hand side.
-<p>Any maps generated by an r3.mapcalc command only exist after the entire
+
+<div class="code"><pre>
+<s>mymap = if( mymap > 0, mymap, 0)</s>
+</pre></div>
+
+<p>Any maps generated by a <em>r3.mapcalc</em> command only exist after the entire
command has completed. All maps are generated concurrently, row-by-row
(i.e. there is an implicit "for row in rows {...}" around the entire expression).
-Thus #, @ and [ ] operators can not be used on a map generated within same
-r3.mapcalc command run.
+Thus the <tt>#</tt>, <tt>@</tt>, and <tt>[ ]</tt> operators cannot be used on a map
+generated within same <em>r3.mapcalc</em> command run.
+
+<div class="code"><pre>
+newmap = oldmap * 3.14
+<s>othermap = newmap[-1, 0] / newmap[1, 0]</s>
+</pre></div>
+
<p>Continuation lines must end with a <tt>\</tt> and have <em>no</em> trailing
white space (blanks or tabs). If the user does leave white space at the end of
continuation lines, the error messages produced by <em>r3.mapcalc</em> will
More information about the grass-commit
mailing list