[GRASS-SVN] r63103 - in grass/branches/releasebranch_7_0: include lib/gis

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-11-26 08:17:47 -0800 (Wed, 26 Nov 2014)
New Revision: 63103

Modified:
   grass/branches/releasebranch_7_0/include/gis.h
   grass/branches/releasebranch_7_0/lib/gis/parser_help.c
   grass/branches/releasebranch_7_0/lib/gis/parser_rest.c
   grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c
Log:
libgis: parser sync to trunk

Modified: grass/branches/releasebranch_7_0/include/gis.h
===================================================================
--- grass/branches/releasebranch_7_0/include/gis.h	2014-11-26 16:17:44 UTC (rev 63102)
+++ grass/branches/releasebranch_7_0/include/gis.h	2014-11-26 16:17:47 UTC (rev 63103)
@@ -218,6 +218,7 @@
     G_OPT_R_INPUT,		/*!< old input raster map */
     G_OPT_R_INPUTS,		/*!< old input raster maps */
     G_OPT_R_OUTPUT,		/*!< new output raster map */
+    G_OPT_R_OUTPUTS,		/*!< new output raster maps */
     G_OPT_R_MAP,		/*!< old input raster map */
     G_OPT_R_MAPS,		/*!< old input rasters map */
     G_OPT_R_BASE,		/*!< old input base raster map */

Modified: grass/branches/releasebranch_7_0/lib/gis/parser_help.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/parser_help.c	2014-11-26 16:17:44 UTC (rev 63102)
+++ grass/branches/releasebranch_7_0/lib/gis/parser_help.c	2014-11-26 16:17:47 UTC (rev 63103)
@@ -164,6 +164,9 @@
     strcpy(item, " [--quiet]");
     len = show(fp, item, len);
 
+    strcpy(item, " [--ui]");
+    len = show(fp, item, len);
+
     fprintf(fp, "\n");
 
     /* Print help info for flags */
@@ -199,7 +202,8 @@
     fprintf(fp, " --h   %s\n", _("Print usage summary"));
     fprintf(fp, " --v   %s\n", _("Verbose module output"));
     fprintf(fp, " --q   %s\n", _("Quiet module output"));
-
+    fprintf(fp, " --ui  %s\n", _("Force launching GUI dialog"));
+    
     /* Print help info for options */
 
     if (st->n_opts) {

Modified: grass/branches/releasebranch_7_0/lib/gis/parser_rest.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/parser_rest.c	2014-11-26 16:17:44 UTC (rev 63102)
+++ grass/branches/releasebranch_7_0/lib/gis/parser_rest.c	2014-11-26 16:17:47 UTC (rev 63103)
@@ -77,7 +77,7 @@
     }
     fprintf(stdout, "\n%s\n----------------------\n", _("SYNOPSIS"));
     fprintf(stdout, "**%s**\n\n", st->pgm_name);
-    fprintf(stdout, "**%s** help\n\n", st->pgm_name);
+    fprintf(stdout, "**%s** --help\n\n", st->pgm_name);
 
     fprintf(stdout, "**%s**", st->pgm_name);
 

Modified: grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c	2014-11-26 16:17:44 UTC (rev 63102)
+++ grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c	2014-11-26 16:17:47 UTC (rev 63103)
@@ -263,6 +263,15 @@
 	Opt->gisprompt = "new,cell,raster";
 	Opt->description = _("Name for output raster map");
 	break;
+    case G_OPT_R_OUTPUTS:
+	Opt->key = "output";
+	Opt->type = TYPE_STRING;
+	Opt->key_desc = "name";
+	Opt->required = YES;
+	Opt->multiple = YES;
+	Opt->gisprompt = "new,cell,raster";
+	Opt->description = _("Name for output raster map(s)");
+	break;
     case G_OPT_R_MAP:
 	Opt->key = "map";
 	Opt->type = TYPE_STRING;
@@ -592,7 +601,7 @@
 	Opt->gisprompt = "old,color_none,color";
 	Opt->label = _("Background color");
 	Opt->description =
-	    _("Either a standard GRASS color, R:G:B triplet, or \"none\"");
+	    _("Either a standard color name, R:G:B triplet, or \"none\"");
 	break;
 
 	/* misc */