[GRASS-SVN] r45183 - in grass/trunk: raster/r.out.gdal vector/v.out.ogr

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-01-25 10:35:13 -0800 (Tue, 25 Jan 2011)
New Revision: 45183

Modified:
   grass/trunk/raster/r.out.gdal/main.c
   grass/trunk/vector/v.out.ogr/args.c
Log:
r.out.gdal/v.out.ogr: format required + cosmetics in guisections


Modified: grass/trunk/raster/r.out.gdal/main.c
===================================================================
--- grass/trunk/raster/r.out.gdal/main.c	2011-01-25 18:26:02 UTC (rev 45182)
+++ grass/trunk/raster/r.out.gdal/main.c	2011-01-25 18:35:13 UTC (rev 45183)
@@ -139,6 +139,7 @@
     flag_c->key = 'c';
     flag_c->label = _("Do not write GDAL standard colortable");
     flag_c->description = _("Only applicable to Byte or UInt16 data types.");
+    flag_c->guisection = _("Creation");
 
     flag_f = G_define_flag();
     flag_f->key = 'f';
@@ -155,7 +156,7 @@
     format->key = "format";
     format->type = TYPE_STRING;
     format->description =
-	_("GIS format to write (case sensitive, see also -l flag)");
+	_("Raster data format to write (case sensitive, see also -l flag)");
 
 #ifdef __ALLOW_DYNAMIC_OPTIONS__
     /* Init GDAL */
@@ -171,18 +172,17 @@
     format->options = gdal_formats;
 #endif
     format->answer = "GTiff";
-    format->required = NO;
-    format->guisection = _("Format");
+    format->required = YES;
     
     type = G_define_option();
     type->key = "type";
     type->type = TYPE_STRING;
-    type->description = _("File type");
+    type->description = _("Data type");
     type->options =
 	"Byte,Int16,UInt16,Int32,UInt32,Float32,Float64,CInt16,CInt32,CFloat32,CFloat64";
     type->required = NO;
-    type->guisection = _("Format");
-
+    type->guisection = _("Creation");
+ 
     createopt = G_define_option();
     createopt->key = "createopt";
     createopt->type = TYPE_STRING;
@@ -192,6 +192,7 @@
 	_("In the form of \"NAME=VALUE\", separate multiple entries with a comma.");
     createopt->multiple = YES;
     createopt->required = NO;
+    createopt->guisection = _("Creation");
 
     metaopt = G_define_option();
     metaopt->key = "metaopt";
@@ -202,6 +203,7 @@
 	  "with a comma. Not supported by all output format drivers.");
     metaopt->multiple = YES;
     metaopt->required = NO;
+    metaopt->guisection = _("Creation");
 
     nodataopt = G_define_option();
     nodataopt->key = "nodata";
@@ -210,8 +212,8 @@
 	_("Assign a specified nodata value to output bands");
     nodataopt->multiple = NO;
     nodataopt->required = NO;
-
-
+    nodataopt->guisection = _("Creation");
+    
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 

Modified: grass/trunk/vector/v.out.ogr/args.c
===================================================================
--- grass/trunk/vector/v.out.ogr/args.c	2011-01-25 18:26:02 UTC (rev 45182)
+++ grass/trunk/vector/v.out.ogr/args.c	2011-01-25 18:35:13 UTC (rev 45183)
@@ -46,9 +46,8 @@
     options->format->multiple = NO;
     options->format->answer = "ESRI_Shapefile";
     options->format->options = OGR_list_write_drivers();
-    options->format->description = _("OGR data format");
-    options->format->guisection = _("Creation");
-
+    options->format->description = _("Vector data format to write");
+    
     options->dsco = G_define_option();
     options->dsco->key = "dsco";
     options->dsco->type = TYPE_STRING;