浏览代码

ogsflib: loading data - use fully qualified name in message string (also for vector)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@32108 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 17 年之前
父节点
当前提交
b066a76506
共有 2 个文件被更改,包括 8 次插入5 次删除
  1. 5 5
      lib/ogsf/Gs3.c
  2. 3 0
      lib/ogsf/Gv3.c

+ 5 - 5
lib/ogsf/Gs3.c

@@ -152,7 +152,7 @@ int Gs_loadmap_as_float(struct Cell_head *wind, const char *map_name, float *buf
     }
     }
 
 
     G_message(_("Loading raster map <%s>..."),
     G_message(_("Loading raster map <%s>..."),
-	      map_name);
+	      G_fully_qualified_name(map_name, map_set));
 
 
     for (row = 0; row < wind->rows; row++) {
     for (row = 0; row < wind->rows; row++) {
 	offset = row * wind->cols;
 	offset = row * wind->cols;
@@ -228,7 +228,7 @@ int Gs_loadmap_as_int(struct Cell_head *wind, const char *map_name, int *buff,
     }
     }
 
 
     G_message(_("Loading raster map <%s>..."),
     G_message(_("Loading raster map <%s>..."),
-	      map_name);
+	      G_fully_qualified_name(map_name, map_set));
 
 
     for (row = 0; row < wind->rows; row++) {
     for (row = 0; row < wind->rows; row++) {
 	offset = row * wind->cols;
 	offset = row * wind->cols;
@@ -393,7 +393,7 @@ int Gs_loadmap_as_short(struct Cell_head *wind, const char *map_name, short *buf
     }
     }
 
 
     G_message(_("Loading raster map <%s>..."),
     G_message(_("Loading raster map <%s>..."),
-	      map_name);
+	      G_fully_qualified_name(map_name, map_set));
 
 
     for (row = 0; row < wind->rows; row++) {
     for (row = 0; row < wind->rows; row++) {
 	offset = row * wind->cols;
 	offset = row * wind->cols;
@@ -510,7 +510,7 @@ int Gs_loadmap_as_char(struct Cell_head *wind, const char *map_name,
     }
     }
 
 
     G_message(_("Loading raster map <%s>..."),
     G_message(_("Loading raster map <%s>..."),
-	      map_name);
+	      G_fully_qualified_name(map_name, map_set));
 
 
     for (row = 0; row < wind->rows; row++) {
     for (row = 0; row < wind->rows; row++) {
 	offset = row * wind->cols;
 	offset = row * wind->cols;
@@ -607,7 +607,7 @@ int Gs_loadmap_as_bitmap(struct Cell_head *wind, const char *map_name,
     }
     }
 
 
     G_message(_("Loading raster map <%s>..."),
     G_message(_("Loading raster map <%s>..."),
-	      map_name);
+	      G_fully_qualified_name(map_name, map_set));
 
 
     for (row = 0; row < wind->rows; row++) {
     for (row = 0; row < wind->rows; row++) {
 	G_get_null_value_row(cellfile, nullflags, row);
 	G_get_null_value_row(cellfile, nullflags, row);

+ 3 - 0
lib/ogsf/Gv3.c

@@ -63,6 +63,9 @@ geoline *Gv_load_vect(const char *grassname, int *nlines)
 		   grassname);
 		   grassname);
 	return NULL;
 	return NULL;
     }
     }
+
+    G_message(_("Loading vector map <%s>..."),
+	      G_fully_qualified_name(grassname, mapset));
     
     
     top = gln = (geoline *) G_malloc(sizeof(geoline)); /* G_fatal_error */
     top = gln = (geoline *) G_malloc(sizeof(geoline)); /* G_fatal_error */
     if (!top) {
     if (!top) {