[GRASS-SVN] r32770 - grass/branches/develbranch_6/lib/vector/vedit

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-08-14 14:12:02 -0400 (Thu, 14 Aug 2008)
New Revision: 32770

Modified:
   grass/branches/develbranch_6/lib/vector/vedit/break.c
Log:
revert accidentally comitted changes r32769 (wxGUI left for future updates) - sorry, my fault!


Modified: grass/branches/develbranch_6/lib/vector/vedit/break.c
===================================================================
--- grass/branches/develbranch_6/lib/vector/vedit/break.c	2008-08-14 18:06:43 UTC (rev 32769)
+++ grass/branches/develbranch_6/lib/vector/vedit/break.c	2008-08-14 18:12:02 UTC (rev 32770)
@@ -152,16 +152,12 @@
 			double thresh)
 {
     int nlines_modified;
-    int i, j, k, node[2], n_nodes;
+    int i, j, node[2], n_nodes;
     int line, found;
     double x, y, z;
 
-    struct ilist *List_found;
-
     nlines_modified = 0;
 
-    List_found = Vect_new_list();
-
     /* collect lines to be modified */
     for (i = 0; i < List->n_values; i++) {
 	line = List->value[i];
@@ -179,18 +175,9 @@
 	for (j = 0; j < n_nodes; j++) {
 	    /* for each line node find lines in threshold */
 	    Vect_get_node_coor(Map, node[j], &x, &y, &z);
-	    Vect_find_line_list(Map, x, y, z,
-				GV_LINES, thresh, WITHOUT_Z,
-				NULL, List_found);
+	    found = Vect_find_line(Map, x, y, z,
+				   GV_LINES, thresh, WITHOUT_Z, line);
 
-	    found = 0;
-	    /* connect only selected lines */
-	    for (k = 0; k < List_found->n_values && !found; k++) {
-		if (List_found->value[k] != line &&
-		    Vect_val_in_list(List, List_found->value[k]))
-		    found = List_found->value[k];
-	    }
-
 	    if (found > 0 && Vect_line_alive(Map, found)) {
 		/* try to connect lines (given node) */
 		G_debug(3, "Vedit_connect_lines(): lines=%d,%d", line, found);
@@ -203,8 +190,6 @@
 	}
     }
 
-    Vect_destroy_list(List_found);
-
     return nlines_modified;
 }