[GRASS-SVN] r63454 - in grass/branches/releasebranch_7_0: . imagery/i.smap imagery/i.topo.corr misc/m.cogo raster/r.carve raster/r.colors raster/r.colors.out raster/r.rescale raster/r.rescale.eq vector/v.colors vector/v.colors.out vector/v.vect.stats
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Dec 9 10:46:50 PST 2014
Author: neteler
Date: 2014-12-09 10:46:50 -0800 (Tue, 09 Dec 2014)
New Revision: 63454
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/imagery/i.smap/i.smap.html
grass/branches/releasebranch_7_0/imagery/i.topo.corr/i.topo.corr.html
grass/branches/releasebranch_7_0/misc/m.cogo/m.cogo.html
grass/branches/releasebranch_7_0/raster/r.carve/main.c
grass/branches/releasebranch_7_0/raster/r.carve/r.carve.html
grass/branches/releasebranch_7_0/raster/r.colors.out/r3.colors.out.html
grass/branches/releasebranch_7_0/raster/r.colors/r3.colors.html
grass/branches/releasebranch_7_0/raster/r.rescale.eq/r.rescale.eq.html
grass/branches/releasebranch_7_0/raster/r.rescale/r.rescale.html
grass/branches/releasebranch_7_0/vector/v.colors.out/v.colors.out.html
grass/branches/releasebranch_7_0/vector/v.colors/v.colors.html
grass/branches/releasebranch_7_0/vector/v.vect.stats/v.vect.stats.html
Log:
manual: some cleanup of HTML and examples (trunk, r63453)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,
63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63302,63315,63319,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63451
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,
63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63302,63315,63319,63330,63332,63339,63342,63345,63362,63367,63391,63393,63408-63409,63416-63417,63425,63427,63429,63431,63433,63451,63453
Modified: grass/branches/releasebranch_7_0/imagery/i.smap/i.smap.html
===================================================================
--- grass/branches/releasebranch_7_0/imagery/i.smap/i.smap.html 2014-12-09 18:39:37 UTC (rev 63453)
+++ grass/branches/releasebranch_7_0/imagery/i.smap/i.smap.html 2014-12-09 18:46:50 UTC (rev 63454)
@@ -155,7 +155,7 @@
# Now digitize training areas "training" with the digitizer
# and convert to raster model with v.to.rast
-v.to.rast training out=training use=cat labelcolumn=label
+v.to.rast input=training output=training use=cat label_column=label
# calculate statistics
i.gensigset trainingmap=training group=my_lsat7_2002 subgroup=my_lsat7_2002 \
Modified: grass/branches/releasebranch_7_0/imagery/i.topo.corr/i.topo.corr.html
===================================================================
--- grass/branches/releasebranch_7_0/imagery/i.topo.corr/i.topo.corr.html 2014-12-09 18:39:37 UTC (rev 63453)
+++ grass/branches/releasebranch_7_0/imagery/i.topo.corr/i.topo.corr.html 2014-12-09 18:46:50 UTC (rev 63454)
@@ -90,10 +90,10 @@
<div class="code"><pre>
# first pass: create illumination model
-i.topo.corr -i base=SRTM zenith=33.3631 azimuth=59.8897 out=SRTM.illumination
+i.topo.corr -i base=SRTM zenith=33.3631 azimuth=59.8897 output=SRTM.illumination
# second pass: apply illumination model
-i.topo.corr base=SRTM.illumination input=toar.5,toar.4,toar.3 out=tcor \
+i.topo.corr base=SRTM.illumination input=toar.5,toar.4,toar.3 output=tcor \
zenith=33.3631 method=c-factor
</pre></div>
Modified: grass/branches/releasebranch_7_0/misc/m.cogo/m.cogo.html
===================================================================
--- grass/branches/releasebranch_7_0/misc/m.cogo/m.cogo.html 2014-12-09 18:39:37 UTC (rev 63453)
+++ grass/branches/releasebranch_7_0/misc/m.cogo/m.cogo.html 2014-12-09 18:46:50 UTC (rev 63454)
@@ -107,19 +107,19 @@
<p>
Round trip:
<div class="code"><pre>
- m.cogo -l in=cogo.dat | m.cogo -rl in="-"
+ m.cogo -l input=cogo.dat | m.cogo -rl in="-"
</pre></div>
<p>
Import as a vector points map:
<div class="code"><pre>
- m.cogo -l in=cogo.dat | v.in.ascii out=cogo_points x=1 y=2 separator=space
+ m.cogo -l input=cogo.dat | v.in.ascii output=cogo_points x=1 y=2 separator=space
</pre></div>
<p>
Shell script to import as a vector line map:
<div class="code"><pre>
- m.cogo -l in=cogo.dat | tac | awk '
+ m.cogo -l input=cogo.dat | tac | awk '
BEGIN { FS=" " ; R=0 }
$1~/\d*\.\d*/ { printf(" %.8f %.8f\n", $1, $2) ; ++R }
END { printf("L %d\n", R) }' | tac | \
@@ -130,10 +130,10 @@
Convert that lines map into an area:
<div class="code"><pre>
# Add the -c flag to the above example to close the loop:
- m.cogo -l -c in=cogo.dat | ...
+ m.cogo -l -c input=cogo.dat | ...
...
v.type input=cogo_line output=cogo_boundary from_type=line to_type=boundary
- v.centroids in=cogo_boundary out=cogo_area
+ v.centroids input=cogo_boundary output=cogo_area
</pre></div>
If necessary, snap the boundary closed with the <em>v.clean</em> module.
Modified: grass/branches/releasebranch_7_0/raster/r.carve/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.carve/main.c 2014-12-09 18:39:37 UTC (rev 63453)
+++ grass/branches/releasebranch_7_0/raster/r.carve/main.c 2014-12-09 18:46:50 UTC (rev 63454)
@@ -209,7 +209,8 @@
*wrap_ncols =
(360.0 - (window->east - window->west)) / window->ew_res + 1.1;
#else
- G_fatal_error(_("lat/lon projection not supported at this time."));
+ G_fatal_error(_("Lat/Long location is not supported by %s. Please reproject map first."),
+ G_program_name());
#endif
}
else {
Modified: grass/branches/releasebranch_7_0/raster/r.carve/r.carve.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.carve/r.carve.html 2014-12-09 18:39:37 UTC (rev 63453)
+++ grass/branches/releasebranch_7_0/raster/r.carve/r.carve.html 2014-12-09 18:46:50 UTC (rev 63454)
@@ -1,16 +1,16 @@
<h2>DESCRIPTION</h2>
<em>r.carve</em> accepts vector stream data as input, transforms them to
-raster, and subtracts a defaultdepth+additionaldepth from a DEM. If
+raster, and subtracts a default-depth + additional-depth from a DEM. If
the given width is more than 1 cell, it will carve the stream with the
-given width. With the -n flag it should eliminate all flat cells within
+given width. With the <b>-n</b> flag it should eliminate all flat cells within
the stream, so when and if the water gets into the stream it will
flow. The <em>points</em> option generates x,y,z for points which define the stream
with the z-value of the bottom of the carved-in stream. These points
can then be combined with contours to interpolate a new DEM with
better representation of valleys.
-<h2>NOTE</h2>
+<h2>NOTES</h2>
<em>r.carve</em> does not create a depressionless DEM because many
depressions are in flat areas and not in the streams.
@@ -18,9 +18,11 @@
<h2>EXAMPLE</h2>
+North Carolina sample dataset:
+
<div class="code"><pre>
-g.region rast=elevation.10m -p
-r.carve rast=elevation.10m vect=streams out=carve_dem width=20 depth=5
+g.region rast=elevation -p
+r.carve rast=elevation vect=streams out=carve_dem width=20 depth=5
</pre></div>
<h2>BUGS</h2>
@@ -37,10 +39,13 @@
M. Johnston, GMSL (Report for CERL 1999)
<h2>SEE ALSO</h2>
-<em><a href="r.flow.html">r.flow</a></em>,
-<em><a href="r.fill.dir.html">r.fill.dir</a></em>,
-<em><a href="r.watershed.html">r.watershed</a></em>
+<em>
+<a href="r.flow.html">r.flow</a>,
+<a href="r.fill.dir.html">r.fill.dir</a>,
+<a href="r.watershed.html">r.watershed</a>
+</em>
+
<h2>AUTHOR</h2>
Bill Brown (GMSL)<br>
GRASS 6 update: Brad Douglas
Modified: grass/branches/releasebranch_7_0/raster/r.colors/r3.colors.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.colors/r3.colors.html 2014-12-09 18:39:37 UTC (rev 63453)
+++ grass/branches/releasebranch_7_0/raster/r.colors/r3.colors.html 2014-12-09 18:46:50 UTC (rev 63454)
@@ -1,19 +1,32 @@
<h2>DESCRIPTION</h2>
<em>r3.colors</em> has exactly the same functionality
-as <em>r.colors</em> but for volume maps. Please refer
+as <em>r.colors</em> but for 3D raster maps. Please refer
to <em><a href="r.colors.html">r.colors</a></em>.
+<h2>EXAMPLES</h2>
+
+<div class="code"><pre>
+r3.colors map=volume_1 color=gyr
+</pre></div>
+
<h2>SEE ALSO</h2>
<em>
- <a href="r.colors.html">r.colors</a>,
- <a href="r.colors.out.html">r.colors.out</a>,
- <a href="r3.colors.out.html">r3.colors.out</a>,
- <a href="v.colors.html">v.colors</a>,
- <a href="v.colors.out.html">v.colors.out</a>
+<a href="r.colors.html">r.colors</a>,
+<a href="r.colors.out.html">r.colors.out</a>,
+<a href="r3.colors.out.html">r3.colors.out</a>,
+<a href="v.colors.html">v.colors</a>,
+<a href="v.colors.out.html">v.colors.out</a>
</em>
+<p>See also wiki
+page <a href="http://grasswiki.osgeo.org/wiki/Color_tables">Color
+tables</a> (from GRASS User Wiki)
+
+<p><a href="http://colorbrewer.org">ColorBrewer</a> is an online tool designed to
+help people select good color schemes for maps and other graphics.
+
<h2>AUTHORS</h2>
Michael Shapiro and David Johnson
Modified: grass/branches/releasebranch_7_0/raster/r.colors.out/r3.colors.out.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.colors.out/r3.colors.out.html 2014-12-09 18:39:37 UTC (rev 63453)
+++ grass/branches/releasebranch_7_0/raster/r.colors.out/r3.colors.out.html 2014-12-09 18:46:50 UTC (rev 63454)
@@ -1,7 +1,7 @@
<h2>DESCRIPTION</h2>
<em>r3.colors.out</em> allows the user to export the color table for a
-raster3d map to a file which is suitable as input
+3D raste map to a file which is suitable as input
to <em><a href="r3.colors.html">r3.colors</a></em>.
<h2>EXAMPLES</h2>
@@ -14,11 +14,15 @@
<h2>SEE ALSO</h2>
<em>
- <a href="r3.colors.html">r3.colors</a>
- <a href="r.colors.out.html">r.colors</a>
+<a href="r.colors.html">r.colors</a>,
+<a href="r.colors.out.html">r.colors.out</a>,
+<a href="r3.colors.html">r3.colors</a>
+<a href="v.colors.html">v.colors</a>,
+<a href="v.colors.out.html">v.colors.out</a>
</em>
<h2>AUTHOR</h2>
+
Glynn Clements
<p><i>Last changed: $Date$</i>
Modified: grass/branches/releasebranch_7_0/raster/r.rescale/r.rescale.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.rescale/r.rescale.html 2014-12-09 18:39:37 UTC (rev 63453)
+++ grass/branches/releasebranch_7_0/raster/r.rescale/r.rescale.html 2014-12-09 18:46:50 UTC (rev 63454)
@@ -1,7 +1,7 @@
<h2>DESCRIPTION</h2>
The <em>r.rescale</em> program rescales the range of
-category values appearing in a raster map layer. A new
+category values appearing in a raster map layer. A new
raster map layer, and an appropriate category file and
color table based upon the original raster map layer, are
generated with category labels that reflect the original
@@ -10,7 +10,7 @@
number of categories from a raster map layer with a large
range of category values (e.g., elevation).
<em>Rescaled</em> map layers are appropriate for use in
-such GRASS programs as
+such GRASS GIS commands as
<em><a href="r.stats.html">r.stats</a></em>,
<em><a href="r.report.html">r.report</a></em>, and
@@ -21,7 +21,7 @@
To rescale an elevation raster map layer with category
values ranging from 1090 meters to 1800 meters into the
range 0-255, the following command line could be used
-(without the <em>from</em> parameter, the full value range will
+(without the <em>from</em> parameter, the full value range will
be used):
<div class="code"><pre>
@@ -45,15 +45,17 @@
<h2>SEE ALSO</h2>
-<em><a href="r.coin.html">r.coin</a></em>,
-<em><a href="r.describe.html">r.describe</a></em>,
-<em><a href="r.info.html">r.info</a></em>,
-<em><a href="r.mapcalc.html">r.mapcalc</a></em>,
-<em><a href="r.reclass.html">r.reclass</a></em>,
-<em><a href="r.rescale.eq.html">r.rescale.eq</a></em>,
-<em><a href="r.report.html">r.report</a></em>,
-<em><a href="r.resample.html">r.resample</a></em>,
-<em><a href="r.stats.html">r.stats</a></em>
+<em>
+<a href="r.coin.html">r.coin</a>,
+<a href="r.describe.html">r.describe</a>,
+<a href="r.info.html">r.info</a>,
+<a href="r.mapcalc.html">r.mapcalc</a>,
+<a href="r.reclass.html">r.reclass</a>,
+<a href="r.rescale.eq.html">r.rescale.eq</a>,
+<a href="r.report.html">r.report</a>,
+<a href="r.resample.html">r.resample</a>,
+<a href="r.stats.html">r.stats</a>
+</em>
<h2>AUTHOR</h2>
Michael Shapiro,
Modified: grass/branches/releasebranch_7_0/raster/r.rescale.eq/r.rescale.eq.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.rescale.eq/r.rescale.eq.html 2014-12-09 18:39:37 UTC (rev 63453)
+++ grass/branches/releasebranch_7_0/raster/r.rescale.eq/r.rescale.eq.html 2014-12-09 18:46:50 UTC (rev 63454)
@@ -10,7 +10,7 @@
number of categories from a raster map layer with a large
range of category values (e.g., elevation).
<em>Rescaled</em> map layers are appropriate for use in
-such GRASS programs as
+such GRASS GIS commands as
<em><a href="r.stats.html">r.stats</a></em>,
<em><a href="r.report.html">r.report</a></em>, and
@@ -46,15 +46,17 @@
<h2>SEE ALSO</h2>
-<em><a href="r.coin.html">r.coin</a></em>,
-<em><a href="r.describe.html">r.describe</a></em>,
-<em><a href="r.info.html">r.info</a></em>,
-<em><a href="r.mapcalc.html">r.mapcalc</a></em>,
-<em><a href="r.reclass.html">r.reclass</a></em>,
-<em><a href="r.rescale.html">r.rescale</a></em>,
-<em><a href="r.report.html">r.report</a></em>,
-<em><a href="r.resample.html">r.resample</a></em>,
-<em><a href="r.stats.html">r.stats</a></em>
+<em>
+<a href="r.coin.html">r.coin</a>,
+<a href="r.describe.html">r.describe</a>,
+<a href="r.info.html">r.info</a>,
+<a href="r.mapcalc.html">r.mapcalc</a>,
+<a href="r.reclass.html">r.reclass</a>,
+<a href="r.rescale.html">r.rescale</a>,
+<a href="r.report.html">r.report</a>,
+<a href="r.resample.html">r.resample</a>,
+<a href="r.stats.html">r.stats</a>
+</em>
<h2>AUTHOR</h2>
Michael Shapiro,
Modified: grass/branches/releasebranch_7_0/vector/v.colors/v.colors.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.colors/v.colors.html 2014-12-09 18:39:37 UTC (rev 63453)
+++ grass/branches/releasebranch_7_0/vector/v.colors/v.colors.html 2014-12-09 18:46:50 UTC (rev 63454)
@@ -110,12 +110,12 @@
<h2>SEE ALSO</h2>
<em>
- <a href="d.vect.html">d.vect</a>,
- <a href="v.colors.out.html">v.colors.out</a>,
- <a href="r.colors.html">r.colors</a>,
- <a href="r.colors.out.html">r.colors.out</a>,
- <a href="r3.colors.html">r3.colors</a>,
- <a href="r3.colors.out.html">r3.colors.out</a>,
+<a href="d.vect.html">d.vect</a>,
+<a href="r.colors.html">r.colors</a>,
+<a href="r.colors.out.html">r.colors.out</a>,
+<a href="r3.colors.html">r3.colors</a>,
+<a href="r3.colors.out.html">r3.colors.out</a>,
+<a href="v.colors.out.html">v.colors.out</a>
</em>
<p>See also wiki
Modified: grass/branches/releasebranch_7_0/vector/v.colors.out/v.colors.out.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.colors.out/v.colors.out.html 2014-12-09 18:39:37 UTC (rev 63453)
+++ grass/branches/releasebranch_7_0/vector/v.colors.out/v.colors.out.html 2014-12-09 18:46:50 UTC (rev 63454)
@@ -14,11 +14,11 @@
<h2>SEE ALSO</h2>
<em>
- <a href="v.colors.html">v.colors</a>,
- <a href="r.colors.html">r.colors</a>,
- <a href="r3.colors.html">r3.colors</a>,
- <a href="r.colors.out.html">r.colors.out</a>,
- <a href="r3.colors.out.html">r3.colors.out</a>,
+<a href="v.colors.html">v.colors</a>,
+<a href="r.colors.html">r.colors</a>,
+<a href="r3.colors.html">r3.colors</a>,
+<a href="r.colors.out.html">r.colors.out</a>,
+<a href="r3.colors.out.html">r3.colors.out</a>
</em>
<h2>AUTHOR</h2>
Modified: grass/branches/releasebranch_7_0/vector/v.vect.stats/v.vect.stats.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.vect.stats/v.vect.stats.html 2014-12-09 18:39:37 UTC (rev 63453)
+++ grass/branches/releasebranch_7_0/vector/v.vect.stats/v.vect.stats.html 2014-12-09 18:46:50 UTC (rev 63454)
@@ -16,52 +16,40 @@
<p><dl>
<dt><b>sum</b>
-
<dd>The sum of values.
<dt><b>average</b>
-
<dd>The average value of all point attributes (sum / count).
<dt><b>median</b>
-
<dd>The value found half-way through a list of the
attribute values, when these are ranged in numerical order.
<dt><b>mode</b>
-
<dd>The most frequently occurring value.
<dt><b>minimum</b>
-
<dd>The minimum observed value.
<dt><b>min_cat</b>
-
<dd>The point category corresponding to the minimum observed value.
<dt><b>maximum</b>
-
<dd>The maximum observed value.
<dt><b>max_cat</b>
-
<dd>The point category corresponding to the maximum observed value.
<dt><b>range</b>
-
<dd>The range of the observed values.
<dt><b>stddev</b>
-
<dd>The statistical standard deviation of the attribute values.
<dt><b>variance</b>
-
<dd>The statistical variance of the attribute values.
<dt><b>diversity</b>
-
<dd>The number of different attribute values.
</dl>
@@ -75,8 +63,20 @@
(zero) and the statistics result to "null".
<p>The columns <em>count_column</em> and <em>stats_column</em> are created if not
existing. If they do already exist, the <em>count_column</em> must be of
-type integer and the <em>stats_column</em> of type double.
+type integer and the <em>stats_column</em> of type double precision.
+<!-- TODO
+
+<h2>EXAMPLE</h2>
+
+...
+
+<div class="code"><pre>
+...
+</pre></div>
+
+-->
+
<h2>SEE ALSO</h2>
<em>
More information about the grass-commit
mailing list