[GRASS-SVN] r63708 - in grass/branches/releasebranch_7_0: . lib/gis raster/r.stream.extract

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Dec 24 03:03:47 PST 2014 

Author: martinl
Date: 2014-12-24 03:03:47 -0800 (Wed, 24 Dec 2014)
New Revision: 63708

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/lib/gis/renamed_options
   grass/branches/releasebranch_7_0/raster/r.stream.extract/main.c
   grass/branches/releasebranch_7_0/raster/r.stream.extract/r.stream.extract.html
Log:
r.stream.extract: stream_rast -> stream_raster & stream_vect -> stream_vector (#2409)
                  (merge r63706-7 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,63704
   + /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,63706-63707

Modified: grass/branches/releasebranch_7_0/lib/gis/renamed_options
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/renamed_options	2014-12-24 11:01:14 UTC (rev 63707)
+++ grass/branches/releasebranch_7_0/lib/gis/renamed_options	2014-12-24 11:03:47 UTC (rev 63708)
@@ -260,6 +260,9 @@
 r.sim.water|niter:niterations
 r.sim.water|outiter:output_step
 r.sim.water|diffc:diffusion_coeff
+# r.stream.extract
+r.stream.extract|stream_rast:stream_raster
+r.stream.extract|stream_vect:stream_vector
 # r.sun
 r.sun|elevin:elevation
 r.sun|aspin:aspect

Modified: grass/branches/releasebranch_7_0/raster/r.stream.extract/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.stream.extract/main.c	2014-12-24 11:01:14 UTC (rev 63707)
+++ grass/branches/releasebranch_7_0/raster/r.stream.extract/main.c	2014-12-24 11:03:47 UTC (rev 63708)
@@ -142,14 +142,14 @@
     input.memory->description = _("Cache size for raster rows");
 
     output.stream_rast = G_define_standard_option(G_OPT_R_OUTPUT);
-    output.stream_rast->key = "stream_rast";
+    output.stream_rast->key = "stream_raster";
     output.stream_rast->description =
 	_("Name for output raster map with unique stream ids");
     output.stream_rast->required = NO;
     output.stream_rast->guisection = _("Output maps");
 
     output.stream_vect = G_define_standard_option(G_OPT_V_OUTPUT);
-    output.stream_vect->key = "stream_vect";
+    output.stream_vect->key = "stream_vector";
     output.stream_vect->description =
 	_("Name for output vector map with unique stream ids");
     output.stream_vect->required = NO;

Modified: grass/branches/releasebranch_7_0/raster/r.stream.extract/r.stream.extract.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.stream.extract/r.stream.extract.html	2014-12-24 11:01:14 UTC (rev 63707)
+++ grass/branches/releasebranch_7_0/raster/r.stream.extract/r.stream.extract.html	2014-12-24 11:03:47 UTC (rev 63708)
@@ -134,11 +134,11 @@
 segment, at confluences and at stream network outlet locations.
 
 <p>
-Output <b>stream_rast</b> raster map stores extracted streams. Cell
+Output <b>stream_raster</b> raster map stores extracted streams. Cell
 values encode a unique ID for each stream segment.
 
 <p>
-Output <b>stream_vect</b> vector map stores extracted stream segments
+Output <b>stream_vector</b> vector map stores extracted stream segments
 and points. Points are written at the start location of each stream
 segment and at the outlet of a stream network. In layer 1, categories
 are unique IDs, identical to the cell value of the raster output. The

More information about the grass-commit mailing list