[GRASS-SVN] r47178 - grass/trunk/raster/r.colors

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Jul 18 16:20:29 EDT 2011


Author: martinl
Date: 2011-07-18 13:20:29 -0700 (Mon, 18 Jul 2011)
New Revision: 47178

Modified:
   grass/trunk/raster/r.colors/edit_colors.c
   grass/trunk/raster/r.colors/r.colors.html
   grass/trunk/raster/r.colors/r3.colors.html
   grass/trunk/raster/r.colors/raster3d_main.c
   grass/trunk/raster/r.colors/raster_main.c
Log:
r.colors: minor changes in keywors, manual (note author of 3D raster support)


Modified: grass/trunk/raster/r.colors/edit_colors.c
===================================================================
--- grass/trunk/raster/r.colors/edit_colors.c	2011-07-18 20:18:59 UTC (rev 47177)
+++ grass/trunk/raster/r.colors/edit_colors.c	2011-07-18 20:20:29 UTC (rev 47178)
@@ -4,11 +4,12 @@
  *
  * AUTHOR(S):    Michael Shapiro - CERL
  *               David Johnson
+ *               Support for 3D rasters by Soeren Gebbert
  *
  * PURPOSE:      Allows creation and/or modification of the color table
  *               for a raster map layer.
  *
- * COPYRIGHT:    (C) 2006-2008, 2010 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2006-2008, 2010-2011 by the GRASS Development Team
  *
  *               This program is free software under the GNU General Public
  *               License (>=v2). Read the file COPYING that comes with GRASS
@@ -161,17 +162,17 @@
     G_gisinit(argv[0]);
 
     module = G_define_module();
-    G_add_keyword(_("raster3d"));
-    G_add_keyword(_("raster"));
-    G_add_keyword(_("color table"));
     
     if (type == RASTER3D_TYPE) {
+	G_add_keyword(_("raster3d"));
         module->description =
-            _("Creates/modifies the color table associated with a raster3d map.");
+            _("Creates/modifies the color table associated with a 3D raster map.");
     } else {
+	G_add_keyword(_("raster"));
         module->description =
             _("Creates/modifies the color table associated with a raster map.");
     }
+    G_add_keyword(_("color table"));
 
     if (type == RASTER3D_TYPE) {
         opt.map = G_define_standard_option(G_OPT_R3_MAP);
@@ -201,7 +202,7 @@
     opt.volume->key = "volume";
     opt.volume->required = NO;
     opt.volume->description =
-        _("Raster3d map from which to copy color table");
+        _("3D raster map from which to copy color table");
     opt.volume->guisection = _("Define");
 
     opt.rules = G_define_standard_option(G_OPT_F_INPUT);

Modified: grass/trunk/raster/r.colors/r.colors.html
===================================================================
--- grass/trunk/raster/r.colors/r.colors.html	2011-07-18 20:18:59 UTC (rev 47177)
+++ grass/trunk/raster/r.colors/r.colors.html	2011-07-18 20:20:29 UTC (rev 47178)
@@ -289,13 +289,14 @@
 <h2>SEE ALSO</h2>
 
 <em>
-<a href="d.colortable.html">d.colortable</a>,
-<a href="d.histogram.html">d.histogram</a>,
-<a href="d.legend.html">d.legend</a>,
-<a href="r.colors.stddev.html">r.colors.stddev</a>,
-<a href="r.support.html">r.support</a>,
-<a href="r.univar.html">r.univar</a>,
-<a href="v.colors.html">v.colors</a>
+  <a href="d.colortable.html">d.colortable</a>,
+  <a href="d.histogram.html">d.histogram</a>,
+  <a href="d.legend.html">d.legend</a>,
+  <a href="r.colors.stddev.html">r.colors.stddev</a>,
+  <a href="r.support.html">r.support</a>,
+  <a href="r.univar.html">r.univar</a>,
+  <a href="v.colors.html">v.colors</a>,
+  <a href="r3.colors.html">r3.colors</a>
 </em>
 
 <p>
@@ -309,7 +310,8 @@
 
 
 <h2>AUTHORS</h2>
-Michael Shapiro and David Johnson
+Michael Shapiro and David Johnson<br>
+Support for 3D rasters by Soeren Gebbert
 
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/trunk/raster/r.colors/r3.colors.html
===================================================================
--- grass/trunk/raster/r.colors/r3.colors.html	2011-07-18 20:18:59 UTC (rev 47177)
+++ grass/trunk/raster/r.colors/r3.colors.html	2011-07-18 20:20:29 UTC (rev 47178)
@@ -1,16 +1,20 @@
 <h2>DESCRIPTION</h2>
 
-<i>r3.colors</i> has exactly the same functionality as <i>r.colors</i> but for volume maps.
-Please refer to <a href="r.colors.html">r.colors</a>.
+<em>r3.colors</em> has exactly the same functionality
+as <em>r.colors</em> but for volume maps. Please refer
+to <em><a href="r.colors.html">r.colors</a></em>.
 
 <h2>SEE ALSO</h2>
 
 <em>
-<a href="r.colors.html">r.colors</a>
+  <a href="r.colors.html">r.colors</a>
 </em>
 
 <h2>AUTHORS</h2>
+
 Michael Shapiro and David Johnson
+<br>
+Support for 3D rasters by Soeren Gebbert
 
 <p>
 <i>Last changed: $Date$</i>

Modified: grass/trunk/raster/r.colors/raster3d_main.c
===================================================================
--- grass/trunk/raster/r.colors/raster3d_main.c	2011-07-18 20:18:59 UTC (rev 47177)
+++ grass/trunk/raster/r.colors/raster3d_main.c	2011-07-18 20:20:29 UTC (rev 47178)
@@ -5,11 +5,12 @@
  *
  * AUTHOR(S):    Michael Shapiro - CERL
  *               David Johnson
+ *               Support for 3D rasters by Soeren Gebbert
  *
  * PURPOSE:      Allows creation and/or modification of the color table
  *               for a raster map layer.
  *
- * COPYRIGHT:    (C) 2006 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2006, 2011 by the GRASS Development Team
  *
  *               This program is free software under the GNU General Public
  *               License (>=v2). Read the file COPYING that comes with GRASS
@@ -23,4 +24,4 @@
 int main(int argc, char **argv)
 {
     return edit_colors(argc, argv, RASTER3D_TYPE, "raster3d", "Raster3d");
-}
\ No newline at end of file
+}

Modified: grass/trunk/raster/r.colors/raster_main.c
===================================================================
--- grass/trunk/raster/r.colors/raster_main.c	2011-07-18 20:18:59 UTC (rev 47177)
+++ grass/trunk/raster/r.colors/raster_main.c	2011-07-18 20:20:29 UTC (rev 47178)
@@ -5,11 +5,12 @@
  *
  * AUTHOR(S):    Michael Shapiro - CERL
  *               David Johnson
- *
+ *               Support for 3D rasters by Soeren Gebbert
+ *  
  * PURPOSE:      Allows creation and/or modification of the color table
  *               for a raster map layer.
  *
- * COPYRIGHT:    (C) 2006 by the GRASS Development Team
+ * COPYRIGHT:    (C) 2006, 2011 by the GRASS Development Team
  *
  *               This program is free software under the GNU General Public
  *               License (>=v2). Read the file COPYING that comes with GRASS
@@ -19,8 +20,8 @@
 
 #include "local_proto.h"
 
-/* This is the main function for r3.colors*/
+/* This is the main function for r.colors*/
 int main(int argc, char **argv)
 {
     return edit_colors(argc, argv, RASTER_TYPE, "raster", "Raster");
-}
\ No newline at end of file
+}



More information about the grass-commit mailing list