Changeset 66422

Timestamp:

Oct 6, 2015, 7:30:18 AM (9 years ago)

Author:

martinl

Message:

v.mkgrid: finish progress (G_percent) info, be less verbose about progress

Location:

grass/trunk/vector/v.mkgrid

Files:

• main.c (modified) (3 diffs)
• write_grid.c (modified) (3 diffs)

grass/trunk/vector/v.mkgrid/main.c

@@ -414 +414 @@
 
         /* Create a grid of label points at the centres of the grid cells */
-        G_verbose_message(_("Creating centroids..."));
+        G_message(_("Creating centroids..."));
 
         /* Write out centroids and attributes */
@@ -424 +424 @@
             attCount = 0;
             for (i = 0; i < grid_info.num_rows; ++i) {
+                G_percent(i, grid_info.num_rows, 2);
                 for (j = 0; j < grid_info.num_cols; ++j) {
                     double x, y;
@@ -465 +466 @@
                 }
             }
+            G_percent(1, 1, 1);
         }
     }

grass/trunk/vector/v.mkgrid/write_grid.c

@@ -66 +66 @@
 
     /* write out all the vector lengths (x vectors) of the entire grid  */
-    G_verbose_message(_("Writing out vector rows..."));
+    G_message(_("Writing out vector rows..."));
     y = grid_info->south;
     for (i = 0; i < num_v_rows; ++i) {
@@ -102 +102 @@
         y += height;
     }
-
+    G_percent(1, 1, 1);
+    
     /* write out all the vector widths (y vectors) of the entire grid  */
-    G_verbose_message(_("Writing out vector columns..."));
+    G_message(_("Writing out vector columns..."));
     x = grid_info->west;
     for (i = 0; i < num_v_cols; ++i) {
@@ -139 +140 @@
         x += width;
     }
-
+    G_percent(1, 1, 1);
+    
     /* new with Vlib */
     Vect_destroy_line_struct(Points);