[GRASS-SVN] r36489 - grass/trunk/vector/v.clean

[svn_grass at osgeo.org]

Author: mmetz
Date: 2009-03-26 14:09:22 -0400 (Thu, 26 Mar 2009)
New Revision: 36489

Modified:
   grass/trunk/vector/v.clean/main.c
   grass/trunk/vector/v.clean/rmdac.c
   grass/trunk/vector/v.clean/rmline.c
Log:
cosmetics and faster rmline tool

Modified: grass/trunk/vector/v.clean/main.c
===================================================================
--- grass/trunk/vector/v.clean/main.c	2009-03-26 12:49:20 UTC (rev 36488)
+++ grass/trunk/vector/v.clean/main.c	2009-03-26 18:09:22 UTC (rev 36489)
@@ -284,6 +284,7 @@
 	    tools[i] == TOOL_RMAREA) {
 	    if (Vect_get_built(&Out) >= GV_BUILD_CENTROIDS) {
 		Vect_build_partial(&Out, GV_BUILD_CENTROIDS);
+		G_message(SEP);
 	    }
 	    else {
 		G_important_message(_("Rebuilding parts of topology..."));
@@ -294,6 +295,7 @@
 	else {
 	    if (Vect_get_built(&Out) >= GV_BUILD_BASE) {
 		Vect_build_partial(&Out, GV_BUILD_BASE);
+		G_message(SEP);
 	    }
 	    else {
 		G_important_message(_("Rebuilding parts of topology..."));

Modified: grass/trunk/vector/v.clean/rmdac.c
===================================================================
--- grass/trunk/vector/v.clean/rmdac.c	2009-03-26 12:49:20 UTC (rev 36488)
+++ grass/trunk/vector/v.clean/rmdac.c	2009-03-26 18:09:22 UTC (rev 36489)
@@ -38,6 +38,7 @@
 	fprintf(stderr, _("Duplicate area centroids: %5d"), ndupl);
 
     for (i = 1; i <= nlines; i++) {
+	G_percent(i, nlines, 2);
 	if (!Vect_line_alive(Out, i))
 	    continue;
 

Modified: grass/trunk/vector/v.clean/rmline.c
===================================================================
--- grass/trunk/vector/v.clean/rmline.c	2009-03-26 12:49:20 UTC (rev 36488)
+++ grass/trunk/vector/v.clean/rmline.c	2009-03-26 18:09:22 UTC (rev 36489)
@@ -37,6 +37,7 @@
     G_debug(1, "nlines =  %d", nlines);
 
     for (line = 1; line <= nlines; line++) {
+	G_percent(line, nlines, 2);
 	if (!Vect_line_alive(Map, line))
 	    continue;
 
@@ -45,7 +46,7 @@
 	if (!((type & GV_LINES) && (type & otype)))
 	    continue;
 
-	if (Vect_line_length(Points) > 0.0)
+	if (Vect_line_prune(Points) > 1)
 	    continue;
 
 	Vect_delete_line(Map, line);