Changeset 34366

Timestamp:

Nov 18, 2008, 5:27:00 AM (16 years ago)

Author:

martinl

Message:

r.recode: standardize messages

disable interactive mode

Location:

grass/branches/develbranch_6/raster/r.recode

Files:

• main.c (modified) (5 diffs)
• read_rules.c (modified) (3 diffs)
• recode.c (modified) (2 diffs)

grass/branches/develbranch_6/raster/r.recode/main.c

@@ -7 +7 @@
  *               Jan-Oliver Wagner <jan intevation.de>
  * PURPOSE:      Recode categorical raster maps
- * COPYRIGHT:    (C) 1999-2006 by the GRASS Development Team
+ * COPYRIGHT:    (C) 1999-2008 by the GRASS Development Team
  *
  *               This program is free software under the GNU General Public
@@ -35 +35 @@
 
     /* any interaction must run in a term window */
-    G_putenv("GRASS_UI_TERM", "1");
+    /* G_putenv("GRASS_UI_TERM", "1"); */
 
     G_gisinit(argv[0]);
 
     module = G_define_module();
-    module->keywords = _("raster");
+    module->keywords = _("raster, recode category");
     module->description = _("Recodes categorical raster maps.");
 
@@ -48 +48 @@
     parm.output = G_define_standard_option(G_OPT_R_OUTPUT);
 
-    parm.rules = G_define_option();
+    parm.rules = G_define_standard_option(G_OPT_F_INPUT);
     parm.rules->key = "rules";
-    parm.rules->type = TYPE_STRING;
-    parm.rules->description = _("File containing recode rules");
-    parm.rules->key_desc = "name";
-    parm.rules->gisprompt = "old_file,file,input";
+    parm.rules->label = _("File containing recode rules");
+    parm.rules->required = NO;
 
     parm.title = G_define_option();
@@ -92 +90 @@
         srcfp = fopen(parm.rules->answer, "r");
         if (!srcfp)
-            G_fatal_error(_("Cannot open rules file <%s>"),
+            G_fatal_error(_("Unable to open rules file <%s>"),
                           parm.rules->answer);
     }
@@ -108 +106 @@
     do_recode();
 
+    G_done_msg(_("Raster map <%s> created."),
+               result);
+    
     exit(EXIT_SUCCESS);
 }

grass/branches/develbranch_6/raster/r.recode/read_rules.c

@@ -17 +17 @@
     if (inp_type != CELL_TYPE) {
         if (G_read_fp_range(name, mapset, &drange) <= 0)
-            G_fatal_error(_("Unable to read f_range for map %s"), name);
+            G_fatal_error(_("Unable to read fp range of raster map <%s>"),
+                          G_fully_qualified_name(name, mapset));
 
         G_get_fp_range_min_max(&drange, &old_dmin, &old_dmax);
         if (G_is_d_null_value(&old_dmin) || G_is_d_null_value(&old_dmax))
-            G_message(_("Data range is empty"));
+            G_important_message(_("Data range of raster map <%s> is empty"),
+                                G_fully_qualified_name(name, mapset));
         else {
             sprintf(buff, "%.10f", old_dmin);
@@ -27 +29 @@
             G_trim_decimal(buff);
             G_trim_decimal(buff2);
-            G_message(_("Data range of %s is %s to %s (entire map)"), name,
-                      buff, buff2);
+            G_message(_("Data range of raster map <%s> is %s to %s (entire map)"),
+                      G_fully_qualified_name(name, mapset), buff, buff2);
         }
     }
     if (G_read_range(name, mapset, &range) <= 0)
-        G_fatal_error(_("Unable to read range for map <%s>"), name);
+        G_fatal_error(_("Unable to read range of raster map <%s>"),
+                      G_fully_qualified_name(name, mapset));
 
     G_get_range_min_max(&range, &old_min, &old_max);
     if (G_is_c_null_value(&old_min) || G_is_c_null_value(&old_max))
-        G_message(_("Integer data range of %s is empty"), name);
+        G_important_message(_("Integer data range of raster map <%s> is empty"),
+                            G_fully_qualified_name(name, mapset));
     else
-        G_message(_("Integer data range of %s is %d to %d"),
-                  name, (int)old_min, (int)old_max);
+        G_message(_("Integer data range of raster mao <%s> is %d to %d"),
+                  G_fully_qualified_name(name, mapset), (int) old_min, (int) old_max);
 
     return 0;
@@ -121 +125 @@
             }
             else
-                G_message(_("%s is not a valid rule"), buf);
+                G_message(_("'%s' is not a valid rule"), buf);
             break;
         }                       /* switch */

grass/branches/develbranch_6/raster/r.recode/recode.c

@@ -1 +1 @@
 #include <stdio.h>
+
+#include <grass/glocale.h>
+
 #include "global.h"
 
@@ -43 +46 @@
     in_fd = G_open_cell_old(name, mapset);
     if (in_fd < 0)
-        G_fatal_error("Can't open input map");
+        G_fatal_error(_("Unable to open raster map <%s>"),
+                      G_fully_qualified_name(name, mapset));
 
     out_fd = G_open_raster_new(result, out_type);