[GRASS-SVN] r63156 - in grass/branches/releasebranch_7_0: . vector/v.vol.rst
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Nov 26 09:30:59 PST 2014
Author: martinl
Date: 2014-11-26 09:30:59 -0800 (Wed, 26 Nov 2014)
New Revision: 63156
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/vector/v.vol.rst/main.c
Log:
v.vol.rst: use standardized options (#2409) - (merge r63153 from trunk)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60817,61096,61141,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,62856,62879,62881,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
+ /grass/trunk:60817,61096,61141,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,62856,62879,62881,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
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-26 17:30:53 UTC (rev 63155)
+++ grass/branches/releasebranch_7_0/vector/v.vol.rst/main.c 2014-11-26 17:30:59 UTC (rev 63156)
@@ -250,7 +250,7 @@
parm.input->description = NULL; /* no OGR support */
parm.cellinp = G_define_standard_option(G_OPT_R_INPUT);
- parm.cellinp->key = "cellinp";
+ parm.cellinp->key = "cross_input";
parm.cellinp->required = NO;
parm.cellinp->description =
_("Name of input surface raster map for cross-section");
@@ -260,7 +260,7 @@
parm.colnum->key = "wcolumn";
parm.colnum->required = NO;
parm.colnum->description =
- _("Name of column containing w attribute to interpolate");
+ _("Name of column containing w-values attribute to interpolate");
parm.fi = G_define_option();
parm.fi->key = "tension";
@@ -279,7 +279,7 @@
parm.rsm->guisection = _("Settings");
parm.scol = G_define_standard_option(G_OPT_DB_COLUMN);
- parm.scol->key = "scolumn";
+ parm.scol->key = "smooth_column";
parm.scol->required = NO;
parm.scol->description =
_("Name of column with smoothing parameters");
@@ -340,7 +340,7 @@
parm.dmin1->guisection = _("Settings");
parm.wmult = G_define_option();
- parm.wmult->key = "wmult";
+ parm.wmult->key = "wmultiplier";
parm.wmult->type = TYPE_DOUBLE;
parm.wmult->answer = ZMULT;
parm.wmult->required = NO;
@@ -349,7 +349,7 @@
parm.wmult->guisection = _("Settings");
parm.zmult = G_define_option();
- parm.zmult->key = "zmult";
+ parm.zmult->key = "zmultiplier";
parm.zmult->type = TYPE_DOUBLE;
parm.zmult->answer = ZMULT;
parm.zmult->required = NO;
@@ -357,13 +357,13 @@
parm.zmult->guisection = _("Settings");
parm.cellout = G_define_standard_option(G_OPT_R_OUTPUT);
- parm.cellout->key = "cellout";
+ parm.cellout->key = "cross_output";
parm.cellout->required = NO;
parm.cellout->description = _("Name for output cross-section raster map");
parm.cellout->guisection = _("Outputs");
parm.outz = G_define_standard_option(G_OPT_R3_OUTPUT);
- parm.outz->key = "elev";
+ parm.outz->key = "elevation";
parm.outz->required = NO;
parm.outz->description = _("Name for output elevation 3D raster map");
parm.outz->guisection = _("Outputs");
@@ -375,32 +375,32 @@
parm.gradient->guisection = _("Outputs");
parm.aspect1 = G_define_standard_option(G_OPT_R3_OUTPUT);
- parm.aspect1->key = "aspect1";
+ parm.aspect1->key = "aspect_horizontal";
parm.aspect1->required = NO;
parm.aspect1->description =
_("Name for output gradient horizontal angle 3D raster map");
parm.aspect1->guisection = _("Outputs");
parm.aspect2 = G_define_standard_option(G_OPT_R3_OUTPUT);
- parm.aspect2->key = "aspect2";
+ parm.aspect2->key = "aspect_vertical";
parm.aspect2->required = NO;
parm.aspect2->description = _("Name for output gradient vertical angle 3D raster map");
parm.aspect2->guisection = _("Outputs");
parm.ncurv = G_define_standard_option(G_OPT_R3_OUTPUT);
- parm.ncurv->key = "ncurv";
+ parm.ncurv->key = "ncurvature";
parm.ncurv->required = NO;
parm.ncurv->description = _("Name for output change of gradient 3D raster map");
parm.ncurv->guisection = _("Outputs");
parm.gcurv = G_define_standard_option(G_OPT_R3_OUTPUT);
- parm.gcurv->key = "gcurv";
+ parm.gcurv->key = "gcurvature";
parm.gcurv->required = NO;
parm.gcurv->description = _("Name for output Gaussian curvature 3D raster map");
parm.gcurv->guisection = _("Outputs");
parm.mcurv = G_define_standard_option(G_OPT_R3_OUTPUT);
- parm.mcurv->key = "mcurv";
+ parm.mcurv->key = "mcurvature";
parm.mcurv->required = NO;
parm.mcurv->description = _("Name for output mean curvature 3D raster map");
parm.mcurv->guisection = _("Outputs");
More information about the grass-commit
mailing list