[GRASS-SVN] r43613 - grass/branches/releasebranch_6_4/vector/v.delaunay2

[svn_grass at osgeo.org]

Author: neteler
Date: 2010-09-22 13:55:55 +0000 (Wed, 22 Sep 2010)
New Revision: 43613

Removed:
   grass/branches/releasebranch_6_4/vector/v.delaunay2/v_delaunay_spearfish60_archsites.png
Modified:
   grass/branches/releasebranch_6_4/vector/v.delaunay2/description.html
   grass/branches/releasebranch_6_4/vector/v.delaunay2/main.c
Log:
backport example update

Modified: grass/branches/releasebranch_6_4/vector/v.delaunay2/description.html
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.delaunay2/description.html	2010-09-22 13:49:52 UTC (rev 43612)
+++ grass/branches/releasebranch_6_4/vector/v.delaunay2/description.html	2010-09-22 13:55:55 UTC (rev 43613)
@@ -5,12 +5,13 @@
 <P>
 
 <BR>
-Delaunay triangulation example:
+Delaunay triangulation and Voronoi diagram example:
 <center>
-<img src=v_delaunay_spearfish60_archsites.png border=1><BR>
+<img src=v_voronoi_delaunay.png border=1><BR>  <!-- installed by v.voronoi -->
 <table border=0 width=590>
 <tr><td><center>
-<i>Delaunay Triangulation</i>
+<i>Delaunay Triangulation (left pane), Voronoi diagram (center pane),
+and both (right pane)</i>
 </center></td></tr>
 </table>
 </center>
@@ -20,9 +21,25 @@
 
 Commands used with the Spearfish dataset to create the above figure.
 <div class="code"><pre>
-  g.region n=4927250 s=4920000 w=588650 e=605850
+  g.region n=4927250 s=4919400 w=588650 e=594850
+  d.frame -c fr=one at=0,100,0,33.3333
+  d.frame -c fr=two at=0,100,33.3333,66.6667
+  d.frame -c fr=three at=0,100,66.6667,100
+
   v.delaunay -lr in=archsites out=arch_delaunay
-  d.vect map=arch_delaunay color=0:0:255
+  d.frame -s one
+  d.vect arch_delaunay
+  d.vect archsites color=red fcolor=red size=5 icon=basic/circle
+
+  v.voronoi -l in=archsites out=arch_voronoi
+  d.frame -s two
+  d.vect arch_voronoi type=line
+  d.vect archsites color=red fcolor=red size=5 icon=basic/circle
+
+  d.frame -s three
+  d.vect arch_voronoi type=line
+  d.vect arch_delaunay color=blue
+  d.vect archsites color=red fcolor=red size=5 icon=basic/circle
 </pre></div>
 
 

Modified: grass/branches/releasebranch_6_4/vector/v.delaunay2/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.delaunay2/main.c	2010-09-22 13:49:52 UTC (rev 43612)
+++ grass/branches/releasebranch_6_4/vector/v.delaunay2/main.c	2010-09-22 13:55:55 UTC (rev 43613)
@@ -157,7 +157,7 @@
     if (Type == GV_BOUNDARY) {
 	Vect_build_partial(&Out, GV_BUILD_AREAS);
 	nareas = Vect_get_num_areas(&Out);
-	G_debug(1, "nareas = %d", nareas);
+	G_debug(3, "nareas = %d", nareas);
 	/*  assign centroid to each area */
 	G_verbose_message(_("Calculate area centroids..."));
 	for (area = 1; area <= nareas; area++) {

Deleted: grass/branches/releasebranch_6_4/vector/v.delaunay2/v_delaunay_spearfish60_archsites.png
===================================================================
(Binary files differ)