Browse Source

layer required (for direct OGR access)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@41946 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 15 years ago
parent
commit
25ef2bef2d
2 changed files with 10 additions and 9 deletions
  1. 8 7
      display/d.vect/main.c
  2. 2 2
      lib/gis/parser_standard_options.c

+ 8 - 7
display/d.vect/main.c

@@ -120,6 +120,11 @@ int main(int argc, char **argv)
     
     map_opt = G_define_standard_option(G_OPT_V_MAP);
 
+    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";
+
     display_opt = G_define_option();
     display_opt->key = "display";
     display_opt->type = TYPE_STRING;
@@ -134,19 +139,14 @@ int main(int argc, char **argv)
     type_opt->answer = "point,line,boundary,centroid,area,face";
     type_opt->options = "point,line,boundary,centroid,area,face";
     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 = _("Selection");
-
+    
     cat_opt = G_define_standard_option(G_OPT_V_CATS);
     cat_opt->guisection = _("Selection");
 
     where_opt = G_define_standard_option(G_OPT_DB_WHERE);
     where_opt->guisection = _("Selection");
 
+
     /* Colors */
     color_opt = G_define_option();
     color_opt->key = "color";
@@ -242,6 +242,7 @@ int main(int argc, char **argv)
     /* Labels */
     lfield_opt = G_define_standard_option(G_OPT_V_FIELD);
     lfield_opt->key = "llayer";
+    lfield_opt->required = NO;
     lfield_opt->guisection = _("Labels");
     lfield_opt->description =
 	_("Layer number for labels (default: the given layer number)");

+ 2 - 2
lib/gis/parser_standard_options.c

@@ -368,7 +368,7 @@ struct Option *G_define_standard_option(int opt)
     case G_OPT_V_FIELD:
 	Opt->key = "layer";
 	Opt->type = TYPE_STRING;
-	Opt->required = NO;
+	Opt->required = YES;
 	Opt->answer = "1";
 	Opt->label = _("Layer number or name");
 	Opt->description =
@@ -380,7 +380,7 @@ struct Option *G_define_standard_option(int opt)
     case G_OPT_V_FIELD_ALL:
 	Opt->key = "layer";
 	Opt->type = TYPE_STRING;
-	Opt->required = NO;
+	Opt->required = YES;
 	Opt->answer = "-1";
 	Opt->label = _("Layer number or name ('-1' for all layers)");
 	Opt->description =