[GRASS-SVN] r63637 - in grass/branches/releasebranch_7_0: . imagery/i.cluster imagery/i.maxlik raster/r.surf.fractal vector/v.random

svn_grass at osgeo.org svn_grass at osgeo.org
Fri Dec 19 21:05:23 PST 2014 

Author: wenzeslaus
Date: 2014-12-19 21:05:23 -0800 (Fri, 19 Dec 2014)
New Revision: 63637

Added:
   grass/branches/releasebranch_7_0/imagery/i.maxlik/i_maxlik_classes.png
   grass/branches/releasebranch_7_0/raster/r.surf.fractal/r_surf_fractal_simple.png
   grass/branches/releasebranch_7_0/vector/v.random/vrandom_z.png
Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/imagery/i.cluster/i.cluster.html
   grass/branches/releasebranch_7_0/imagery/i.maxlik/i.maxlik.html
   grass/branches/releasebranch_7_0/raster/r.surf.fractal/r.surf.fractal.html
   grass/branches/releasebranch_7_0/vector/v.random/v.random.html
Log:
improve examples, add images (backport of r62751, r63389, and r63402)


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,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,63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63379,63391,63393,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,63616,63624,63626,63628,63630,63634
   + /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,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,63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,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,63616,63624,63626,63628,63630,63634

Modified: grass/branches/releasebranch_7_0/imagery/i.cluster/i.cluster.html
===================================================================
--- grass/branches/releasebranch_7_0/imagery/i.cluster/i.cluster.html	2014-12-20 04:56:06 UTC (rev 63636)
+++ grass/branches/releasebranch_7_0/imagery/i.cluster/i.cluster.html	2014-12-20 05:05:23 UTC (rev 63637)
@@ -222,19 +222,24 @@
 g.region raster=lsat7_2002_10 -p
 
 # store VIZ, NIR, MIR into group/subgroup
-i.group group=my_lsat7_2002 subgroup=my_lsat7_2002 \
+i.group group=lsat7_2002 subgroup=lsat7_2002 \
   input=lsat7_2002_10,lsat7_2002_20,lsat7_2002_30,lsat7_2002_40,lsat7_2002_50,lsat7_2002_70
 
 i.cluster group=my_lsat7_2002 subgroup=my_lsat7_2002 \
-  signaturefile=sig_clust_lsat2002 \
+  signaturefile=sig_cluster_lsat2002 \
   classes=10 report=rep_clust_lsat2002.txt
 </pre></div>
 
 To complete the unsupervised classification, <em>i.maxlik</em> is subsequently used.
+See example in its manual page.
 
 <h2>SEE ALSO</h2>
 
-The GRASS GIS 4 <em>
+<a href="http://grasswiki.osgeo.org/wiki/Image_processing">Image processing</a>
+and
+<a href="http://grasswiki.osgeo.org/wiki/Image_classification">Image classification</a>
+wiki pages and for historical reference also
+the GRASS GIS 4<em>
 <a href="http://grass.osgeo.org/gdp/imagery/grass4_image_processing.pdf">Image
 Processing manual</a></em>
 

Modified: grass/branches/releasebranch_7_0/imagery/i.maxlik/i.maxlik.html
===================================================================
--- grass/branches/releasebranch_7_0/imagery/i.maxlik/i.maxlik.html	2014-12-20 04:56:06 UTC (rev 63636)
+++ grass/branches/releasebranch_7_0/imagery/i.maxlik/i.maxlik.html	2014-12-20 05:05:23 UTC (rev 63637)
@@ -83,19 +83,41 @@
 (see <em><a href="i.cluster.html">i.cluster</a></em> manual page for the first part):
 
 <div class="code"><pre>
-i.maxlik group=my_lsat7_2002 subgroup=my_lsat7_2002 \
-  signaturefile=sig_clust_lsat2002 \
-  class=lsat7_2002_clust_classes reject=lsat7_2002_clust_classes.rej
+i.maxlik group=lsat7_2002 subgroup=lsat7_2002 \
+  signaturefile=sig_cluster_lsat2002 \
+  output=lsat7_2002_cluster_classes reject=lsat7_2002_cluster_reject
 
-# Visually check result
+# visually check result
 d.mon wx0
-d.rast.leg lsat7_2002_clust_classes
-d.rast.leg lsat7_2002_clust_classes.rej
+d.rast.leg lsat7_2002_cluster_classes
+d.rast.leg lsat7_2002_cluster_reject
+
+# see how many pixels were rejected at given levels
+r.report lsat7_2002_cluster_reject units=k,p
+
+# optionally, filter out pixels with high level of rejection
+# here we select 90% which is category 12
+r.mapcalc "lsat7_2002_cluster_classes_filtered = if(lsat7_2002_cluster_reject < 12, lsat7_2002_cluster_classes, null())"
 </pre></div>
 
+<!--
+saved using d.mon wx0; d.rast lsat7_2002_cluster_classes; and save
+then trimmed using mogrify -trim *.png
+-->
+<p>
+<center>
+<img src="i_maxlik_classes.png"><br>
+Resulting raster with classified pixels
+</center>
+
+
 <h2>SEE ALSO</h2>
 
-The GRASS GIS 4 <em>
+<a href="http://grasswiki.osgeo.org/wiki/Image_processing">Image processing</a>
+and
+<a href="http://grasswiki.osgeo.org/wiki/Image_classification">Image classification</a>
+wiki pages and for historical reference also
+the GRASS GIS 4<em>
 <a href="http://grass.osgeo.org/gdp/imagery/grass4_image_processing.pdf">Image
 Processing manual</a></em>
 

Copied: grass/branches/releasebranch_7_0/imagery/i.maxlik/i_maxlik_classes.png (from rev 62751, grass/trunk/imagery/i.maxlik/i_maxlik_classes.png)
===================================================================
(Binary files differ)

Modified: grass/branches/releasebranch_7_0/raster/r.surf.fractal/r.surf.fractal.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.surf.fractal/r.surf.fractal.html	2014-12-20 04:56:06 UTC (rev 63636)
+++ grass/branches/releasebranch_7_0/raster/r.surf.fractal/r.surf.fractal.html	2014-12-20 05:05:23 UTC (rev 63637)
@@ -15,7 +15,36 @@
 
 <h2>EXAMPLE</h2>
 
+Generate surface using fractals in selected region, set color table and
+display with shade.
+
 <div class="code"><pre>
+g.region rast=elevation
+
+r.surf.fractal output=fractals
+
+r.colors map=fractals color=byr
+r.relief input=fractals output=fractals_shade
+
+d.mon wx0
+d.shade relief=fractals_shade drape=fractals b=50
+</pre></div>
+
+<center>
+<img src="r_surf_fractal_simple.png" alt="Artificial surface created with fractals"><br>
+Artificial surface created with fractals<br>
+</center>
+
+<!--
+# leave out d.mon wx0 when generating image
+mogrify -trim map.png
+optipng -o5 map.png
+mv map.png r_surf_fractal_simple.png
+-->
+
+Compare results when using different fractal dimensions:
+
+<div class="code"><pre>
 # D=2.0005
 g.region -dp
 r.surf.fractal out=dem_d2_0005 dim=2.0005

Copied: grass/branches/releasebranch_7_0/raster/r.surf.fractal/r_surf_fractal_simple.png (from rev 63402, grass/trunk/raster/r.surf.fractal/r_surf_fractal_simple.png)
===================================================================
(Binary files differ)

Modified: grass/branches/releasebranch_7_0/vector/v.random/v.random.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.random/v.random.html	2014-12-20 04:56:06 UTC (rev 63636)
+++ grass/branches/releasebranch_7_0/vector/v.random/v.random.html	2014-12-20 05:05:23 UTC (rev 63637)
@@ -35,11 +35,25 @@
 v.random output=binary_random npoints=20 zmin=0 zmax=1 column='binary INTEGER'
 </pre></div>
 
-Generate 20 random 3d points with height attribute [0:20] and specific random seed:
+Generate 20 random 3D points using a specific random seed:
 <div class="code"><pre>
-v.random seed=501 output=height_random n=20 zmin=0 zmax=1 column=height
+v.random seed=52 output=height_random npoints=40 zmin=110 zmax=170 -z
 </pre></div>
 
+<p>
+<center>
+<img src="vrandom_z.png"><br>
+Random points with different X, Y, and Z coordinates
+</center>
+
+<!--
+g.region rast=elev_lid792_1m
+...
+d.vect height_random color=60:60:60 icon=basic/point size=40 width=2 zcolor=gyr
+optipng -o5 map.png
+mv map.png vrandom_z.png
+-->
+
 Get 20 random samples from raster map:
 <div class="code"><pre>
 g.region -p raster=elevation

Copied: grass/branches/releasebranch_7_0/vector/v.random/vrandom_z.png (from rev 63389, grass/trunk/vector/v.random/vrandom_z.png)
===================================================================
(Binary files differ)

More information about the grass-commit mailing list