[GRASS-SVN] r47651 - in grass/trunk: lib/gpde raster/r.colors raster/r.univar

[svn_grass at osgeo.org]

Author: neteler
Date: 2011-08-15 09:26:45 -0700 (Mon, 15 Aug 2011)
New Revision: 47651

Modified:
   grass/trunk/lib/gpde/N_arrays_io.c
   grass/trunk/raster/r.colors/edit_colors.c
   grass/trunk/raster/r.univar/r3.univar_main.c
Log:
msg standardization

Modified: grass/trunk/lib/gpde/N_arrays_io.c
===================================================================
--- grass/trunk/lib/gpde/N_arrays_io.c	2011-08-15 16:24:27 UTC (rev 47650)
+++ grass/trunk/lib/gpde/N_arrays_io.c	2011-08-15 16:26:45 UTC (rev 47651)
@@ -270,7 +270,7 @@
 
 
     if (NULL == G_find_raster3d(name, ""))
-	Rast3d_fatal_error(_("Requested g3d map <%s> not found"), name);
+	Rast3d_fatal_error(_("3D raster map <%s> not found"), name);
 
     /*Open all maps with default region */
     map =
@@ -278,7 +278,7 @@
 			RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
 
     if (map == NULL)
-	Rast3d_fatal_error(_("Error opening g3d map <%s>"), name);
+	Rast3d_fatal_error(_("Unable to open 3D raster map <%s>"), name);
 
     type = Rast3d_tile_type_map(map);
 

Modified: grass/trunk/raster/r.colors/edit_colors.c
===================================================================
--- grass/trunk/raster/r.colors/edit_colors.c	2011-08-15 16:24:27 UTC (rev 47650)
+++ grass/trunk/raster/r.colors/edit_colors.c	2011-08-15 16:26:45 UTC (rev 47651)
@@ -272,10 +272,10 @@
         } else {
             cmapset = G_find_raster3d(cmap, "");
             if (cmapset == NULL)
-                G_fatal_error(_("Raster3d map <%s> not found"), cmap);
+                G_fatal_error(_("3D raster map <%s> not found"), cmap);
 
             if (Rast3d_read_colors(cmap, cmapset, &colors) < 0)
-                G_fatal_error(_("Unable to read color table for raster3d map <%s>"), cmap);
+                G_fatal_error(_("Unable to read color table for 3D raster map <%s>"), cmap);
         }
     }
 

Modified: grass/trunk/raster/r.univar/r3.univar_main.c
===================================================================
--- grass/trunk/raster/r.univar/r3.univar_main.c	2011-08-15 16:24:27 UTC (rev 47650)
+++ grass/trunk/raster/r.univar/r3.univar_main.c	2011-08-15 16:26:45 UTC (rev 47651)
@@ -144,23 +144,22 @@
     /* open 3D zoning raster with default region */
     if ((zonemap = param.zonefile->answer) != NULL) {
 	if (NULL == (mapset = G_find_raster3d(zonemap, "")))
-	    Rast3d_fatal_error(_("Requested g3d map <%s> not found"), zonemap);
+	    Rast3d_fatal_error(_("3D raster map <%s> not found"), zonemap);
 
 	zmap =
 	    Rast3d_open_cell_old(zonemap, G_find_raster3d(zonemap, ""), &region,
 			    RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
 
 	if (zmap == NULL)
-	    Rast3d_fatal_error(_("Error opening g3d map <%s>"), zonemap);
+	    Rast3d_fatal_error(_("Unable to open 3D raster map <%s>"), zonemap);
 
 	zmap_type = Rast3d_tile_type_map(zmap);
 	
 	if (Rast3d_read_cats(zonemap, mapset, &(zone_info.cats)))
-	    G_warning("no category support for zoning raster");
+	    G_warning("No category support for zoning raster");
 	    
 	Rast3d_range_init(zmap);
-	if (!Rast3d_range_load(zmap))
-	    G_fatal_error(_("Unable it load G3d range"));
+	Rast3d_range_load(zmap);
 	Rast3d_range_min_max(zmap, &dmin, &dmax);
 
 	/* properly round dmin and dmax */
@@ -183,14 +182,14 @@
     infile = param.inputfile->answer;
 
     if (NULL == G_find_raster3d(infile, ""))
-	Rast3d_fatal_error(_("Requested g3d map <%s> not found"), infile);
+	Rast3d_fatal_error(_("3D raster map <%s> not found"), infile);
 
     map =
 	Rast3d_open_cell_old(infile, G_find_raster3d(infile, ""), &region,
 			RASTER3D_TILE_SAME_AS_FILE, RASTER3D_USE_CACHE_DEFAULT);
 
     if (map == NULL)
-	Rast3d_fatal_error(_("Error opening g3d map <%s>"), infile);
+	Rast3d_fatal_error(_("Unable to open 3D raster map <%s>"), infile);
 
     map_type = Rast3d_tile_type_map(map);