[GRASS-SVN] r34755 - in grass/trunk: lib/vector/Vlib vector/v.select

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-12-06 14:01:34 -0500 (Sat, 06 Dec 2008)
New Revision: 34755

Modified:
   grass/trunk/lib/vector/Vlib/sindex.c
   grass/trunk/vector/v.select/main.c
Log:
v.select: message cosmetics
	  (merge from devbr6, r34754)


Modified: grass/trunk/lib/vector/Vlib/sindex.c
===================================================================
--- grass/trunk/lib/vector/Vlib/sindex.c	2008-12-06 19:00:29 UTC (rev 34754)
+++ grass/trunk/lib/vector/Vlib/sindex.c	2008-12-06 19:01:34 UTC (rev 34755)
@@ -161,8 +161,6 @@
 
     /* Nodes */
     for (i = 1; i <= plus->n_nodes; i++) {
-	G_percent(i, total, 1);
-
 	Node = plus->Node[i];
 	if (!Node)
 	    G_fatal_error(_("BUG (Vect_build_sidx_from_topo): node does not exist"));
@@ -173,8 +171,6 @@
     /* Lines */
     done = plus->n_nodes;
     for (i = 1; i <= plus->n_lines; i++) {
-	G_percent(done + i, total, 1);
-
 	Line = plus->Line[i];
 	if (!Line)
 	    G_fatal_error(_("BUG (Vect_build_sidx_from_topo): line does not exist"));
@@ -192,8 +188,6 @@
     /* Areas */
     done += plus->n_lines;
     for (i = 1; i <= plus->n_areas; i++) {
-	G_percent(done + i, total, 1);
-
 	Area = plus->Area[i];
 	if (!Area)
 	    G_fatal_error(_("BUG (Vect_build_sidx_from_topo): area does not exist"));
@@ -211,8 +205,6 @@
     /* Isles */
     done += plus->n_areas;
     for (i = 1; i <= plus->n_isles; i++) {
-	G_percent(done + i, total, 1);
-
 	Isle = plus->Isle[i];
 	if (!Isle)
 	    G_fatal_error(_("BUG (Vect_build_sidx_from_topo): isle does not exist"));

Modified: grass/trunk/vector/v.select/main.c
===================================================================
--- grass/trunk/vector/v.select/main.c	2008-12-06 19:00:29 UTC (rev 34754)
+++ grass/trunk/vector/v.select/main.c	2008-12-06 19:01:34 UTC (rev 34755)
@@ -220,7 +220,7 @@
 
     /* Lines in A. Go through all lines and mark those that meets condition */
     if (type[0] & (GV_POINTS | GV_LINES)) {
-	G_message(_("Processing vector features..."));
+	G_message(_("Processing features..."));
 	
 	for (aline = 1; aline <= nalines; aline++) {
 	    BOUND_BOX abox;
@@ -300,7 +300,7 @@
     if (type[0] & GV_AREA) {
 	int aarea, naareas;
 
-	G_message(_("Processing vector areas..."));
+	G_message(_("Processing areas..."));
 	
 	naareas = Vect_get_num_areas(&(In[0]));
 
@@ -308,7 +308,7 @@
 	    int i;
 	    BOUND_BOX abox;
 
-	    G_percent(aarea, naareas, 1);	/* must be before any continue */
+	    G_percent(aarea, naareas, 2);	/* must be before any continue */
 
 	    if (Vect_get_area_cat(&(In[0]), aarea, field[0]) < 0)
 		continue;
@@ -420,11 +420,14 @@
 			    sizeof(int));
 	fields[i] = Vect_cidx_get_field_number(&(In[0]), i);
     }
+
+    G_message(_("Writing selected features..."));
     for (aline = 1; aline <= nalines; aline++) {
 	int atype;
 
 	G_debug(4, "aline = %d ALines[aline] = %d", aline, ALines[aline]);
-
+	G_percent(aline, nalines, 2);
+	
 	if (!(ALines[aline]))
 	    continue;
 
@@ -451,7 +454,7 @@
     if (!(table_flag->answer)) {
 	int ttype, ntabs = 0;
 
-	G_verbose_message(_("Writing attributes..."));
+	G_message(_("Writing attributes..."));
 
 	/* Number of output tabs */
 	for (i = 0; i < Vect_get_num_dblinks(&(In[0])); i++) {