[GRASS-SVN] r63246 - in grass/trunk: lib/gis raster/r.resamp.rst raster/r.shaded.relief raster/r.slope.aspect raster3d/r3.out.vtk vector/v.out.vtk vector/v.sample vector/v.surf.rst vector/v.vol.rst
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Nov 28 06:45:21 PST 2014
Author: martinl
Date: 2014-11-28 06:45:21 -0800 (Fri, 28 Nov 2014)
New Revision: 63246
Modified:
grass/trunk/lib/gis/renamed_options
grass/trunk/raster/r.resamp.rst/main.c
grass/trunk/raster/r.shaded.relief/main.c
grass/trunk/raster/r.slope.aspect/main.c
grass/trunk/raster3d/r3.out.vtk/parameters.c
grass/trunk/vector/v.out.vtk/main.c
grass/trunk/vector/v.sample/main.c
grass/trunk/vector/v.surf.rst/main.c
grass/trunk/vector/v.vol.rst/main.c
Log:
rename zmultiplier to zscale (#2409)
Modified: grass/trunk/lib/gis/renamed_options
===================================================================
--- grass/trunk/lib/gis/renamed_options 2014-11-28 14:41:54 UTC (rev 63245)
+++ grass/trunk/lib/gis/renamed_options 2014-11-28 14:45:21 UTC (rev 63246)
@@ -335,18 +335,18 @@
r.resamp.rst|pcurv:pcurvature
r.resamp.rst|mcurv:mcurvature
r.resamp.rst|tcurv:trucravture
-r.resamp.rst|zmult:zmultiplier
+r.resamp.rst|zmult:zscale
# r.slope.aspect
r.slope.aspect|pcurv:pcurvature
r.slope.aspect|tcurv:tcurvature
-r.slope.aspect|zfactor:zmultiplier
+r.slope.aspect|zfactor:zscale
r.slope.aspect|min_slp_allowed:min_slope
# r.spreadpath
r.spreadpath|coordinate:coordinates
# r.terraflow
r.terraflow|stream_dir:directory
# r.out.vtk
-r.out.vtk|elevscale:zmultiplier
+r.out.vtk|elevscale:zscale
############################
### Raster 3D module changes
############################
@@ -360,7 +360,7 @@
# r3.out.ascii
r3.out.ascii|null:null_value
# r3.out.vtk
-r3.out.vtk|elevscale:zmultiplier
+r3.out.vtk|elevscale:zscale
#########################
### Vector module changes
#########################
@@ -438,12 +438,12 @@
v.out.postgis|olayer:output_layer
v.out.postgis|olink:output_link
# v.out.vtk
-v.out.vtk|scale:zmultiplier
+v.out.vtk|scale:zscale
# v.qcount
v.qcount|n:nquadrants
v.qcount|r:radius
# v.sample
-v.sample|z:zmultiplier
+v.sample|z:zscale
# v.segment
v.segment|file:segments
# v.surf.rst
@@ -451,7 +451,7 @@
v.surf.rst|tcurv:tcurvature
v.surf.rst|mcurv:mcurvature
v.surf.rst|scolumn:smooth_column
-v.surf.rst|zmulti:zmultiplier
+v.surf.rst|zmulti:zscale
# v.to.db
v.to.db|qlayer:query_layer
v.to.db|qcolumn:query_column
@@ -474,7 +474,7 @@
v.vol.rst|devi:deviations
v.vol.rst|scolumn:smooth_column
v.vol.rst|wmulti:wmultiplier
-v.vol.rst|zmulti:zmultiplier
+v.vol.rst|zmulti:zscale
v.vol.rst|cellout:cross_output
v.vol.rst|elev:elevation
v.vol.rst|aspect1:aspect_horizontal
Modified: grass/trunk/raster/r.resamp.rst/main.c
===================================================================
--- grass/trunk/raster/r.resamp.rst/main.c 2014-11-28 14:41:54 UTC (rev 63245)
+++ grass/trunk/raster/r.resamp.rst/main.c 2014-11-28 14:45:21 UTC (rev 63246)
@@ -224,7 +224,7 @@
parm.overlap->guisection = _("Settings");
parm.zmult = G_define_option();
- parm.zmult->key = "zmultiplier";
+ parm.zmult->key = "zscale";
parm.zmult->type = TYPE_DOUBLE;
parm.zmult->answer = ZMULT;
parm.zmult->required = NO;
Modified: grass/trunk/raster/r.shaded.relief/main.c
===================================================================
--- grass/trunk/raster/r.shaded.relief/main.c 2014-11-28 14:41:54 UTC (rev 63245)
+++ grass/trunk/raster/r.shaded.relief/main.c 2014-11-28 14:45:21 UTC (rev 63246)
@@ -134,7 +134,7 @@
parm.azimuth->guisection = _("Sun position");
parm.zmult = G_define_option();
- parm.zmult->key = "zmultiplier";
+ parm.zmult->key = "zscale";
parm.zmult->type = TYPE_DOUBLE;
parm.zmult->required = NO;
parm.zmult->answer = "1";
Modified: grass/trunk/raster/r.slope.aspect/main.c
===================================================================
--- grass/trunk/raster/r.slope.aspect/main.c 2014-11-28 14:41:54 UTC (rev 63245)
+++ grass/trunk/raster/r.slope.aspect/main.c 2014-11-28 14:45:21 UTC (rev 63246)
@@ -236,7 +236,7 @@
parm.dxy->guisection = _("Outputs");
parm.zfactor = G_define_option();
- parm.zfactor->key = "zmultiplier";
+ parm.zfactor->key = "zscale";
parm.zfactor->description =
_("Multiplicative factor to convert elevation units to meters");
parm.zfactor->type = TYPE_DOUBLE;
Modified: grass/trunk/raster3d/r3.out.vtk/parameters.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/parameters.c 2014-11-28 14:41:54 UTC (rev 63245)
+++ grass/trunk/raster3d/r3.out.vtk/parameters.c 2014-11-28 14:45:21 UTC (rev 63246)
@@ -88,7 +88,7 @@
_("Three (x,y,z) 3D raster maps to create vector values [xmap,ymap,zmap]");
param.elevscale = G_define_option();
- param.elevscale->key = "zmultiplier";
+ param.elevscale->key = "zscale";
param.elevscale->type = TYPE_DOUBLE;
param.elevscale->required = NO;
param.elevscale->description = _("Scale factor for elevation");
Modified: grass/trunk/vector/v.out.vtk/main.c
===================================================================
--- grass/trunk/vector/v.out.vtk/main.c 2014-11-28 14:41:54 UTC (rev 63245)
+++ grass/trunk/vector/v.out.vtk/main.c 2014-11-28 14:45:21 UTC (rev 63246)
@@ -70,7 +70,7 @@
_("Number of significant digits (floating point only)");
scale = G_define_option();
- scale->key = "zmultiplier";
+ scale->key = "zscale";
scale->type = TYPE_DOUBLE;
scale->required = NO;
scale->description = _("Scale factor for elevation");
Modified: grass/trunk/vector/v.sample/main.c
===================================================================
--- grass/trunk/vector/v.sample/main.c 2014-11-28 14:41:54 UTC (rev 63245)
+++ grass/trunk/vector/v.sample/main.c 2014-11-28 14:45:21 UTC (rev 63246)
@@ -99,7 +99,7 @@
parm.method->answer = "nearest";
parm.z = G_define_option();
- parm.z->key = "zmultiplier";
+ parm.z->key = "zscale";
parm.z->type = TYPE_DOUBLE;
parm.z->required = NO;
parm.z->answer = "1.0";
Modified: grass/trunk/vector/v.surf.rst/main.c
===================================================================
--- grass/trunk/vector/v.surf.rst/main.c 2014-11-28 14:41:54 UTC (rev 63245)
+++ grass/trunk/vector/v.surf.rst/main.c 2014-11-28 14:45:21 UTC (rev 63246)
@@ -310,7 +310,7 @@
parm.dmax->guisection = _("Parameters");
parm.zmult = G_define_option();
- parm.zmult->key = "zmultiplier";
+ parm.zmult->key = "zscale";
parm.zmult->type = TYPE_DOUBLE;
parm.zmult->answer = ZMULT;
parm.zmult->required = NO;
Modified: grass/trunk/vector/v.vol.rst/main.c
===================================================================
--- grass/trunk/vector/v.vol.rst/main.c 2014-11-28 14:41:54 UTC (rev 63245)
+++ grass/trunk/vector/v.vol.rst/main.c 2014-11-28 14:45:21 UTC (rev 63246)
@@ -347,7 +347,7 @@
parm.wmult->guisection = _("Settings");
parm.zmult = G_define_option();
- parm.zmult->key = "zmultiplier";
+ parm.zmult->key = "zscale";
parm.zmult->type = TYPE_DOUBLE;
parm.zmult->answer = ZMULT;
parm.zmult->required = NO;
More information about the grass-commit
mailing list