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

add back G_percent() which was removed circa r34754. The fn can minutes to complete. (merge from devbr6)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@35947 15284696-431f-4ddb-bdfa-cd5b030d7da7
Hamish Bowman 16 лет назад
Родитель
Сommit
ab56d3e530
1 измененных файлов с 8 добавлено и 0 удалено
  1. 8 0
      lib/vector/Vlib/sindex.c

+ 8 - 0
lib/vector/Vlib/sindex.c

@@ -161,6 +161,8 @@ int Vect_build_sidx_from_topo(struct Map_info *Map)
 
 
     /* Nodes */
     /* Nodes */
     for (i = 1; i <= plus->n_nodes; i++) {
     for (i = 1; i <= plus->n_nodes; i++) {
+	G_percent(i, total, 3);
+
 	Node = plus->Node[i];
 	Node = plus->Node[i];
 	if (!Node)
 	if (!Node)
 	    G_fatal_error(_("BUG (Vect_build_sidx_from_topo): node does not exist"));
 	    G_fatal_error(_("BUG (Vect_build_sidx_from_topo): node does not exist"));
@@ -171,6 +173,8 @@ int Vect_build_sidx_from_topo(struct Map_info *Map)
     /* Lines */
     /* Lines */
     done = plus->n_nodes;
     done = plus->n_nodes;
     for (i = 1; i <= plus->n_lines; i++) {
     for (i = 1; i <= plus->n_lines; i++) {
+	G_percent(done + i, total, 3);
+
 	Line = plus->Line[i];
 	Line = plus->Line[i];
 	if (!Line)
 	if (!Line)
 	    G_fatal_error(_("BUG (Vect_build_sidx_from_topo): line does not exist"));
 	    G_fatal_error(_("BUG (Vect_build_sidx_from_topo): line does not exist"));
@@ -188,6 +192,8 @@ int Vect_build_sidx_from_topo(struct Map_info *Map)
     /* Areas */
     /* Areas */
     done += plus->n_lines;
     done += plus->n_lines;
     for (i = 1; i <= plus->n_areas; i++) {
     for (i = 1; i <= plus->n_areas; i++) {
+	G_percent(done + i, total, 3);
+
 	Area = plus->Area[i];
 	Area = plus->Area[i];
 	if (!Area)
 	if (!Area)
 	    G_fatal_error(_("BUG (Vect_build_sidx_from_topo): area does not exist"));
 	    G_fatal_error(_("BUG (Vect_build_sidx_from_topo): area does not exist"));
@@ -205,6 +211,8 @@ int Vect_build_sidx_from_topo(struct Map_info *Map)
     /* Isles */
     /* Isles */
     done += plus->n_areas;
     done += plus->n_areas;
     for (i = 1; i <= plus->n_isles; i++) {
     for (i = 1; i <= plus->n_isles; i++) {
+	G_percent(done + i, total, 3);
+
 	Isle = plus->Isle[i];
 	Isle = plus->Isle[i];
 	if (!Isle)
 	if (!Isle)
 	    G_fatal_error(_("BUG (Vect_build_sidx_from_topo): isle does not exist"));
 	    G_fatal_error(_("BUG (Vect_build_sidx_from_topo): isle does not exist"));