[GRASS-SVN] r63278 - in grass/branches/releasebranch_7_0: . lib/gis raster/r.viewshed

svn_grass at osgeo.org svn_grass at osgeo.org
Fri Nov 28 19:03:22 PST 2014


Author: annakrat
Date: 2014-11-28 19:03:22 -0800 (Fri, 28 Nov 2014)
New Revision: 63278

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/lib/gis/renamed_options
   grass/branches/releasebranch_7_0/raster/r.viewshed/main.cpp
Log:
r.viewshed: rename options (merge from trunk, r63276)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,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,62831,62838,62847,62850,62856,62879,62881,62886,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,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,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261
   + /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,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,62831,62838,62847,62850,62856,62879,62881,62886,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,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,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63276

Modified: grass/branches/releasebranch_7_0/lib/gis/renamed_options
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/renamed_options	2014-11-29 02:59:03 UTC (rev 63277)
+++ grass/branches/releasebranch_7_0/lib/gis/renamed_options	2014-11-29 03:03:22 UTC (rev 63278)
@@ -348,6 +348,10 @@
 r.terraflow|stream_dir:directory
 # r.out.vtk
 r.out.vtk|elevscale:zscale
+# r.viewshed
+r.viewshed|obs_elev:observer_elevation
+r.viewshed|tgt_elev:target_elevation
+r.viewshed|max_dist:max_distance
 ############################
 ### Raster 3D module changes
 ############################

Modified: grass/branches/releasebranch_7_0/raster/r.viewshed/main.cpp
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.viewshed/main.cpp	2014-11-29 02:59:03 UTC (rev 63277)
+++ grass/branches/releasebranch_7_0/raster/r.viewshed/main.cpp	2014-11-29 03:03:22 UTC (rev 63278)
@@ -490,7 +490,7 @@
     struct Option *obsElevOpt;
 
     obsElevOpt = G_define_option();
-    obsElevOpt->key = "obs_elev";
+    obsElevOpt->key = "observer_elevation";
     obsElevOpt->type = TYPE_DOUBLE;
     obsElevOpt->required = NO;
     obsElevOpt->key_desc = "value";
@@ -502,7 +502,7 @@
     struct Option *tgtElevOpt;
 
     tgtElevOpt = G_define_option();
-    tgtElevOpt->key = "tgt_elev";
+    tgtElevOpt->key = "target_elevation";
     tgtElevOpt->type = TYPE_DOUBLE;
     tgtElevOpt->required = NO;
     tgtElevOpt->key_desc = "value";
@@ -514,7 +514,7 @@
     struct Option *maxDistOpt;
 
     maxDistOpt = G_define_option();
-    maxDistOpt->key = "max_dist";
+    maxDistOpt->key = "max_distance";
     maxDistOpt->type = TYPE_DOUBLE;
     maxDistOpt->required = NO;
     maxDistOpt->key_desc = "value";



More information about the grass-commit mailing list