[GRASS-SVN] r63343 - in grass/branches/releasebranch_7_0: . raster/r.sim/r.sim.sediment raster/r.sim/r.sim.water
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Dec 2 18:51:56 PST 2014
Author: annakrat
Date: 2014-12-02 18:51:56 -0800 (Tue, 02 Dec 2014)
New Revision: 63343
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/raster/r.sim/r.sim.sediment/main.c
grass/branches/releasebranch_7_0/raster/r.sim/r.sim.water/main.c
Log:
r.sim: reorganize options in guisections (merge from trunk, r63342)
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,63240,63246,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63302,63315,63319,63330,63332,63339
+ /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,63250,63255,63259,63261,63276,63279,63281,63283,63287,63290,63292,63302,63315,63319,63330,63332,63339,63342
Modified: grass/branches/releasebranch_7_0/raster/r.sim/r.sim.sediment/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.sim/r.sim.sediment/main.c 2014-12-03 02:50:33 UTC (rev 63342)
+++ grass/branches/releasebranch_7_0/raster/r.sim/r.sim.sediment/main.c 2014-12-03 02:51:56 UTC (rev 63343)
@@ -159,27 +159,13 @@
parm.maninval->description = _("Manning's n unique value");
parm.maninval->guisection = _("Input");
- parm.outwalk = G_define_standard_option(G_OPT_V_OUTPUT);
- parm.outwalk->key = "walkers_output";
- parm.outwalk->required = NO;
- parm.outwalk->description =
- _("Base name of the output walkers vector points map");
- parm.outwalk->guisection = _("Output options");
-
parm.observation = G_define_standard_option(G_OPT_V_INPUT);
parm.observation->key = "observation";
parm.observation->required = NO;
- parm.observation->description =
+ parm.observation->label =
_("Name of sampling locations vector points map");
- parm.observation->guisection = _("Input options");
+ parm.observation->guisection = _("Input");
- parm.logfile = G_define_standard_option(G_OPT_F_OUTPUT);
- parm.logfile->key = "logfile";
- parm.logfile->required = NO;
- parm.logfile->description =
- _("Name for sampling points output text file. For each observation vector point the time series of sediment transport is stored.");
- parm.logfile->guisection = _("Output");
-
parm.tc = G_define_standard_option(G_OPT_R_OUTPUT);
parm.tc->key = "sedflow_capacity";
parm.tc->required = NO;
@@ -213,6 +199,20 @@
_("Name for output erosion-deposition raster map [kg/m2s]");
parm.erdep->guisection = _("Output");
+ parm.logfile = G_define_standard_option(G_OPT_F_OUTPUT);
+ parm.logfile->key = "logfile";
+ parm.logfile->required = NO;
+ parm.logfile->description =
+ _("Name for sampling points output text file. For each observation vector point the time series of sediment transport is stored.");
+ parm.logfile->guisection = _("Output");
+
+ parm.outwalk = G_define_standard_option(G_OPT_V_OUTPUT);
+ parm.outwalk->key = "walkers_output";
+ parm.outwalk->required = NO;
+ parm.outwalk->description =
+ _("Base name of the output walkers vector points map");
+ parm.outwalk->guisection = _("Output");
+
parm.nwalk = G_define_option();
parm.nwalk->key = "nwalkers";
parm.nwalk->type = TYPE_INTEGER;
Modified: grass/branches/releasebranch_7_0/raster/r.sim/r.sim.water/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.sim/r.sim.water/main.c 2014-12-03 02:50:33 UTC (rev 63342)
+++ grass/branches/releasebranch_7_0/raster/r.sim/r.sim.water/main.c 2014-12-03 02:51:56 UTC (rev 63343)
@@ -178,17 +178,10 @@
parm.observation = G_define_standard_option(G_OPT_V_INPUT);
parm.observation->key = "observation";
parm.observation->required = NO;
- parm.observation->description =
+ parm.observation->label =
_("Name of sampling locations vector points map");
- parm.observation->guisection = _("Input options");
+ parm.observation->guisection = _("Input");
- parm.logfile = G_define_standard_option(G_OPT_F_OUTPUT);
- parm.logfile->key = "logfile";
- parm.logfile->required = NO;
- parm.logfile->description =
- _("Name for sampling points output text file. For each observation vector point the time series of sediment transport is stored.");
- parm.logfile->guisection = _("Output");
-
parm.depth = G_define_standard_option(G_OPT_R_OUTPUT);
parm.depth->key = "depth";
parm.depth->required = NO;
@@ -210,10 +203,17 @@
parm.outwalk = G_define_standard_option(G_OPT_V_OUTPUT);
parm.outwalk->key = "walkers_output";
parm.outwalk->required = NO;
- parm.outwalk->description =
+ parm.outwalk->label =
_("Base name of the output walkers vector points map");
- parm.outwalk->guisection = _("Output options");
+ parm.outwalk->guisection = _("Output");
+ parm.logfile = G_define_standard_option(G_OPT_F_OUTPUT);
+ parm.logfile->key = "logfile";
+ parm.logfile->required = NO;
+ parm.logfile->description =
+ _("Name for sampling points output text file. For each observation vector point the time series of sediment transport is stored.");
+ parm.logfile->guisection = _("Output");
+
parm.nwalk = G_define_option();
parm.nwalk->key = "nwalkers";
parm.nwalk->type = TYPE_INTEGER;
@@ -287,6 +287,7 @@
flag.tserie = G_define_flag();
flag.tserie->key = 't';
flag.tserie->description = _("Time-series output");
+ flag.tserie->guisection = _("Output");
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
More information about the grass-commit
mailing list