[GRASS-SVN] r31878 - grass/branches/develbranch_6/lib/ogsf

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-06-29 05:27:41 -0400 (Sun, 29 Jun 2008)
New Revision: 31878

Modified:
   grass/branches/develbranch_6/lib/ogsf/Gs3.c
Log:
ogsflib: message cosmetics (loading data)

Modified: grass/branches/develbranch_6/lib/ogsf/Gs3.c
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/Gs3.c	2008-06-28 22:58:44 UTC (rev 31877)
+++ grass/branches/develbranch_6/lib/ogsf/Gs3.c	2008-06-29 09:27:41 UTC (rev 31878)
@@ -146,10 +146,12 @@
     }
 
     if ((cellfile = G_open_cell_old(map_name, map_set)) == -1) {
-	G_fatal_error(_("Unable to open raster map <%s>"));
+	G_fatal_error(_("Unable to open raster map <%s>"),
+		      map_name);
     }
 
-    G_verbose_message(_("Loading data..."));
+    G_message(_("Loading raster map <%s>..."),
+	      map_name);
 
     for (row = 0; row < wind->rows; row++) {
 	offset = row * wind->cols;
@@ -219,10 +221,12 @@
     }
 
     if ((cellfile = G_open_cell_old(map_name, map_set)) == -1) {
-	G_fatal_error(_("Unable to open raster map <%s>"));
+	G_fatal_error(_("Unable to open raster map <%s>"),
+		      map_name);
     }
 
-    G_verbose_message(_("Loading data..."));
+    G_message(_("Loading raster map <%s>..."),
+	      map_name);
 
     for (row = 0; row < wind->rows; row++) {
 	offset = row * wind->cols;
@@ -376,7 +380,8 @@
     }
 
     if ((cellfile = G_open_cell_old(map_name, map_set)) == -1) {
-	G_fatal_error(_("Unable to open raster map <%s>"));
+	G_fatal_error(_("Unable to open raster map <%s>"),
+		      map_name);
     }
 
     tmp_buf = (int *) G_malloc(wind->cols * sizeof(int)); /* G_fatal_error */
@@ -384,7 +389,8 @@
 	return -1;
     }
 
-    G_verbose_message(_("Loading data..."));
+    G_message(_("Loading raster map <%s>..."),
+	      map_name);
 
     for (row = 0; row < wind->rows; row++) {
 	offset = row * wind->cols;
@@ -490,7 +496,8 @@
     }
 
     if ((cellfile = G_open_cell_old(map_name, map_set)) == -1) {
-	G_fatal_error(_("Unable to open raster map <%s>"));
+	G_fatal_error(_("Unable to open raster map <%s>"),
+		      map_name);
     }
 
     tmp_buf = (int *) G_malloc(wind->cols * sizeof(int)); /* G_fatal_error */
@@ -498,7 +505,8 @@
 	return -1;
     }
 
-    G_verbose_message(_("Loading data..."));
+    G_message(_("Loading raster map <%s>..."),
+	      map_name);
 
     for (row = 0; row < wind->rows; row++) {
 	offset = row * wind->cols;
@@ -579,7 +587,8 @@
     }
 
     if ((cellfile = G_open_cell_old(map_name, map_set)) == -1) {
-	G_fatal_error(_("Unable to open raster map <%s>"));
+	G_fatal_error(_("Unable to open raster map <%s>"),
+		      map_name);
     }
 
     tmp_buf = (int *) G_malloc(wind->cols * sizeof(int)); /* G_fatal_error */
@@ -592,7 +601,8 @@
 	G_fatal_error(_("Unable to allocate memory for a null buffer"));
     }
 
-    G_verbose_message(_("Loading data..."));
+    G_message(_("Loading raster map <%s>..."),
+	      map_name);
 
     for (row = 0; row < wind->rows; row++) {
 	G_get_null_value_row(cellfile, nullflags, row);
@@ -711,8 +721,8 @@
 
     cur = buff;
 
-    G_verbose_message(_("Translating colors for raster map <%s>..."),
-		      filename);
+    G_message(_("Translating colors from raster map <%s>..."),
+	      filename);
 
     for (i = 0; i < rows; i++) {
 	G_lookup_colors(cur, r, g, b, set, cols, &colrules);
@@ -782,8 +792,8 @@
     fcur = fbuf;
     icur = ibuf;
 
-    G_verbose_message(_("Translating colors from fp raster map <%s>"),
-		      filename);
+    G_message(_("Translating colors from raster map <%s>..."),
+	      filename);
 
     for (i = 0; i < rows; i++) {
 	G_lookup_f_raster_colors(fcur, r, g, b, set, cols, &colrules);