rename zmultiplier to zscale (https://trac.osgeo.org/grass/ticket/2409)

       (merge https://trac.osgeo.org/grass/changeset/63246 from trunk)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@63247 15284696-431f-4ddb-bdfa-cd5b030d7da7

lib/gis/renamed_options

@@ -322,18 +322,18 @@ r.resamp.rst|elev:elevation
 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
 ############################
@@ -347,7 +347,7 @@ r3.gwflow|vz:velocity_z
 # 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
 #########################
@@ -428,12 +428,12 @@ v.out.postgis|dsn:output
 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.segments
 v.segments|file:segments 
 # v.surf.rst
@@ -441,7 +441,7 @@ v.surf.rst|pcurv:pcurvature
 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 
@@ -464,7 +464,7 @@ v.vol.rst|cellinp:cross_input
 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

raster/r.resamp.rst/main.c

@@ -224,7 +224,7 @@ int main(int argc, char *argv[])
     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;

raster/r.shaded.relief/main.c

@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
     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";

raster/r.slope.aspect/main.c

@@ -236,7 +236,7 @@ int main(int argc, char *argv[])
     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;

raster3d/r3.out.vtk/parameters.c

@@ -88,7 +88,7 @@ void set_params()
 	_("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");

vector/v.out.vtk/main.c

@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
 	_("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");

vector/v.sample/main.c

@@ -99,7 +99,7 @@ int main(int argc, char **argv)
     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";

vector/v.surf.rst/main.c

@@ -310,7 +310,7 @@ int main(int argc, char *argv[])
     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;

vector/v.vol.rst/main.c

@@ -349,7 +349,7 @@ int main(int argc, char *argv[])
     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;