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

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-09-12 04:51:42 -0700 (Fri, 12 Sep 2014)
New Revision: 61871

Modified:
   grass/branches/releasebranch_7_0/include/gis.h
   grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c
Log:
backport G_OPT_R_BASENAME_INPUT/OUTPUT from trunk


Modified: grass/branches/releasebranch_7_0/include/gis.h
===================================================================
--- grass/branches/releasebranch_7_0/include/gis.h	2014-09-12 11:30:53 UTC (rev 61870)
+++ grass/branches/releasebranch_7_0/include/gis.h	2014-09-12 11:51:42 UTC (rev 61871)
@@ -221,6 +221,8 @@
     G_OPT_R_ELEV,		/*!< old input elevation raster map */
     G_OPT_R_ELEVS,		/*!< old input elevation raster maps */
     G_OPT_R_INTERP_TYPE,        /*!< interpolation type */
+    G_OPT_R_BASENAME_INPUT,     /*!< old input basename raster maps */
+    G_OPT_R_BASENAME_OUTPUT,    /*!< new output basename raster maps */
 
     G_OPT_R3_INPUT,		/*!< old input raster3d map */
     G_OPT_R3_INPUTS,		/*!< old input raster3d maps */

Modified: grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c	2014-09-12 11:30:53 UTC (rev 61870)
+++ grass/branches/releasebranch_7_0/lib/gis/parser_standard_options.c	2014-09-12 11:51:42 UTC (rev 61871)
@@ -61,6 +61,8 @@
    - G_OPT_R_ELEV
    - G_OPT_R_ELEVS
    - G_OPT_R_INTERP_TYPE
+   - G_OPT_R_BASENAME_INPUT
+   - G_OPT_R_BASENAME_OUTPUT
 
   - raster3d:
    - G_OPT_R3_INPUT
@@ -322,6 +324,24 @@
                    _("Bilinear interpolation"),
                    _("Bicubic interpolation"));
         break;
+    case G_OPT_R_BASENAME_INPUT:
+        Opt->key = "basename";
+        Opt->type = TYPE_STRING;
+        Opt->key_desc = "input basename";
+        Opt->required = YES;
+        Opt->multiple = NO;
+        Opt->gisprompt = "old,cell,raster";
+        Opt->description = _("Name of input basename raster map(s)");
+        break;
+    case G_OPT_R_BASENAME_OUTPUT:
+        Opt->key = "basename";
+        Opt->type = TYPE_STRING;
+        Opt->key_desc = "output basename";
+        Opt->required = YES;
+        Opt->multiple = NO;
+        Opt->gisprompt = "new,cell,raster";
+        Opt->description = _("Name for output basename raster map(s)");
+        break;
 
 	/*g3d maps */
     case G_OPT_R3_INPUT: