[GRASS-SVN] r44455 - in grass/trunk: general/g.mapset
raster/r.colors raster/r.external raster/r.external.out
raster/r.in.gdal raster/r.out.gdal vector/v.in.dxf vector/v.in.ogr
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Nov 27 17:07:57 EST 2010
Author: martinl
Date: 2010-11-27 14:07:57 -0800 (Sat, 27 Nov 2010)
New Revision: 44455
Modified:
grass/trunk/general/g.mapset/main.c
grass/trunk/raster/r.colors/main.c
grass/trunk/raster/r.external.out/main.c
grass/trunk/raster/r.external/main.c
grass/trunk/raster/r.in.gdal/main.c
grass/trunk/raster/r.out.gdal/main.c
grass/trunk/vector/v.in.dxf/main.c
grass/trunk/vector/v.in.ogr/main.c
Log:
r.external.out: use suppress_required
update other modules, TRUE->YES
Modified: grass/trunk/general/g.mapset/main.c
===================================================================
--- grass/trunk/general/g.mapset/main.c 2010-11-27 21:48:00 UTC (rev 44454)
+++ grass/trunk/general/g.mapset/main.c 2010-11-27 22:07:57 UTC (rev 44455)
@@ -83,7 +83,7 @@
f_list = G_define_flag();
f_list->key = 'l';
- f_list->suppress_required = 1;
+ f_list->suppress_required = YES;
f_list->description = _("List available mapsets");
f_list->guisection = _("Print");
Modified: grass/trunk/raster/r.colors/main.c
===================================================================
--- grass/trunk/raster/r.colors/main.c 2010-11-27 21:48:00 UTC (rev 44454)
+++ grass/trunk/raster/r.colors/main.c 2010-11-27 22:07:57 UTC (rev 44455)
@@ -211,7 +211,7 @@
flag.l = G_define_flag();
flag.l->key = 'l';
flag.l->description = _("List available rules then exit");
- flag.l->suppress_required = TRUE;
+ flag.l->suppress_required = YES;
flag.l->guisection = _("Print");
flag.n = G_define_flag();
Modified: grass/trunk/raster/r.external/main.c
===================================================================
--- grass/trunk/raster/r.external/main.c 2010-11-27 21:48:00 UTC (rev 44454)
+++ grass/trunk/raster/r.external/main.c 2010-11-27 22:07:57 UTC (rev 44455)
@@ -568,7 +568,7 @@
flag_f->key = 'f';
flag_f->description = _("List supported formats and exit");
flag_f->guisection = _("Print");
- flag_f->suppress_required = TRUE;
+ flag_f->suppress_required = YES;
flag_h = G_define_flag();
flag_h->key = 'h';
Modified: grass/trunk/raster/r.external.out/main.c
===================================================================
--- grass/trunk/raster/r.external.out/main.c 2010-11-27 21:48:00 UTC (rev 44454)
+++ grass/trunk/raster/r.external.out/main.c 2010-11-27 22:07:57 UTC (rev 44455)
@@ -7,7 +7,7 @@
*
* PURPOSE: Make GRASS write raster maps utilizing the GDAL library.
*
- * COPYRIGHT: (C) 2008 by Glynn Clements and the GRASS Development Team
+ * COPYRIGHT: (C) 2008, 2010 by Glynn Clements and the GRASS Development Team
*
* This program is free software under the GNU General Public
* License (>=v2). Read the file COPYING that comes with GRASS
@@ -212,16 +212,18 @@
module = G_define_module();
G_add_keyword(_("raster"));
- G_add_keyword(_("import"));
+ G_add_keyword(_("export"));
+ G_add_keyword(_("external"));
module->description =
- _("Link GDAL supported raster file to a binary raster map layer.");
+ _("Defines raster output format utilizing GDAL library.");
parm.dir = G_define_option();
parm.dir->key = "directory";
parm.dir->description = _("Name of output directory");
- parm.dir->required = NO;
+ parm.dir->required = YES;
parm.dir->type = TYPE_STRING;
-
+ parm.dir->key_desc = "path";
+
parm.ext = G_define_option();
parm.ext->key = "extension";
parm.ext->description = _("Extension for output files");
@@ -231,7 +233,7 @@
parm.format = G_define_option();
parm.format->key = "format";
parm.format->description = _("Format of output files");
- parm.format->required = NO;
+ parm.format->required = YES;
parm.format->type = TYPE_STRING;
parm.format->options = format_list();
@@ -246,16 +248,19 @@
flag_f->key = 'f';
flag_f->description = _("List supported formats and exit");
flag_f->guisection = _("Print");
-
+ flag_f->suppress_required = YES;
+
flag_r = G_define_flag();
flag_r->key = 'r';
flag_r->description = _("Cease using GDAL and revert to native output");
-
+ flag_r->suppress_required = YES;
+
flag_p = G_define_flag();
flag_p->key = 'p';
flag_p->description = _("Print current status");
flag_p->guisection = _("Print");
-
+ flag_p->suppress_required = YES;
+
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
Modified: grass/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c 2010-11-27 21:48:00 UTC (rev 44454)
+++ grass/trunk/raster/r.in.gdal/main.c 2010-11-27 22:07:57 UTC (rev 44455)
@@ -138,7 +138,7 @@
flag_f->key = 'f';
flag_f->description = _("List supported formats and exit");
flag_f->guisection = _("Print");
- flag_f->suppress_required = 1;
+ flag_f->suppress_required = YES;
flag_l = G_define_flag();
flag_l->key = 'l';
Modified: grass/trunk/raster/r.out.gdal/main.c
===================================================================
--- grass/trunk/raster/r.out.gdal/main.c 2010-11-27 21:48:00 UTC (rev 44454)
+++ grass/trunk/raster/r.out.gdal/main.c 2010-11-27 22:07:57 UTC (rev 44455)
@@ -133,7 +133,7 @@
flag_l->key = 'l';
flag_l->description = _("List supported output formats");
flag_l->guisection = _("Print");
- flag_l->suppress_required = TRUE;
+ flag_l->suppress_required = YES;
flag_c = G_define_flag();
flag_c->key = 'c';
Modified: grass/trunk/vector/v.in.dxf/main.c
===================================================================
--- grass/trunk/vector/v.in.dxf/main.c 2010-11-27 21:48:00 UTC (rev 44454)
+++ grass/trunk/vector/v.in.dxf/main.c 2010-11-27 22:07:57 UTC (rev 44455)
@@ -87,7 +87,7 @@
flag.list->key = 'l';
flag.list->description = _("List available DXF layers and exit");
flag.list->guisection = _("DXF layers");
- flag.list->suppress_required = TRUE;
+ flag.list->suppress_required = YES;
flag.invert = G_define_flag();
flag.invert->key = 'i';
Modified: grass/trunk/vector/v.in.ogr/main.c
===================================================================
--- grass/trunk/vector/v.in.ogr/main.c 2010-11-27 21:48:00 UTC (rev 44454)
+++ grass/trunk/vector/v.in.ogr/main.c 2010-11-27 22:07:57 UTC (rev 44455)
@@ -195,12 +195,12 @@
list_flag->key = 'l';
list_flag->description =
_("List available layers in data source and exit");
- list_flag->suppress_required = TRUE;
+ list_flag->suppress_required = YES;
formats_flag = G_define_flag();
formats_flag->key = 'f';
formats_flag->description = _("List supported formats and exit");
- formats_flag->suppress_required = TRUE;
+ formats_flag->suppress_required = YES;
/* if using -c, you lose topological information ! */
no_clean_flag = G_define_flag();
More information about the grass-commit
mailing list