[GRASS-SVN] r34670 - in grass/trunk: lib/gis vector/v.category

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-12-02 11:50:15 -0500 (Tue, 02 Dec 2008)
New Revision: 34670

Modified:
   grass/trunk/lib/gis/parser.c
   grass/trunk/vector/v.category/main.c
Log:
v.category: more guisections
           sipmlify G_OPT_TYPE description
	   (merge from devbr6, r34669)


Modified: grass/trunk/lib/gis/parser.c
===================================================================
--- grass/trunk/lib/gis/parser.c	2008-12-02 16:44:48 UTC (rev 34669)
+++ grass/trunk/lib/gis/parser.c	2008-12-02 16:50:15 UTC (rev 34670)
@@ -595,8 +595,7 @@
 	Opt->multiple = YES;
 	Opt->answer = "point,line,boundary,centroid,area";
 	Opt->options = "point,line,boundary,centroid,area";
-	Opt->label = _("Type");
-	Opt->description = _("Feature type(s)");
+	Opt->description = _("Feature type");
 	break;
     case G_OPT_V_FIELD:
 	Opt->key = "layer";

Modified: grass/trunk/vector/v.category/main.c
===================================================================
--- grass/trunk/vector/v.category/main.c	2008-12-02 16:44:48 UTC (rev 34669)
+++ grass/trunk/vector/v.category/main.c	2008-12-02 16:50:15 UTC (rev 34670)
@@ -69,9 +69,9 @@
 	_("Attach, delete or report vector categories to map geometry.");
 
     in_opt = G_define_standard_option(G_OPT_V_INPUT);
+
     out_opt = G_define_standard_option(G_OPT_V_OUTPUT);
     out_opt->required = NO;
-    type_opt = G_define_standard_option(G_OPT_V_TYPE);
 
     option_opt = G_define_option();
     option_opt->key = "option";
@@ -88,15 +88,24 @@
 				 "report;print report (statistics), in shell style: layer type count min max;"
 				 "print;print category values, more cats in the same layer are separated by '/'");
 
-    cat_opt = G_define_standard_option(G_OPT_V_CAT);
-    cat_opt->answer = "1";
-    cat_opt->guisection = _("Selection");
+    type_opt = G_define_standard_option(G_OPT_V_TYPE);
+    type_opt->guisection = _("Selection");
 
     field_opt = G_define_standard_option(G_OPT_V_FIELD);
     field_opt->answer = "1";
     field_opt->multiple = YES;
     field_opt->guisection = _("Selection");
 
+    id_opt = G_define_standard_option(G_OPT_V_CAT);
+    id_opt->multiple = YES;
+    id_opt->label = _("Feature id(s)");
+    id_opt->description = _("By default all ids are processed");
+    id_opt->key = "id";
+    id_opt->guisection = _("Selection");
+
+    cat_opt = G_define_standard_option(G_OPT_V_CAT);
+    cat_opt->answer = "1";
+
     step_opt = G_define_option();
     step_opt->key = "step";
     step_opt->type = TYPE_INTEGER;
@@ -105,12 +114,6 @@
     step_opt->answer = "1";
     step_opt->description = _("Category increment");
 
-    id_opt = G_define_standard_option(G_OPT_V_CAT);
-    id_opt->multiple = YES;
-    id_opt->label = _("Feature id(s)");
-    id_opt->description = _("By default all ids are processed");
-    id_opt->key = "id";
-
     shell = G_define_flag();
     shell->key = 'g';
     shell->label = _("Shell script style, currently only for report");