[GRASS-SVN] r40902 - grass/trunk/raster/r.region

svn_grass at osgeo.org svn_grass at osgeo.org
Tue Feb 9 23:15:49 EST 2010


Author: glynn
Date: 2010-02-09 23:15:47 -0500 (Tue, 09 Feb 2010)
New Revision: 40902

Modified:
   grass/trunk/raster/r.region/main.c
Log:
Use standard options, add ->gisprompt settings


Modified: grass/trunk/raster/r.region/main.c
===================================================================
--- grass/trunk/raster/r.region/main.c	2010-02-09 23:58:46 UTC (rev 40901)
+++ grass/trunk/raster/r.region/main.c	2010-02-10 04:15:47 UTC (rev 40902)
@@ -80,21 +80,18 @@
     parm.region->multiple = NO;
     parm.region->type = TYPE_STRING;
     parm.region->description = _("Set region from named region");
+    parm.region->gisprompt = "old,windows,region";
 
-    parm.raster = G_define_option();
+    parm.raster = G_define_standard_option(G_OPT_R_MAP);
     parm.raster->key = "raster";
-    parm.raster->key_desc = "name";
     parm.raster->required = NO;
     parm.raster->multiple = NO;
-    parm.raster->type = TYPE_STRING;
     parm.raster->description = _("Set region to match this raster map");
 
-    parm.vect = G_define_option();
+    parm.vect = G_define_standard_option(G_OPT_V_MAP);
     parm.vect->key = "vector";
-    parm.vect->key_desc = "name";
     parm.vect->required = NO;
     parm.vect->multiple = NO;
-    parm.vect->type = TYPE_STRING;
     parm.vect->description = _("Set region to match this vector map");
 
     parm.view = G_define_option();
@@ -104,6 +101,7 @@
     parm.view->multiple = NO;
     parm.view->type = TYPE_STRING;
     parm.view->description = _("Set region to match this 3dview file");
+    parm.view->gisprompt = "old,3d.view,3d view";
 
     parm.north = G_define_option();
     parm.north->key = "n";
@@ -137,12 +135,10 @@
     parm.west->type = TYPE_STRING;
     parm.west->description = _("Value for the western edge");
 
-    parm.align = G_define_option();
+    parm.align = G_define_standard_option(G_OPT_R_MAP);
     parm.align->key = "align";
-    parm.align->key_desc = "name";
     parm.align->required = NO;
     parm.align->multiple = NO;
-    parm.align->type = TYPE_STRING;
     parm.align->description = _("Raster map to align to");
 
     if (G_parser(argc, argv))



More information about the grass-commit mailing list