[GRASS-SVN] r63802 - in grass/branches/releasebranch_7_0: . display/d.rgb raster/r.coin raster/r.composite raster/r.covar
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Dec 28 07:45:01 PST 2014
Author: neteler
Date: 2014-12-28 07:45:01 -0800 (Sun, 28 Dec 2014)
New Revision: 63802
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/display/d.rgb/d.rgb.html
grass/branches/releasebranch_7_0/raster/r.coin/r.coin.html
grass/branches/releasebranch_7_0/raster/r.composite/r.composite.html
grass/branches/releasebranch_7_0/raster/r.covar/r.covar.html
Log:
manual: examples updated
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,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,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,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,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63740-63742,63744,63747-63749,63751-63752,63756,63758,63761,63767,63783,63787,63793,63798
+ /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,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,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,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,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
,63721-63727,63731,63733,63740-63742,63744,63747-63749,63751-63752,63756,63758,63761,63767,63783,63787,63793,63798,63801
Modified: grass/branches/releasebranch_7_0/display/d.rgb/d.rgb.html
===================================================================
--- grass/branches/releasebranch_7_0/display/d.rgb/d.rgb.html 2014-12-28 15:42:58 UTC (rev 63801)
+++ grass/branches/releasebranch_7_0/display/d.rgb/d.rgb.html 2014-12-28 15:45:01 UTC (rev 63802)
@@ -11,16 +11,20 @@
<em>d.rgb</em> does not attempt to quantize the combined image into a
fixed number of colors. Nor does it have an option to generate a
-composite layer.
+composite layer (see <em>r.composite</em> for that).
The image and raster maps will not display properly if the graphics
device does not have a reasonable sampling of the RGB color-space.
<p>
If color quality of satellite image color composites seems to appear
-poor, run <em><a href="r.colors.html">r.colors</a></em> on the
-selected satellite channels.<p>Example:
+poor, run <em><a href="i.colors.enhance.html">i.colors.enhance</a></em>
+on the selected satellite channels.
+<p>
+An alternative is the assignment of grey color tables to each band with
+<em><a href="r.colors.html">r.colors</a></em>:
+
<div class="code"><pre>
r.info -r image.1
@@ -33,16 +37,17 @@
r.colors map=image.3 rast=image.1
</pre></div>
-<em>Note: Future GRASS versions may do this for you automatically.</em>
-
<p>
-To write out the color composite to a R/G/B raster maps, use
+To write out the color composite to a combined R/G/B raster maps, use
<em><a href="r.composite.html">r.composite</a></em>.
<h2>EXAMPLE</h2>
+Visual color composite of a LANDSAT scene (North Carolina sample dataset):
+
<div class="code"><pre>
-d.rgb red=image.1 green=image.2 blue=image.3
+g.region raster=lsat7_2002_10 -p
+d.rgb blue=lsat7_2002_10 green=lsat7_2002_20 red=lsat7_2002_30
</pre></div>
<h2>SEE ALSO</h2>
Modified: grass/branches/releasebranch_7_0/raster/r.coin/r.coin.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.coin/r.coin.html 2014-12-28 15:42:58 UTC (rev 63801)
+++ grass/branches/releasebranch_7_0/raster/r.coin/r.coin.html 2014-12-28 15:45:01 UTC (rev 63802)
@@ -45,7 +45,6 @@
is given the option to rerun the coincidence tabulation
using a different unit of measurement.
-<p>
<h2>NOTES</h2>
It is <b>not</b> a good idea to run <em>r.coin</em> on a
@@ -56,7 +55,6 @@
into a more manageable number prior to running
<em>r.coin</em> on the reclassed raster map layer.
-<p>
<h2>EXAMPLE</h2>
Below is a sample of tabular output produced by
@@ -169,6 +167,23 @@
order to choose new map layers, it is necessary to rerun
<em>r.coin.</em>
+<!-- North Carolina sample dataset:
+
+Show percentage of each landclass for each town as well as
+the summaries:
+
+<div class="code"><pre>
+g.region raster=landclass96,towns -p
+r.cats landclass96
+r.cats towns
+r.coin -w first=landclass96 second=towns unit=p
+</pre></div>
+
+The result shows that 60% of the current region is located
+in South Raleigh, about half of the area is covered by
+forest and 30% is developed.
+-->
+
<h2>SEE ALSO</h2>
<em>
Modified: grass/branches/releasebranch_7_0/raster/r.composite/r.composite.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.composite/r.composite.html 2014-12-28 15:42:58 UTC (rev 63801)
+++ grass/branches/releasebranch_7_0/raster/r.composite/r.composite.html 2014-12-28 15:45:01 UTC (rev 63802)
@@ -4,7 +4,7 @@
composite RGB map. For each input map layer, the corresponding
component from the map's color table is used (e.g. for
the red map, the red component is used, and so on). In
-general, the maps should use a gray-scale color table.
+general, the maps should use a grey-scale color table.
<h2>NOTES</h2>
@@ -17,11 +17,24 @@
<p>Floyd-Steinberg dithering is optionally used with the <b>-d</b> flag.
-<h2>EXAMPLE</h2>
+<h2>EXAMPLES</h2>
+
+<h3>RGB composite of three satellite bands</h3>
+
+Color composite of a LANDSAT scene (North Carolina sample dataset):
+
+<div class="code"><pre>
+g.region raster=lsat7_2002_10
+r.composite blue=lsat7_2002_10 green=lsat7_2002_20 red=lsat7_2002_30 \
+ output=lsat7_2002_rgb
+</pre></div>
+
+<h3>RGB composite with dithering</h3>
Creating a composite RGB raster using 32 color levels per layer, with dithering:
<div class="code"><pre>
-r.composite -d red=elevation.r green=elevation.g blue=elevation.b output=elev.composite
+r.composite -d red=elevation.r green=elevation.g blue=elevation.b \
+ output=elev.composite
</pre></div>
<h2>SEE ALSO</h2>
@@ -31,7 +44,7 @@
<a href="d.rgb.html">d.rgb</a>,
<a href="r.blend.html">r.blend</a>,
<a href="r.colors.html">r.colors</a>,
-<a href="r.rgb.html">r.rgb</a>,
+<a href="r.rgb.html">r.rgb</a>
</em>
<p><em>
<a href="http://en.wikipedia.org/wiki/Floyd-Steinberg_dithering">Wikipedia Entry: Floyd-Steinberg dithering</a>
Modified: grass/branches/releasebranch_7_0/raster/r.covar/r.covar.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.covar/r.covar.html 2014-12-28 15:42:58 UTC (rev 63801)
+++ grass/branches/releasebranch_7_0/raster/r.covar/r.covar.html 2014-12-28 15:45:01 UTC (rev 63802)
@@ -17,18 +17,27 @@
N real eigen values and N eigen vectors (each composed of N real numbers).
<p>
-The module <em><a href="http://grasswiki.osgeo.org/wiki/AddOns/GRASS_6#m.eigensystem">m.eigensystem</a></em>
+The module <em><a href="http://grasswiki.osgeo.org/wiki/AddOns/GRASS_7/misc#m.eigensystem">m.eigensystem</a></em>
in <a href="http://grass.osgeo.org/download/addons/">GRASS GIS Addons</a>
can be compiled and used to generate the eigen values and vectors.
<h2>EXAMPLE</h2>
+<!--
+For example (North Carolina sample dataset),
+
+<div class="code"><pre>
+g.region raster=elev_ned_30m -p
+r.covar -r map=elevation,elev_ned_30m,elev_srtm_30m
+</pre></div>
+-->
+
For example,
-<dl>
-<dd>
-<b>r.covar</b> map=<em>layer.1</em>,<em>layer.2</em>,<em>layer.3</em>
-</dl>
+<div class="code"><pre>
+g.region raster=layer.1 -p
+r.covar -r map=layer.1,layer.2,layer.3
+</pre></div>
would produce a 3x3 matrix (values are example only):
@@ -43,23 +52,20 @@
<div class="code"><pre>
component eigen value eigen vector
- 1 1159.745202 < 0.691002 0.720528 0.480511 >
- 2 5.970541 < 0.711939 -0.635820 -0.070394 >
- 3 146.503197 < 0.226584 0.347470 -0.846873 >
+ 1 1159.745202 <0.691002 0.720528 0.480511>
+ 2 5.970541 <0.711939 -0.635820 -0.070394>
+ 3 146.503197 <0.226584 0.347470 -0.846873>
</pre></div>
The component corresponding to each vector can be produced using
<em><a href="r.mapcalc.html">r.mapcalc</a></em>
as follows:
-<dl>
-<dd>
-<b>r.mapcalc</b> 'pc.1 = 0.691002*layer.1 + 0.720528*layer.2 + 0.480511*layer.3'
-<br>
-<b>r.mapcalc</b> 'pc.2 = 0.711939*layer.1 - 0.635820*layer.2 - 0.070394*layer.3'
-<br>
-<b>r.mapcalc</b> 'pc.3 = 0.226584*layer.1 + 0.347470*layer.2 - 0.846873*layer.3'
-</dl>
+<div class="code"><pre>
+r.mapcalc "pc.1 = 0.691002*layer.1 + 0.720528*layer.2 + 0.480511*layer.3"
+r.mapcalc "pc.2 = 0.711939*layer.1 - 0.635820*layer.2 - 0.070394*layer.3"
+r.mapcalc "pc.3 = 0.226584*layer.1 + 0.347470*layer.2 - 0.846873*layer.3"
+</pre></div>
Note that based on the relative sizes of the eigen values,
<em>pc.1</em>
@@ -80,10 +86,12 @@
<h2>SEE ALSO</h2>
-<em><a href="i.pca.html">i.pca</a></em>,
-<em><a href="m.eigensystem.html">m.eigensystem</a></em>,
-<em><a href="r.mapcalc.html">r.mapcalc</a></em>,
-<em><a href="r.rescale.html">r.rescale</a></em>
+<em>
+<a href="i.pca.html">i.pca</a>,
+<a href="m.eigensystem.html">m.eigensystem</a> (Addon),
+<a href="r.mapcalc.html">r.mapcalc</a>,
+<a href="r.rescale.html">r.rescale</a>
+</em>
<h2>AUTHOR</h2>
More information about the grass-commit
mailing list