[GRASS-SVN] r63704 - in grass/trunk: lib/gis raster/r.colors temporal/t.rast.colors vector/v.colors

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-24 02:53:28 -0800 (Wed, 24 Dec 2014)
New Revision: 63704

Modified:
   grass/trunk/lib/gis/renamed_options
   grass/trunk/raster/r.colors/edit_colors.c
   grass/trunk/raster/r.colors/r.colors.html
   grass/trunk/temporal/t.rast.colors/t.rast.colors.py
   grass/trunk/vector/v.colors/main.c
   grass/trunk/vector/v.colors/v.colors.html
Log:
r.colors|r3.colors|v.colors: rename 'volume' to 'raster_3d' - #2409


Modified: grass/trunk/lib/gis/renamed_options
===================================================================
--- grass/trunk/lib/gis/renamed_options	2014-12-24 10:42:58 UTC (rev 63703)
+++ grass/trunk/lib/gis/renamed_options	2014-12-24 10:53:28 UTC (rev 63704)
@@ -170,6 +170,8 @@
 r.basins.fill|result:output
 # r.blend
 r.blend|output:output_prefix
+# r.colors
+r.colors|volume:raster_3d
 # r.colors.stddev
 r.colors.stddev|input:map
 # r.cost
@@ -375,6 +377,8 @@
 ############################
 ### Raster 3D module changes
 ############################
+# r3.colors
+r3.colors|volume:raster_3d
 # r3.gwflow
 r3.gwflow|q:sink
 r3.gwflow|s:yield
@@ -402,6 +406,8 @@
 #########################
 # v.clean
 v.clean|thresh:threshold
+# v.colors
+v.colors|volume:raster_3d
 # v.drape
 v.drape|rast:elevation
 # v.edit

Modified: grass/trunk/raster/r.colors/edit_colors.c
===================================================================
--- grass/trunk/raster/r.colors/edit_colors.c	2014-12-24 10:42:58 UTC (rev 63703)
+++ grass/trunk/raster/r.colors/edit_colors.c	2014-12-24 10:53:28 UTC (rev 63704)
@@ -97,7 +97,7 @@
     opt.rast->guisection = _("Define");
 
     opt.volume = G_define_standard_option(G_OPT_R3_INPUT);
-    opt.volume->key = "volume";
+    opt.volume->key = "raster_3d";
     opt.volume->required = NO;
     opt.volume->description =
         _("3D raster map from which to copy color table");

Modified: grass/trunk/raster/r.colors/r.colors.html
===================================================================
--- grass/trunk/raster/r.colors/r.colors.html	2014-12-24 10:42:58 UTC (rev 63703)
+++ grass/trunk/raster/r.colors/r.colors.html	2014-12-24 10:53:28 UTC (rev 63704)
@@ -6,10 +6,10 @@
 by <b>map</b> or as <b>file</b> using an input file with one map name per line) 
 must exist in the user's current mapset search path.
 
-<p>The <b>rast</b> option allows user to specify a raster map <i>name</i>
+<p>The <b>raster</b> option allows user to specify a raster map <i>name</i>
 from which to copy the color map.
 
-<p>The <b>volume</b> option allows user to specify a volume (3D raster)
+<p>The <b>raster_3d</b> option allows user to specify a 3D raster
 map <i>name</i> from which to copy the color map.
 
 <p>The <b>-e</b> flag equalizes the original raster's color table. It can

Modified: grass/trunk/temporal/t.rast.colors/t.rast.colors.py
===================================================================
--- grass/trunk/temporal/t.rast.colors/t.rast.colors.py	2014-12-24 10:42:58 UTC (rev 63703)
+++ grass/trunk/temporal/t.rast.colors/t.rast.colors.py	2014-12-24 10:53:28 UTC (rev 63704)
@@ -41,7 +41,7 @@
 #%end
 
 #%option G_OPT_R3_INPUT
-#% key: volume
+#% key: raster_3d
 #% description: 3D raster map from which to copy color table
 #% required: no
 #% guisection: Define
@@ -108,7 +108,7 @@
     input = options["input"]
     color = options["color"]
     raster = options["raster"]
-    volume = options["volume"]
+    volume = options["raster_3d"]
     rules = options["rules"]
     remove = flags["r"]
     write = flags["w"]

Modified: grass/trunk/vector/v.colors/main.c
===================================================================
--- grass/trunk/vector/v.colors/main.c	2014-12-24 10:42:58 UTC (rev 63703)
+++ grass/trunk/vector/v.colors/main.c	2014-12-24 10:53:28 UTC (rev 63704)
@@ -99,7 +99,7 @@
     opt.rast->guisection = _("Define");
 
     opt.volume = G_define_standard_option(G_OPT_R3_INPUT);
-    opt.volume->key = "volume";
+    opt.volume->key = "raster_3d";
     opt.volume->required = NO;
     opt.volume->description =
         _("3D raster map from which to copy color table");

Modified: grass/trunk/vector/v.colors/v.colors.html
===================================================================
--- grass/trunk/vector/v.colors/v.colors.html	2014-12-24 10:42:58 UTC (rev 63703)
+++ grass/trunk/vector/v.colors/v.colors.html	2014-12-24 10:53:28 UTC (rev 63704)
@@ -11,7 +11,7 @@
 vector lines are not supported.
 
 <p>The <b>raster</b> option allows user to specify a raster map from
-which to copy the color table, similarly <b>volume</b> option for 3D
+which to copy the color table, similarly <b>raster_3d</b> option for 3D
 raster map.
 
 <p>The <b>rules</b> color table type will cause <em>v.colors</em> to