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

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Dec 24 02:56:45 PST 2014 

Author: martinl
Date: 2014-12-24 02:56:44 -0800 (Wed, 24 Dec 2014)
New Revision: 63705

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



Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
 63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702
   + /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
 63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63362,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704

Modified: grass/branches/releasebranch_7_0/lib/gis/renamed_options
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/renamed_options	2014-12-24 10:53:28 UTC (rev 63704)
+++ grass/branches/releasebranch_7_0/lib/gis/renamed_options	2014-12-24 10:56:44 UTC (rev 63705)
@@ -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/branches/releasebranch_7_0/raster/r.colors/edit_colors.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.colors/edit_colors.c	2014-12-24 10:53:28 UTC (rev 63704)
+++ grass/branches/releasebranch_7_0/raster/r.colors/edit_colors.c	2014-12-24 10:56:44 UTC (rev 63705)
@@ -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/branches/releasebranch_7_0/raster/r.colors/r.colors.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.colors/r.colors.html	2014-12-24 10:53:28 UTC (rev 63704)
+++ grass/branches/releasebranch_7_0/raster/r.colors/r.colors.html	2014-12-24 10:56:44 UTC (rev 63705)
@@ -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


Property changes on: grass/branches/releasebranch_7_0/temporal
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:62868,62873
/grass/trunk/temporal:59684,59915-59916,60017-60018,60024,60026,60173-60174,60213,60547-60548,60732-60733,60817,61031,61066,61071-61072,61083,61096,61141,61157-61158,61179-61180,61186,61191-61194,61215,61239-61243,61274-61275,61282-61288,61301,61429-61433,61455,61457,61732,61734,61759-61762,61806-61807,61848,61885,61955-61957,61983-61985,61997-62000,62016,62021-62022,62025,62111-62113,62120-62121,62179-62180,62182,62343,62361,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62594-62597,62603,62606,62608-62609,62613-62614,62616,62618,62625-62628,62631-62632,62635-62638,62640-62642,62644,62646-62649,62652,62654-62657,62666,62691,62703-62705,62709-62712,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62775,62785,62798,62800-62801,62803,62805,62812,62814-62815,62822,62824,62831,62838,62847,62856,62868,62871,62873,62875,62904,63035,63085,63087,63
 089,63091,63093,63170,63327,63345,63391,63393,63554,63556,63590,63616,63628,63644,63650,63656
   + /grass/trunk:62868,62873
/grass/trunk/temporal:59684,59915-59916,60017-60018,60024,60026,60173-60174,60213,60547-60548,60732-60733,60817,61031,61066,61071-61072,61083,61096,61141,61157-61158,61179-61180,61186,61191-61194,61215,61239-61243,61274-61275,61282-61288,61301,61429-61433,61455,61457,61732,61734,61759-61762,61806-61807,61848,61885,61955-61957,61983-61985,61997-62000,62016,62021-62022,62025,62111-62113,62120-62121,62179-62180,62182,62343,62361,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62594-62597,62603,62606,62608-62609,62613-62614,62616,62618,62625-62628,62631-62632,62635-62638,62640-62642,62644,62646-62649,62652,62654-62657,62666,62691,62703-62705,62709-62712,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62775,62785,62798,62800-62801,62803,62805,62812,62814-62815,62822,62824,62831,62838,62847,62856,62868,62871,62873,62875,62904,63035,63085,63087,63
 089,63091,63093,63170,63327,63345,63391,63393,63554,63556,63590,63616,63628,63644,63650,63656,63704

Modified: grass/branches/releasebranch_7_0/temporal/t.rast.colors/t.rast.colors.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast.colors/t.rast.colors.py	2014-12-24 10:53:28 UTC (rev 63704)
+++ grass/branches/releasebranch_7_0/temporal/t.rast.colors/t.rast.colors.py	2014-12-24 10:56:44 UTC (rev 63705)
@@ -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/branches/releasebranch_7_0/vector/v.colors/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.colors/main.c	2014-12-24 10:53:28 UTC (rev 63704)
+++ grass/branches/releasebranch_7_0/vector/v.colors/main.c	2014-12-24 10:56:44 UTC (rev 63705)
@@ -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/branches/releasebranch_7_0/vector/v.colors/v.colors.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.colors/v.colors.html	2014-12-24 10:53:28 UTC (rev 63704)
+++ grass/branches/releasebranch_7_0/vector/v.colors/v.colors.html	2014-12-24 10:56:44 UTC (rev 63705)
@@ -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

More information about the grass-commit mailing list