Selaa lähdekoodia

r.sim: reorganize options in guisections

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63342 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 10 vuotta sitten
vanhempi
commit
ad0fa198aa
2 muutettua tiedostoa jossa 28 lisäystä ja 27 poistoa
  1. 16 16
      raster/r.sim/r.sim.sediment/main.c
  2. 12 11
      raster/r.sim/r.sim.water/main.c

+ 16 - 16
raster/r.sim/r.sim.sediment/main.c

@@ -158,26 +158,12 @@ int main(int argc, char *argv[])
     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.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.observation->guisection = _("Input");
 
     parm.tc = G_define_standard_option(G_OPT_R_OUTPUT);
     parm.tc->key = "sedflow_capacity";
@@ -212,6 +198,20 @@ int main(int argc, char *argv[])
 	_("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;

+ 12 - 11
raster/r.sim/r.sim.water/main.c

@@ -178,16 +178,9 @@ int main(int argc, char *argv[])
     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.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.observation->guisection = _("Input");
 
     parm.depth = G_define_standard_option(G_OPT_R_OUTPUT);
     parm.depth->key = "depth";
@@ -210,9 +203,16 @@ int main(int argc, char *argv[])
     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";
@@ -287,6 +287,7 @@ int main(int argc, char *argv[])
     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);