[GRASS-SVN] r63172 - in grass/branches/releasebranch_7_0: . display/d.colorlist imagery/i.biomass imagery/i.evapo.mh imagery/i.evapo.pt raster/r.to.rast3 temporal temporal/t.rast3d.extract vector/v.mkgrid vector/v.surf.rst vector/v.vol.rst
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Nov 26 15:22:47 PST 2014
Author: neteler
Date: 2014-11-26 15:22:46 -0800 (Wed, 26 Nov 2014)
New Revision: 63172
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/display/d.colorlist/main.c
grass/branches/releasebranch_7_0/imagery/i.biomass/main.c
grass/branches/releasebranch_7_0/imagery/i.evapo.mh/main.c
grass/branches/releasebranch_7_0/imagery/i.evapo.pt/main.c
grass/branches/releasebranch_7_0/raster/r.to.rast3/main.c
grass/branches/releasebranch_7_0/temporal/
grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.py
grass/branches/releasebranch_7_0/vector/v.mkgrid/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:
use standardized options (#2409) (trunk, r63170)
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,63153-63154,63157,63165
+ /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-63154,63157,63165,63170
Modified: grass/branches/releasebranch_7_0/display/d.colorlist/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.colorlist/main.c 2014-11-26 23:22:21 UTC (rev 63171)
+++ grass/branches/releasebranch_7_0/display/d.colorlist/main.c 2014-11-26 23:22:46 UTC (rev 63172)
@@ -39,12 +39,9 @@
"separator (default is comma).";
/* set up option */
- sep = G_define_option();
- sep->key = "fs";
- sep->type = TYPE_STRING;
- sep->required = NO;
+ sep = G_define_standard_option(G_OPT_F_SEP);
+ sep->key = "separator";
sep->description = "Character for separation of list items";
- sep->answer = ",";
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
Modified: grass/branches/releasebranch_7_0/imagery/i.biomass/main.c
===================================================================
--- grass/branches/releasebranch_7_0/imagery/i.biomass/main.c 2014-11-26 23:22:21 UTC (rev 63171)
+++ grass/branches/releasebranch_7_0/imagery/i.biomass/main.c 2014-11-26 23:22:46 UTC (rev 63172)
@@ -60,7 +60,7 @@
input1->description = _("Name of fPAR raster map");
input2 = G_define_standard_option(G_OPT_R_INPUT);
- input2->key = "lightuseefficiency";
+ input2->key = "lightuse_efficiency";
input2->description =
_("Name of light use efficiency raster map (UZB:cotton=1.9)");
@@ -73,12 +73,12 @@
input4->description = _("Name of Day of Year raster map [1-366]");
input5 = G_define_standard_option(G_OPT_R_INPUT);
- input5->key = "transmissivitysingleway";
+ input5->key = "transmissivity_singleway";
input5->description =
_("Name of single-way transmissivity raster map [0.0-1.0]");
input6 = G_define_standard_option(G_OPT_R_INPUT);
- input6->key = "wateravailability";
+ input6->key = "water_availability";
input6->description =
_("Value of water availability raster map [0.0-1.0]");
Modified: grass/branches/releasebranch_7_0/imagery/i.evapo.mh/main.c
===================================================================
--- grass/branches/releasebranch_7_0/imagery/i.evapo.mh/main.c 2014-11-26 23:22:21 UTC (rev 63171)
+++ grass/branches/releasebranch_7_0/imagery/i.evapo.mh/main.c 2014-11-26 23:22:46 UTC (rev 63172)
@@ -74,19 +74,19 @@
/* Define different options */
input_RNET = G_define_standard_option(G_OPT_R_INPUT);
- input_RNET->key = "netradiationdiurnal";
+ input_RNET->key = "netradiation_diurnal";
input_RNET->description = _("Name of input diurnal net radiation raster map [W/m2/d]");
input_TEMPKAVG = G_define_standard_option(G_OPT_R_INPUT);
- input_TEMPKAVG->key = "averagetemperature";
+ input_TEMPKAVG->key = "average_temperature";
input_TEMPKAVG->description = _("Name of input average air temperature raster map [C]");
input_TEMPKMIN = G_define_standard_option(G_OPT_R_INPUT);
- input_TEMPKMIN->key = "minimumtemperature";
+ input_TEMPKMIN->key = "minimum_temperature";
input_TEMPKMIN->description = _("Name of input minimum air temperature raster map [C]");
input_TEMPKMAX = G_define_standard_option(G_OPT_R_INPUT);
- input_TEMPKMAX->key = "maximumtemperature";
+ input_TEMPKMAX->key = "maximum_temperature";
input_TEMPKMAX->description = _("Name of input maximum air temperature raster map [C]");
input_P = G_define_standard_option(G_OPT_R_INPUT);
Modified: grass/branches/releasebranch_7_0/imagery/i.evapo.pt/main.c
===================================================================
--- grass/branches/releasebranch_7_0/imagery/i.evapo.pt/main.c 2014-11-26 23:22:21 UTC (rev 63171)
+++ grass/branches/releasebranch_7_0/imagery/i.evapo.pt/main.c 2014-11-26 23:22:46 UTC (rev 63172)
@@ -71,23 +71,23 @@
/* Define different options */
input_RNET = G_define_standard_option(G_OPT_R_INPUT);
- input_RNET->key = "netradiation";
+ input_RNET->key = "net_radiation";
input_RNET->description = _("Name of input net radiation raster map [W/m2]");
input_G0 = G_define_standard_option(G_OPT_R_INPUT);
- input_G0->key = "soilheatflux";
+ input_G0->key = "soil_heatflux";
input_G0->description = _("Name of input soil heat flux raster map [W/m2]");
input_TEMPKA = G_define_standard_option(G_OPT_R_INPUT);
- input_TEMPKA->key = "airtemperature";
+ input_TEMPKA->key = "air_temperature";
input_TEMPKA->description = _("Name of input air temperature raster map [K]");
input_PATM = G_define_standard_option(G_OPT_R_INPUT);
- input_PATM->key = "atmosphericpressure";
+ input_PATM->key = "atmospheric_pressure";
input_PATM->description = _("Name of input atmospheric pressure raster map [millibars]");
input_PT = G_define_option();
- input_PT->key = "priestleytaylorcoef";
+ input_PT->key = "priestley_taylor_coef";
input_PT->type = TYPE_DOUBLE;
input_PT->required = YES;
input_PT->description = _("Priestley-Taylor coefficient");
Modified: grass/branches/releasebranch_7_0/raster/r.to.rast3/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.to.rast3/main.c 2014-11-26 23:22:21 UTC (rev 63171)
+++ grass/branches/releasebranch_7_0/raster/r.to.rast3/main.c 2014-11-26 23:22:46 UTC (rev 63172)
@@ -76,7 +76,7 @@
void set_params()
{
param.input = G_define_standard_option(G_OPT_R_INPUTS);
- param.input->description = _("2d raster maps which represent the slices");
+ param.input->description = _("2D raster maps which represent the slices");
param.output = G_define_standard_option(G_OPT_R3_OUTPUT);
@@ -223,11 +223,11 @@
rows = Rast_window_rows();
cols = Rast_window_cols();
- G_debug(2, "Check the 2d and 3d region settings");
+ G_debug(2, "Check the 2D and 3D region settings");
/*If not equal, set the 2D windows correct */
if (rows != region.rows || cols != region.cols) {
- G_message(_("The 2D and 3D region settings are different. I will use the 3D region settings to adjust the 2D region."));
+ G_message(_("The 2D and 3D region settings are different. Using the 3D region settings to adjust the 2D region."));
G_get_set_window(&window2d);
window2d.ns_res = region.ns_res;
window2d.ew_res = region.ew_res;
Property changes on: grass/branches/releasebranch_7_0/temporal
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:62868,62873
/grass/trunk/temporal:59684,59915-59916,60017-60018,60024,60026,60173-60174,60213,60547-60548,60732-60733,60817,61031,61066,61071-61072,61083,61096,61141,61157-61158,61179-61180,61186,61191-61194,61215,61239-61243,61274-61275,61282-61288,61301,61429-61433,61455,61457,61732,61734,61759-61762,61806-61807,61848,61885,61955-61957,61983-61985,61997-62000,62016,62021-62022,62025,62111-62113,62120-62121,62179-62180,62182,62343,62361,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,62594-62597,62603,62606,62608-62609,62613-62614,62616,62618,62625-62628,62631-62632,62635-62638,62640-62642,62644,62646-62649,62652,62654-62657,62666,62691,62703-62705,62709-62712,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62775,62785,62798,62800-62801,62803,62805,62812,62814-62815,62822,62824,62831,62838,62847,62856,62868,62871,62873,62875,63035,63085,63087,63089,63
091,63093
+ /grass/trunk:62868,62873
/grass/trunk/temporal:59684,59915-59916,60017-60018,60024,60026,60173-60174,60213,60547-60548,60732-60733,60817,61031,61066,61071-61072,61083,61096,61141,61157-61158,61179-61180,61186,61191-61194,61215,61239-61243,61274-61275,61282-61288,61301,61429-61433,61455,61457,61732,61734,61759-61762,61806-61807,61848,61885,61955-61957,61983-61985,61997-62000,62016,62021-62022,62025,62111-62113,62120-62121,62179-62180,62182,62343,62361,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,62594-62597,62603,62606,62608-62609,62613-62614,62616,62618,62625-62628,62631-62632,62635-62638,62640-62642,62644,62646-62649,62652,62654-62657,62666,62691,62703-62705,62709-62712,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62775,62785,62798,62800-62801,62803,62805,62812,62814-62815,62822,62824,62831,62838,62847,62856,62868,62871,62873,62875,63035,63085,63087,63089,63
091,63093,63170
Modified: grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.py
===================================================================
--- grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.py 2014-11-26 23:22:21 UTC (rev 63171)
+++ grass/branches/releasebranch_7_0/temporal/t.rast3d.extract/t.rast3d.extract.py 2014-11-26 23:22:46 UTC (rev 63172)
@@ -40,7 +40,7 @@
#%option
#% key: basename
#% type: string
-#% description: Base name of the new created 3D raster maps
+#% description: Basename of the new generated 3D raster maps
#% required: no
#% multiple: no
#%end
Modified: grass/branches/releasebranch_7_0/vector/v.mkgrid/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.mkgrid/main.c 2014-11-26 23:22:21 UTC (rev 63171)
+++ grass/branches/releasebranch_7_0/vector/v.mkgrid/main.c 2014-11-26 23:22:46 UTC (rev 63172)
@@ -99,12 +99,7 @@
_("use 'coor' and 'box' options"));
position_opt->descriptions = desc;
- coord = G_define_option();
- coord->key = "coor";
- coord->key_desc = "x,y";
- coord->type = TYPE_DOUBLE;
- coord->required = NO;
- coord->multiple = NO;
+ coord = G_define_standard_option(G_OPT_M_COORDS);
coord->description =
_("Lower left easting and northing coordinates of map");
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-26 23:22:21 UTC (rev 63171)
+++ grass/branches/releasebranch_7_0/vector/v.surf.rst/main.c 2014-11-26 23:22:46 UTC (rev 63172)
@@ -221,7 +221,7 @@
parm.mcurv->guisection = _("Outputs");
parm.devi = G_define_standard_option(G_OPT_V_OUTPUT);
- parm.devi->key = "devi";
+ parm.devi->key = "deviations";
parm.devi->required = NO;
parm.devi->description = _("Name for output deviations vector point map");
parm.devi->guisection = _("Outputs");
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 23:22:21 UTC (rev 63171)
+++ grass/branches/releasebranch_7_0/vector/v.vol.rst/main.c 2014-11-26 23:22:46 UTC (rev 63172)
@@ -288,7 +288,7 @@
parm.wheresql = G_define_standard_option(G_OPT_DB_WHERE);
parm.devi = G_define_standard_option(G_OPT_V_OUTPUT);
- parm.devi->key = "devi";
+ parm.devi->key = "deviations";
parm.devi->required = NO;
parm.devi->description = _("Name for output deviations vector point map");
parm.devi->guisection = _("Outputs");
More information about the grass-commit
mailing list