[GRASS-SVN] r63342 - in grass/trunk/raster/r.sim: r.sim.sediment r.sim.water

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-12-02 18:50:33 -0800 (Tue, 02 Dec 2014)
New Revision: 63342

Modified:
   grass/trunk/raster/r.sim/r.sim.sediment/main.c
   grass/trunk/raster/r.sim/r.sim.water/main.c
Log:
r.sim: reorganize options in guisections

Modified: grass/trunk/raster/r.sim/r.sim.sediment/main.c
===================================================================
--- grass/trunk/raster/r.sim/r.sim.sediment/main.c	2014-12-02 22:22:47 UTC (rev 63341)
+++ grass/trunk/raster/r.sim/r.sim.sediment/main.c	2014-12-03 02:50:33 UTC (rev 63342)
@@ -158,27 +158,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;
@@ -212,6 +198,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/trunk/raster/r.sim/r.sim.water/main.c
===================================================================
--- grass/trunk/raster/r.sim/r.sim.water/main.c	2014-12-02 22:22:47 UTC (rev 63341)
+++ grass/trunk/raster/r.sim/r.sim.water/main.c	2014-12-03 02:50:33 UTC (rev 63342)
@@ -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);