[GRASS-SVN] r64088 - in grass/trunk: lib/gis raster/r.param.scale raster/r.walk

[svn_grass at osgeo.org]

Author: neteler
Date: 2015-01-12 05:48:48 -0800 (Mon, 12 Jan 2015)
New Revision: 64088

Modified:
   grass/trunk/lib/gis/renamed_options
   grass/trunk/raster/r.param.scale/interface.c
   grass/trunk/raster/r.walk/main.c
Log:
r.param.scale+r.walk: parameter standardization (trac #2409)

Modified: grass/trunk/lib/gis/renamed_options
===================================================================
--- grass/trunk/lib/gis/renamed_options	2015-01-12 13:47:23 UTC (rev 64087)
+++ grass/trunk/lib/gis/renamed_options	2015-01-12 13:48:48 UTC (rev 64088)
@@ -278,9 +278,10 @@
 # r.out.vtk
 r.out.vtk|elevscale:zscale
 # r.param.scale
-r.param.scale|s_tol:slope_tolerance
 r.param.scale|c_tol:curvature_tolerance
 r.param.scale|exp:exponent
+r.param.scale|param:method
+r.param.scale|s_tol:slope_tolerance
 # r.plane
 r.plane|name:output
 # r.profile
@@ -396,6 +397,7 @@
 r.uslek|usle_k:output
 # r.walk
 r.walk|coordinate:start_coordinates
+r.walk|percent_memory:memory
 r.walk|start_rast:start_raster
 # r.water.outlet
 r.water.outlet|drainage:input

Modified: grass/trunk/raster/r.param.scale/interface.c
===================================================================
--- grass/trunk/raster/r.param.scale/interface.c	2015-01-12 13:47:23 UTC (rev 64087)
+++ grass/trunk/raster/r.param.scale/interface.c	2015-01-12 13:48:48 UTC (rev 64088)
@@ -96,7 +96,7 @@
     win_size->options = G_store(buf);
     win_size->answer = "3";
 
-    parameter->key = "param";
+    parameter->key = "method";
     parameter->description =
 	_("Morphometric parameter in 'size' window to calculate");
     parameter->type = TYPE_STRING;

Modified: grass/trunk/raster/r.walk/main.c
===================================================================
--- grass/trunk/raster/r.walk/main.c	2015-01-12 13:47:23 UTC (rev 64087)
+++ grass/trunk/raster/r.walk/main.c	2015-01-12 13:48:48 UTC (rev 64088)
@@ -254,7 +254,7 @@
     opt6->guisection = _("NULL cells");
 
     opt10 = G_define_option();
-    opt10->key = "percent_memory";
+    opt10->key = "memory";
     opt10->type = TYPE_INTEGER;
     opt10->key_desc = "value";
     opt10->required = NO;