[GRASS-SVN] r63247 - in grass/branches/releasebranch_7_0: . 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:46:22 PST 2014
Author: martinl
Date: 2014-11-28 06:46:22 -0800 (Fri, 28 Nov 2014)
New Revision: 63247
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/lib/gis/renamed_options
grass/branches/releasebranch_7_0/raster/r.resamp.rst/main.c
grass/branches/releasebranch_7_0/raster/r.shaded.relief/main.c
grass/branches/releasebranch_7_0/raster/r.slope.aspect/main.c
grass/branches/releasebranch_7_0/raster3d/r3.out.vtk/parameters.c
grass/branches/releasebranch_7_0/vector/v.out.vtk/main.c
grass/branches/releasebranch_7_0/vector/v.sample/main.c
grass/branches/releasebranch_7_0/vector/v.surf.rst/main.c
grass/branches/releasebranch_7_0/vector/v.vol.rst/main.c
Log:
rename zmultiplier to zscale (#2409)
(merge r63246 from trunk)
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
+ /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
Modified: grass/branches/releasebranch_7_0/lib/gis/renamed_options
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/renamed_options 2014-11-28 14:45:21 UTC (rev 63246)
+++ grass/branches/releasebranch_7_0/lib/gis/renamed_options 2014-11-28 14:46:22 UTC (rev 63247)
@@ -322,18 +322,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
############################
@@ -347,7 +347,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
#########################
@@ -428,12 +428,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.segments
v.segments|file:segments
# v.surf.rst
@@ -441,7 +441,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
@@ -464,7 +464,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/branches/releasebranch_7_0/raster/r.resamp.rst/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.resamp.rst/main.c 2014-11-28 14:45:21 UTC (rev 63246)
+++ grass/branches/releasebranch_7_0/raster/r.resamp.rst/main.c 2014-11-28 14:46:22 UTC (rev 63247)
@@ -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/branches/releasebranch_7_0/raster/r.shaded.relief/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.shaded.relief/main.c 2014-11-28 14:45:21 UTC (rev 63246)
+++ grass/branches/releasebranch_7_0/raster/r.shaded.relief/main.c 2014-11-28 14:46:22 UTC (rev 63247)
@@ -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/branches/releasebranch_7_0/raster/r.slope.aspect/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.slope.aspect/main.c 2014-11-28 14:45:21 UTC (rev 63246)
+++ grass/branches/releasebranch_7_0/raster/r.slope.aspect/main.c 2014-11-28 14:46:22 UTC (rev 63247)
@@ -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/branches/releasebranch_7_0/raster3d/r3.out.vtk/parameters.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.out.vtk/parameters.c 2014-11-28 14:45:21 UTC (rev 63246)
+++ grass/branches/releasebranch_7_0/raster3d/r3.out.vtk/parameters.c 2014-11-28 14:46:22 UTC (rev 63247)
@@ -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/branches/releasebranch_7_0/vector/v.out.vtk/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.out.vtk/main.c 2014-11-28 14:45:21 UTC (rev 63246)
+++ grass/branches/releasebranch_7_0/vector/v.out.vtk/main.c 2014-11-28 14:46:22 UTC (rev 63247)
@@ -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/branches/releasebranch_7_0/vector/v.sample/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.sample/main.c 2014-11-28 14:45:21 UTC (rev 63246)
+++ grass/branches/releasebranch_7_0/vector/v.sample/main.c 2014-11-28 14:46:22 UTC (rev 63247)
@@ -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/branches/releasebranch_7_0/vector/v.surf.rst/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.surf.rst/main.c 2014-11-28 14:45:21 UTC (rev 63246)
+++ grass/branches/releasebranch_7_0/vector/v.surf.rst/main.c 2014-11-28 14:46:22 UTC (rev 63247)
@@ -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/branches/releasebranch_7_0/vector/v.vol.rst/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.vol.rst/main.c 2014-11-28 14:45:21 UTC (rev 63246)
+++ grass/branches/releasebranch_7_0/vector/v.vol.rst/main.c 2014-11-28 14:46:22 UTC (rev 63247)
@@ -349,7 +349,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