Changes in grass/branches/releasebranch_7_2/raster/r.in.xyz/main.c [70188:70291]

File:

• grass/branches/releasebranch_7_2/raster/r.in.xyz/main.c (modified) (5 diffs)

grass/branches/releasebranch_7_2/raster/r.in.xyz/main.c

@@ -165 +165 @@
         _("Creates a raster map from an assemblage of many coordinates using univariate statistics.");
 
-    input_opt = G_define_standard_option(G_OPT_F_INPUT);
+    input_opt = G_define_standard_option(G_OPT_F_BIN_INPUT);
     input_opt->description =
         _("ASCII file containing input data (or \"-\" to read from stdin)");
 
     output_opt = G_define_standard_option(G_OPT_R_OUTPUT);
-
+    
     method_opt = G_define_option();
     method_opt->key = "method";
@@ -180 +180 @@
     method_opt->answer = "mean";
     method_opt->guisection = _("Statistic");
-
-    type_opt = G_define_standard_option(G_OPT_R_TYPE);
-    type_opt->required = NO;
-    type_opt->answer = "FCELL";
+    G_asprintf((char **)&(method_opt->descriptions),
+               "n;%s;"
+               "min;%s;"
+               "max;%s;"
+               "range;%s;"
+               "sum;%s;"
+               "mean;%s;"
+               "stddev;%s;"
+               "variance;%s;"
+               "coeff_var;%s;"
+               "median;%s;"
+               "percentile;%s;"
+               "skewness;%s;"
+               "trimmean;%s",
+               _("Number of points in cell"),
+               _("Minimum value of point values in cell"),
+               _("Maximum value of point values in cell"),
+               _("Range of point values in cell"),
+               _("Sum of point values in cell"),
+               _("Mean (average) value of point values in cell"),
+               _("Standard deviation of point values in cell"),
+               _("Variance of point values in cell"),
+               _("Coefficient of variance of point values in cell"),
+               _("Median value of point values in cell"),
+               _("Pth (nth) percentile of point values in cell"),
+               _("Skewness of point values in cell"),
+               _("Trimmed mean of point values in cell"));
 
     delim_opt = G_define_standard_option(G_OPT_F_SEP);
@@ -267 +290 @@
     vscale_opt->guisection = _("Advanced Input");
 
+    type_opt = G_define_standard_option(G_OPT_R_TYPE);
+    type_opt->required = NO;
+    type_opt->answer = "FCELL";
+    type_opt->guisection = _("Output");
+
     percent_opt = G_define_option();
     percent_opt->key = "percent";
@@ -282 +310 @@
     pth_opt->required = NO;
     pth_opt->options = "1-100";
-    pth_opt->description = _("pth percentile of the values");
+    pth_opt->description = _("Pth percentile of the values");
     pth_opt->guisection = _("Statistic");
 
@@ -297 +325 @@
     scan_flag->key = 's';
     scan_flag->description = _("Scan data file for extent then exit");
-
+    scan_flag->guisection = _("Scan");
+    scan_flag->suppress_required = YES;
+    
     shell_style = G_define_flag();
     shell_style->key = 'g';
     shell_style->description =
         _("In scan mode, print using shell script style");
-
+    shell_style->guisection = _("Scan");
+    shell_style->suppress_required = YES;
+        
     skipline = G_define_flag();
     skipline->key = 'i';
     skipline->description = _("Ignore broken lines");
 
+    G_option_required(output_opt, scan_flag, shell_style, NULL);
+    G_option_requires(scan_flag, input_opt, NULL);
+    G_option_requires(shell_style, input_opt, NULL);
+    
     if (G_parser(argc, argv))
         exit(EXIT_FAILURE);