[GRASS-SVN] r34668 - in grass/trunk: display/d.rast display/d.thematic.area display/d.vect vector/v.category vector/v.edit vector/v.extract vector/v.in.ogr

svn_grass at osgeo.org svn_grass at osgeo.org
Tue Dec 2 10:59:25 EST 2008


Author: martinl
Date: 2008-12-02 10:59:25 -0500 (Tue, 02 Dec 2008)
New Revision: 34668

Modified:
   grass/trunk/display/d.rast/main.c
   grass/trunk/display/d.thematic.area/main.c
   grass/trunk/display/d.vect/main.c
   grass/trunk/vector/v.category/main.c
   grass/trunk/vector/v.edit/args.c
   grass/trunk/vector/v.extract/main.c
   grass/trunk/vector/v.in.ogr/main.c
Log:
guisection: query renamed to selection
	    (merge from devbr6, r34667)


Modified: grass/trunk/display/d.rast/main.c
===================================================================
--- grass/trunk/display/d.rast/main.c	2008-12-02 15:55:29 UTC (rev 34667)
+++ grass/trunk/display/d.rast/main.c	2008-12-02 15:59:25 UTC (rev 34668)
@@ -65,7 +65,7 @@
     catlist->required = NO;
     catlist->multiple = YES;
     catlist->description = _("List of categories to be displayed (INT maps)");
-    catlist->guisection = _("Query");
+    catlist->guisection = _("Selection");
 
     vallist = G_define_option();
     vallist->key = "vallist";
@@ -74,7 +74,7 @@
     vallist->required = NO;
     vallist->multiple = YES;
     vallist->description = _("List of values to be displayed (FP maps)");
-    vallist->guisection = _("Query");
+    vallist->guisection = _("Selection");
 
     bg = G_define_option();
     bg->key = "bg";
@@ -91,7 +91,7 @@
     flag_i = G_define_flag();
     flag_i->key = 'i';
     flag_i->description = _("Invert catlist");
-    flag_i->guisection = _("Query");
+    flag_i->guisection = _("Selection");
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

Modified: grass/trunk/display/d.thematic.area/main.c
===================================================================
--- grass/trunk/display/d.thematic.area/main.c	2008-12-02 15:55:29 UTC (rev 34667)
+++ grass/trunk/display/d.thematic.area/main.c	2008-12-02 15:59:25 UTC (rev 34668)
@@ -126,9 +126,10 @@
     field_opt = G_define_standard_option(G_OPT_V_FIELD);
     field_opt->description =
 	_("Layer number. If -1, all layers are displayed.");
+    field_opt->guisection = _("Selection");
 
     where_opt = G_define_standard_option(G_OPT_DB_WHERE);
-    where_opt->guisection = _("Query");
+    where_opt->guisection = _("Selection");
 
     bwidth_opt = G_define_option();
     bwidth_opt->key = "bwidth";

Modified: grass/trunk/display/d.vect/main.c
===================================================================
--- grass/trunk/display/d.vect/main.c	2008-12-02 15:55:29 UTC (rev 34667)
+++ grass/trunk/display/d.vect/main.c	2008-12-02 15:59:25 UTC (rev 34668)
@@ -138,19 +138,19 @@
     type_opt = G_define_standard_option(G_OPT_V_TYPE);
     type_opt->answer = "point,line,boundary,centroid,area,face";
     type_opt->options = "point,line,boundary,centroid,area,face";
-    type_opt->guisection = _("Query");
+    type_opt->guisection = _("Selection");
 
     field_opt = G_define_standard_option(G_OPT_V_FIELD);
     field_opt->label =
 	_("Layer number (if -1, all layers are displayed)");
     field_opt->gisprompt = "old_layer,layer,layer_all";
-    field_opt->guisection = _("Query");
+    field_opt->guisection = _("Selection");
 
     cat_opt = G_define_standard_option(G_OPT_V_CATS);
-    cat_opt->guisection = _("Query");
+    cat_opt->guisection = _("Selection");
 
     where_opt = G_define_standard_option(G_OPT_DB_WHERE);
-    where_opt->guisection = _("Query");
+    where_opt->guisection = _("Selection");
 
     /* Colors */
     color_opt = G_define_option();
@@ -339,7 +339,7 @@
     /* Query */
     id_flag = G_define_flag();
     id_flag->key = 'i';
-    id_flag->guisection = _("Query");
+    id_flag->guisection = _("Selection");
     id_flag->description = _("Use values from 'cats' option as feature id");
 
     zcol_flag = G_define_flag();

Modified: grass/trunk/vector/v.category/main.c
===================================================================
--- grass/trunk/vector/v.category/main.c	2008-12-02 15:55:29 UTC (rev 34667)
+++ grass/trunk/vector/v.category/main.c	2008-12-02 15:59:25 UTC (rev 34668)
@@ -90,10 +90,12 @@
 
     cat_opt = G_define_standard_option(G_OPT_V_CAT);
     cat_opt->answer = "1";
+    cat_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");
 
     step_opt = G_define_option();
     step_opt->key = "step";

Modified: grass/trunk/vector/v.edit/args.c
===================================================================
--- grass/trunk/vector/v.edit/args.c	2008-12-02 15:55:29 UTC (rev 34667)
+++ grass/trunk/vector/v.edit/args.c	2008-12-02 15:59:25 UTC (rev 34668)
@@ -38,12 +38,12 @@
     params->map->description = _("Name of vector map to edit");
 
     params->fld = G_define_standard_option(G_OPT_V_FIELD);
-    params->fld->guisection = _("Query");
+    params->fld->guisection = _("Selection");
 
     params->type = G_define_standard_option(G_OPT_V_TYPE);
     params->type->answer = "point,line,boundary,centroid";
     params->type->options = "point,line,boundary,centroid";
-    params->type->guisection = _("Query");
+    params->type->guisection = _("Selection");
 
     params->tool = G_define_option();
     params->tool->key = "tool";
@@ -124,12 +124,12 @@
     params->id->required = NO;
     params->id->key = "ids";
     params->id->label = _("ID values");
-    params->id->guisection = _("Query");
+    params->id->guisection = _("Selection");
 
 
     params->cat = G_define_standard_option(G_OPT_V_CATS);
     params->cat->required = NO;
-    params->cat->guisection = _("Query");
+    params->cat->guisection = _("Selection");
 
     params->coord = G_define_option();
     params->coord->key = "coords";
@@ -138,7 +138,7 @@
     params->coord->required = NO;
     params->coord->multiple = YES;
     params->coord->description = _("List of point coordinates");
-    params->coord->guisection = _("Query");
+    params->coord->guisection = _("Selection");
 
     params->bbox = G_define_option();
     params->bbox->key = "bbox";
@@ -147,7 +147,7 @@
     params->bbox->required = NO;
     params->bbox->multiple = NO;
     params->bbox->description = _("Bounding box for selecting features");
-    params->bbox->guisection = _("Query");
+    params->bbox->guisection = _("Selection");
 
     params->poly = G_define_option();
     params->poly->key = "polygon";
@@ -156,10 +156,10 @@
     params->poly->required = NO;
     params->poly->multiple = YES;
     params->poly->description = _("Polygon for selecting features");
-    params->poly->guisection = _("Query");
+    params->poly->guisection = _("Selection");
 
     params->where = G_define_standard_option(G_OPT_DB_WHERE);
-    params->where->guisection = _("Query");
+    params->where->guisection = _("Selection");
 
     params->query = G_define_option();
     params->query->key = "query";
@@ -173,7 +173,7 @@
 	_("length;Select only lines or boundaries shorter"
 	  "/longer than threshold distance;"
 	  "dangle;Select dangles shorter/longer than " "threshold distance");
-    params->query->guisection = _("Query");
+    params->query->guisection = _("Selection");
 
     params->bmaps = G_define_standard_option(G_OPT_V_MAPS);
     params->bmaps->key = "bgmap";

Modified: grass/trunk/vector/v.extract/main.c
===================================================================
--- grass/trunk/vector/v.extract/main.c	2008-12-02 15:55:29 UTC (rev 34667)
+++ grass/trunk/vector/v.extract/main.c	2008-12-02 15:59:25 UTC (rev 34668)
@@ -104,7 +104,7 @@
     r_flag = G_define_flag();
     r_flag->key = 'r';
     r_flag->description = _("Reverse selection");
-    r_flag->guisection = _("Query");
+    r_flag->guisection = _("Selection");
 
     inopt = G_define_standard_option(G_OPT_V_INPUT);
 
@@ -114,19 +114,19 @@
     typopt->answer = "point,line,boundary,centroid,area,face";
     typopt->options = "point,line,boundary,centroid,area,face";
     typopt->label = _("Types to be extracted");
-    typopt->guisection = _("Query");
+    typopt->guisection = _("Selection");
 
     fieldopt = G_define_standard_option(G_OPT_V_FIELD);
     fieldopt->label =
 	_("Layer number (if -1, all features in all layers of given type " "are extracted)");
-    fieldopt->guisection = _("Query");
+    fieldopt->guisection = _("Selection");
     
     listopt = G_define_standard_option(G_OPT_V_CATS);
     listopt->key = "list";
-    listopt->guisection = _("Query");
+    listopt->guisection = _("Selection");
 
     whereopt = G_define_standard_option(G_OPT_DB_WHERE);
-    whereopt->guisection = _("Query");
+    whereopt->guisection = _("Selection");
 
     fileopt = G_define_standard_option(G_OPT_F_INPUT);
     fileopt->key = "file";
@@ -134,7 +134,7 @@
     fileopt->label =
 	_("Input text file with category numbers/number ranges to be extracted");
     fileopt->description = _("If '-' given reads from standard input");
-    fileopt->guisection = _("Query");
+    fileopt->guisection = _("Selection");
 
     nrandopt = G_define_option();
     nrandopt->key = "random";
@@ -144,7 +144,7 @@
 	_("Number of random categories matching vector objects to extract");
     nrandopt->description =
 	_("Number must be smaller than unique cat count in layer");
-    nrandopt->guisection = _("Query");
+    nrandopt->guisection = _("Selection");
 
     newopt = G_define_option();
     newopt->key = "new";

Modified: grass/trunk/vector/v.in.ogr/main.c
===================================================================
--- grass/trunk/vector/v.in.ogr/main.c	2008-12-02 15:55:29 UTC (rev 34667)
+++ grass/trunk/vector/v.in.ogr/main.c	2008-12-02 15:59:25 UTC (rev 34668)
@@ -126,7 +126,7 @@
     layer_opt->description =
 	_("Examples:\n" "\t\tESRI Shapefile: shapefile name\n"
 	  "\t\tMapInfo File: mapinfo file name");
-    layer_opt->guisection = _("Query");
+    layer_opt->guisection = _("Selection");
 
     spat_opt = G_define_option();
     spat_opt->key = "spatial";
@@ -140,7 +140,7 @@
 	_("Format: xmin,ymin,xmax,ymax - usually W,S,E,N");
 
     where_opt = G_define_standard_option(G_OPT_DB_WHERE);
-    where_opt->guisection = _("Query");
+    where_opt->guisection = _("Selection");
 
     min_area_opt = G_define_option();
     min_area_opt->key = "min_area";
@@ -162,7 +162,7 @@
 	  "line;import area boundaries as lines;"
 	  "boundary;import lines as area boundaries;"
 	  "centroid;import points as centroids");
-    type_opt->guisection = _("Query");
+    type_opt->guisection = _("Selection");
 
     snap_opt = G_define_option();
     snap_opt->key = "snap";



More information about the grass-commit mailing list