[GRASS-SVN] r33517 - in grass/trunk: lib/gis raster/r.colors

[svn_grass at osgeo.org]

Author: hamish
Date: 2008-09-24 01:35:52 -0400 (Wed, 24 Sep 2008)
New Revision: 33517

Modified:
   grass/trunk/lib/gis/colors.desc
   grass/trunk/raster/r.colors/main.c
   grass/trunk/raster/r.colors/r.colors.html
Log:
color descriptions; moderninze interactive variable name


Modified: grass/trunk/lib/gis/colors.desc
===================================================================
--- grass/trunk/lib/gis/colors.desc	2008-09-24 05:15:24 UTC (rev 33516)
+++ grass/trunk/lib/gis/colors.desc	2008-09-24 05:35:52 UTC (rev 33517)
@@ -5,10 +5,10 @@
 byg: blue through yellow to green
 byr: blue through yellow to red
 celsius: blue to red for degree Celsius temperature
-curvature: for terrain curvatures (from v.surf.rst and r.slope.aspect curvature colors)
+curvature: for terrain curvatures (from v.surf.rst and r.slope.aspect)
 differences: differences oriented colors
-elevation: maps percentage ranges of raster values to elevation color ramp
-etopo2: rainbow color ramp for the ETOPO2 2-minute Worldwide Bathymetry/Topography dataset
+elevation: maps relative ranges of raster values to elevation color ramp
+etopo2: colors for ETOPO2 worldwide bathymetry/topography
 evi: enhanced vegetative index colors
 grey: grey scale
 grey1.0: grey scale for raster values between 0.0-1.0
@@ -25,6 +25,6 @@
 ryg: red through yellow to green
 sepia: yellowish-brown through to white
 slope: r.slope.aspect-type slope colors for raster values 0-90
-srtm: color palette for Shuttle Radar Topography Mission elevation values
+srtm: color palette for Shuttle Radar Topography Mission elevation
 terrain: global elevation color table covering -11000 to +8850m
 wave: color wave

Modified: grass/trunk/raster/r.colors/main.c
===================================================================
--- grass/trunk/raster/r.colors/main.c	2008-09-24 05:15:24 UTC (rev 33516)
+++ grass/trunk/raster/r.colors/main.c	2008-09-24 05:35:52 UTC (rev 33517)
@@ -135,7 +135,7 @@
 int main(int argc, char **argv)
 {
     int overwrite;
-    int interactive;
+    int is_from_stdin;
     int remove;
     int have_colors;
     struct Colors colors, colors_tmp;
@@ -235,7 +235,6 @@
     remove = flag.r->answer;
 
     name = opt.map->answer;
-
     style = opt.colr->answer;
     cmap = opt.rast->answer;
     rules = opt.rules->answer;
@@ -244,13 +243,13 @@
 	G_fatal_error(_("No map specified"));
 
     if (!cmap && !style && !rules && !remove)
-	G_fatal_error(_("One of \"-r\" or options \"color\", \"rast\" or \"rules\" must be specified!"));
+	G_fatal_error(_("One of \"-r\" or options \"color\", \"raster\" or \"rules\" must be specified!"));
 
     if (!!style + !!cmap + !!rules > 1)
 	G_fatal_error(_("\"color\", \"rules\", and \"raster\" options are mutually exclusive"));
 
-    interactive = rules && strcmp(rules, "-") == 0;
-    if (interactive)
+    is_from_stdin = rules && strcmp(rules, "-") == 0;
+    if (is_from_stdin)
 	rules = NULL;
 
     mapset = G_find_cell2(name, "");
@@ -281,7 +280,7 @@
     G_read_fp_range(name, mapset, &range);
     G_get_fp_range_min_max(&range, &min, &max);
 
-    if (interactive) {
+    if (is_from_stdin) {
 	if (!read_color_rules(stdin, &colors, min, max, fp))
 	    exit(EXIT_FAILURE);
     }
@@ -359,7 +358,7 @@
 
     if (G_write_colors(name, mapset, &colors) >= 0)
 	G_message(_("Color table for <%s> set to %s"), name,
-		  interactive ? "rules" : style ? style : rules ? rules :
+		  is_from_stdin ? "rules" : style ? style : rules ? rules :
 		  cmap);
 
     exit(EXIT_SUCCESS);

Modified: grass/trunk/raster/r.colors/r.colors.html
===================================================================
--- grass/trunk/raster/r.colors/r.colors.html	2008-09-24 05:15:24 UTC (rev 33516)
+++ grass/trunk/raster/r.colors/r.colors.html	2008-09-24 05:35:52 UTC (rev 33517)
@@ -16,10 +16,10 @@
      byg         blue through yellow to green
      byr         blue through yellow to red
      celsius     blue to red for degree Celsius temperature
-     curvature   for terrain curvatures (from v.surf.rst and r.slope.aspect curvature colors)
+     curvature   for terrain curvatures (from v.surf.rst and r.slope.aspect)
      differences differences oriented colors
-     elevation   maps percentage ranges of raster values to elevation color ramp
-     etopo2      rainbow color ramp for the ETOPO2 2-minute Worldwide Bathymetry/Topography dataset
+     elevation   maps relative ranges of raster values to elevation color ramp
+     etopo2      colors for ETOPO2 worldwide bathymetry/topography
      evi         enhanced vegetative index colors
      grey        grey scale
      grey1.0     grey scale for raster values between 0.0-1.0
@@ -33,7 +33,7 @@
      ryg         red through yellow to green
      sepia       yellowish-brown through to white
      slope       r.slope.aspect-type slope colors for raster values 0-90
-     srtm        color palette for Shuttle Radar Topography Mission elevation values
+     srtm        color palette for Shuttle Radar Topography Mission elevation
      terrain     global elevation color table covering -11000 to +8850m
      wave        color wave
      random      random color table