[GRASS-SVN] r48588 - grass/branches/develbranch_6/raster/r.report

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-10-01 13:55:54 -0700 (Sat, 01 Oct 2011)
New Revision: 48588

Modified:
   grass/branches/develbranch_6/raster/r.report/main.c
   grass/branches/develbranch_6/raster/r.report/parse.c
Log:
r.report: more guisections
	  (merge r48587 from trunk)


Modified: grass/branches/develbranch_6/raster/r.report/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.report/main.c	2011-10-01 20:52:15 UTC (rev 48587)
+++ grass/branches/develbranch_6/raster/r.report/main.c	2011-10-01 20:55:54 UTC (rev 48588)
@@ -62,7 +62,7 @@
 
     module = G_define_module();
     module->keywords = _("raster, statistics");
-    module->description = _("Reports statistics for raster map layers.");
+    module->description = _("Reports statistics for raster maps.");
 
     parse_command_line(argc, argv);
 

Modified: grass/branches/develbranch_6/raster/r.report/parse.c
===================================================================
--- grass/branches/develbranch_6/raster/r.report/parse.c	2011-10-01 20:52:15 UTC (rev 48587)
+++ grass/branches/develbranch_6/raster/r.report/parse.c	2011-10-01 20:55:54 UTC (rev 48588)
@@ -46,6 +46,7 @@
 	_("mi;miles;me;meters;k;kilometers;a;acres;"
 	  "h;hectares;c;cell counts;p;percent cover");
     parms.units->options = "mi,me,k,a,h,c,p";
+    parms.units->guisection = _("Output settings");
 
     parms.nv = G_define_option();
     parms.nv->key = "null";
@@ -74,12 +75,14 @@
     parms.pw->description = pw_desc;
     parms.pw->guisection = _("Formatting");
 
-    parms.outfile = G_define_option();
+    parms.outfile = G_define_standard_option(G_OPT_F_OUTPUT);
     parms.outfile->key = "output";
-    parms.outfile->type = TYPE_STRING;
     parms.outfile->required = NO;
+    parms.outfile->label =
+	_("Name for output file to hold the report");
     parms.outfile->description =
-	_("Name of an output file to hold the report");
+	_("If no output given report is printed to standard output");
+    parms.outfile->guisection = _("Output settings");
 
     parms.nsteps = G_define_option();
     parms.nsteps->key = "nsteps";
@@ -89,6 +92,7 @@
     parms.nsteps->answer = "255";
     parms.nsteps->description =
 	_("Number of fp subranges to collect stats from");
+    parms.nsteps->guisection = _("FP maps");
 
     flags.q = G_define_flag();
     flags.q->key = 'q';
@@ -120,11 +124,13 @@
     flags.C = G_define_flag();
     flags.C->key = 'C';
     flags.C->description = _("Report for cats fp ranges (fp maps only)");
+    flags.C->guisection = _("FP maps");
 
     flags.i = G_define_flag();
     flags.i->key = 'i';
     flags.i->description =
 	_("Read fp map as integer (use map's quant rules)");
+    flags.i->guisection = _("FP maps");
 
     /* hidden feature.
      * if first arg is >file just run r.stats into this file and quit