[GRASS-SVN] r43377 - grass-addons/raster/r.seg

[svn_grass at osgeo.org]

Author: neteler
Date: 2010-09-01 12:44:59 +0000 (Wed, 01 Sep 2010)
New Revision: 43377

Modified:
   grass-addons/raster/r.seg/description.html
   grass-addons/raster/r.seg/main.c
Log:
message cosmetics

Modified: grass-addons/raster/r.seg/description.html
===================================================================
--- grass-addons/raster/r.seg/description.html	2010-09-01 09:56:35 UTC (rev 43376)
+++ grass-addons/raster/r.seg/description.html	2010-09-01 12:44:59 UTC (rev 43377)
@@ -27,7 +27,7 @@
 a MASK is present, the module stops after just one iteration.
 <br><br>
 
-Replace (r.null) any null data with the map average value (r.univar).
+Replace (<em>r.null</em>) any null data with the map average value (get with <em>r.univar</em>).
 <br><br>
 
 The segmentation depends on the parameters alpha and lambda:
@@ -95,34 +95,34 @@
 <div><pre class="code">
 # set the region to match the <em>ortho_2001_t792_1m</em> raster map:
 g.region rast=ortho_2001_t792_1m
-#
+
 # select a smaller region:
 g.region n=221725 s=220225 w=638350 e=639550
-#
+
 # run r.seg:
 r.seg in_g=ortho_2001_t792_1m at PERMANENT out_u=u_OF out_z=z_OF lambda=10 alpha=200 mxi=250
-#
+
 # for a better visualization of the output raster map <em>u_OF</em>, set its color table to:
 r.colors u_OF rast=ortho_2001_t792_1m
-#
+
 # compute the difference between the input raster map and the output raster map <em>u_OF</em>:
 r.mapcalc 'abs(ortho_2001_t792_1m at PERMANENT-u_OF)'
-#
+
 # for a better visualization of the differences, compute the natural logarithm of the <em>diff</em> map:
 r.mapcalc 'log_diff=log(1+diff)'
-#
+
 # and set its color table to the "differences" style:
 r.colors log_diff c=differences
-#
+
 # for a better visualization of the output raster map <em>u_OF</em>, set its color table to:
 r.colors z_OF c=bgyr
-#
+
 # run r.seg with different parameter values:
 r.seg in_g=ortho_2001_t792_1m at PERMANENT out_u=u1_OF out_z=z1_OF lambda=10 alpha=65 mxi=250
 r.seg in_g=ortho_2001_t792_1m at PERMANENT out_u=u2_OF out_z=z2_OF lambda=10 alpha=600 mxi=250
 r.seg in_g=ortho_2001_t792_1m at PERMANENT out_u=u3_OF out_z=z3_OF lambda=0.1 alpha=200 mxi=250
 r.seg in_g=ortho_2001_t792_1m at PERMANENT out_u=u4_OF out_z=z4_OF lambda=1 alpha=200 mxi=250
-#
+
 # visualize and compare the different results
 </pre></div>
 
@@ -144,16 +144,18 @@
 
 
 <h2>SEE ALSO</h2>
+
+<em><a href="i.smap.html">i.smap</a></em>,
 <em><a href="i.zc.html">i.zc</a></em>,
 <em><a href="r.mfilter.html">r.mfilter</a></em>
 
 
 <h2>AUTHOR</h2>
+
 Alfonso Vitti <br> 
 &nbsp; Dept. Civil and
 Environmental Engineering <br> 
 &nbsp; University of Trento - Italy<br>
 &nbsp; alfonso.vitti [at] ing.unitn.it
 
-<p><i>Last changed: $Date: 2010-08-10 12:00:00 +0200 (Tue, 10 Aug
-2010)$</i>
+<p><i>Last changed: $Date: 2010-08-10 12:00:00 +0200 (Tue, 10 Aug 2010)$</i>

Modified: grass-addons/raster/r.seg/main.c
===================================================================
--- grass-addons/raster/r.seg/main.c	2010-09-01 09:56:35 UTC (rev 43376)
+++ grass-addons/raster/r.seg/main.c	2010-09-01 12:44:59 UTC (rev 43377)
@@ -73,8 +73,7 @@
     module = G_define_module();
     module->keywords = _("image segmentation, edge detection, smooth");
     module->description =
-	_
-	("Generates a smooth approximation of the input raster and a discontinuity map");
+	_("Generates a smooth approximation of the input raster and a discontinuity map");
 
     parm.in_g = G_define_option();
     parm.in_g->key = "in_g";
@@ -103,14 +102,14 @@
     opts.lambda->type = TYPE_DOUBLE;
     opts.lambda->required = NO;
     opts.lambda->answer = "1.0";
-    opts.lambda->description = _("lambda ___ smoothness coefficient [>0]");
+    opts.lambda->description = _("Smoothness coefficient [>0]");
 
     opts.alpha = G_define_option();
     opts.alpha->key = "alpha";
     opts.alpha->type = TYPE_DOUBLE;
     opts.alpha->required = NO;
     opts.alpha->answer = "1.0";
-    opts.alpha->description = _("alpha ___ discontinuity coefficient [>0]");
+    opts.alpha->description = _("Discontinuity coefficient [>0]");
 
     opts.max_iter = G_define_option();
     opts.max_iter->key = "mxi";
@@ -118,14 +117,14 @@
     opts.max_iter->required = NO;
     opts.max_iter->answer = "100";
     opts.max_iter->description =
-	_("mxi ___ max number of numerical iterations");
+	_("Maximal number of numerical iterations");
 
     opts.tol = G_define_option();
     opts.tol->key = "tol";
     opts.tol->type = TYPE_DOUBLE;
     opts.tol->required = NO;
     opts.tol->answer = "0.001";
-    opts.tol->description = _("tol ___ convergence tolerance [>0]");
+    opts.tol->description = _("Convergence tolerance [>0]");
 
     opts.kepsilon = G_define_option();
     opts.kepsilon->key = "kepsilon";
@@ -133,14 +132,14 @@
     opts.kepsilon->required = NO;
     opts.kepsilon->answer = "1.0";
     opts.kepsilon->description =
-	_("kepsilon ___ discontinuity thickness [>0]");
+	_("Discontinuity thickness [>0]");
 
     opts.beta = G_define_option();
     opts.beta->key = "beta";
     opts.beta->type = TYPE_DOUBLE;
     opts.beta->required = NO;
     opts.beta->answer = "0.0";
-    opts.beta->description = _("beta ___ curvature coefficient [>=0]");
+    opts.beta->description = _("Curvature coefficient [>=0]");
     /* 
      * beta = 0 leads to MS
      * beta > 0 leads to MSK
@@ -151,7 +150,7 @@
 
     flag_k = G_define_flag();
     flag_k->key = 'k';
-    flag_k->description = _("Activate MSK");
+    flag_k->description = _("Activate MSK model (Mumford-Shah with curvature term)");
 
 
     /* parameters and flags parser */