Просмотр исходного кода

v.to.points: G_percent() moved to the end of the loop (merge devbr6, https://trac.osgeo.org/grass/changeset/31686)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@31687 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 17 лет назад
Родитель
Сommit
11f21ed474
1 измененных файлов с 2 добавлено и 4 удалено
  1. 2 4
      vector/v.to.points/main.c

+ 2 - 4
vector/v.to.points/main.c

@@ -294,8 +294,6 @@ int main(int argc, char **argv)
 	    
 	    
 	    G_debug ( 3, "line = %d", line );
 	    G_debug ( 3, "line = %d", line );
 
 
-	    G_percent(line, nlines, 2);
-
 	    ltype = Vect_read_line (&In, LPoints, LCats, line);
 	    ltype = Vect_read_line (&In, LPoints, LCats, line);
 	    if ( !(ltype & type ) ) continue;
 	    if ( !(ltype & type ) ) continue;
 
 
@@ -307,6 +305,7 @@ int main(int argc, char **argv)
                 write_line ( &Out, LPoints, cat, vertex_type, inter_flag->answer, 
                 write_line ( &Out, LPoints, cat, vertex_type, inter_flag->answer, 
 			     dmax, table_flag->answer );
 			     dmax, table_flag->answer );
 	    }
 	    }
+	    G_percent(line, nlines, 2);
 	}
 	}
     }
     }
 
 
@@ -317,8 +316,6 @@ int main(int argc, char **argv)
 	for ( area = 1; area <= nareas; area++ ) {
 	for ( area = 1; area <= nareas; area++ ) {
 	    int i, isle, nisles;
 	    int i, isle, nisles;
 
 
-	    G_percent(area, nareas, 2);
-	    
 	    centroid = Vect_get_area_centroid ( &In, area );
 	    centroid = Vect_get_area_centroid ( &In, area );
 	    cat = -1;
 	    cat = -1;
 	    if ( centroid > 0 ) {
 	    if ( centroid > 0 ) {
@@ -340,6 +337,7 @@ int main(int argc, char **argv)
 		write_line ( &Out, LPoints, cat, vertex_type, inter_flag->answer, 
 		write_line ( &Out, LPoints, cat, vertex_type, inter_flag->answer, 
 			     dmax, table_flag->answer );
 			     dmax, table_flag->answer );
 	    }
 	    }
+	    G_percent(area, nareas, 2);
 	}
 	}
     }	
     }