[GRASS-SVN] r41791 - in grass/branches/develbranch_6/vector:
v.net.allpairs v.net.centrality v.net.connectivity
v.net.distance v.net.flow v.net.spanningtree v.net.timetable
svn_grass at osgeo.org
svn_grass at osgeo.org
Sat Apr 10 15:44:13 EDT 2010
Author: neteler
Date: 2010-04-10 15:44:12 -0400 (Sat, 10 Apr 2010)
New Revision: 41791
Modified:
grass/branches/develbranch_6/vector/v.net.allpairs/main.c
grass/branches/develbranch_6/vector/v.net.centrality/main.c
grass/branches/develbranch_6/vector/v.net.connectivity/main.c
grass/branches/develbranch_6/vector/v.net.distance/main.c
grass/branches/develbranch_6/vector/v.net.flow/main.c
grass/branches/develbranch_6/vector/v.net.spanningtree/main.c
grass/branches/develbranch_6/vector/v.net.timetable/main.c
Log:
G_OPT_DB -> G_OPT
Modified: grass/branches/develbranch_6/vector/v.net.allpairs/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.allpairs/main.c 2010-04-10 19:40:30 UTC (rev 41790)
+++ grass/branches/develbranch_6/vector/v.net.allpairs/main.c 2010-04-10 19:44:12 UTC (rev 41791)
@@ -63,17 +63,17 @@
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 = G_define_standard_option(G_OPT_WHERE);
where_opt->guisection = _("Selection");
- afcol = G_define_standard_option(G_OPT_DB_COLUMN);
+ afcol = G_define_standard_option(G_OPT_COLUMN);
afcol->key = "afcolumn";
afcol->required = NO;
afcol->description =
_("Name of arc forward/both direction(s) cost column");
afcol->guisection = _("Cost");
- abcol = G_define_standard_option(G_OPT_DB_COLUMN);
+ abcol = G_define_standard_option(G_OPT_COLUMN);
abcol->key = "abcolumn";
abcol->required = NO;
abcol->description = _("Name of arc backward direction cost column");
Modified: grass/branches/develbranch_6/vector/v.net.centrality/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.centrality/main.c 2010-04-10 19:40:30 UTC (rev 41790)
+++ grass/branches/develbranch_6/vector/v.net.centrality/main.c 2010-04-10 19:44:12 UTC (rev 41791)
@@ -105,41 +105,41 @@
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 = G_define_standard_option(G_OPT_WHERE);
where_opt->guisection = _("Selection");
- afcol = G_define_standard_option(G_OPT_DB_COLUMN);
+ afcol = G_define_standard_option(G_OPT_COLUMN);
afcol->key = "afcolumn";
afcol->required = NO;
afcol->description =
_("Name of arc forward/both direction(s) cost column");
afcol->guisection = _("Cost");
- abcol = G_define_standard_option(G_OPT_DB_COLUMN);
+ abcol = G_define_standard_option(G_OPT_COLUMN);
abcol->key = "abcolumn";
abcol->required = NO;
abcol->description = _("Name of arc backward direction cost column");
abcol->guisection = _("Cost");
- deg_opt = G_define_standard_option(G_OPT_DB_COLUMN);
+ deg_opt = G_define_standard_option(G_OPT_COLUMN);
deg_opt->key = "degree";
deg_opt->required = NO;
deg_opt->description = _("Name of degree centrality column");
deg_opt->guisection = _("Columns");
- close_opt = G_define_standard_option(G_OPT_DB_COLUMN);
+ close_opt = G_define_standard_option(G_OPT_COLUMN);
close_opt->key = "closeness";
close_opt->required = NO;
close_opt->description = _("Name of closeness centrality column");
close_opt->guisection = _("Columns");
- betw_opt = G_define_standard_option(G_OPT_DB_COLUMN);
+ betw_opt = G_define_standard_option(G_OPT_COLUMN);
betw_opt->key = "betweenness";
betw_opt->required = NO;
betw_opt->description = _("Name of betweenness centrality column");
betw_opt->guisection = _("Columns");
- eigen_opt = G_define_standard_option(G_OPT_DB_COLUMN);
+ eigen_opt = G_define_standard_option(G_OPT_COLUMN);
eigen_opt->key = "eigenvector";
eigen_opt->required = NO;
eigen_opt->description = _("Name of eigenvector centrality column");
Modified: grass/branches/develbranch_6/vector/v.net.connectivity/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.connectivity/main.c 2010-04-10 19:40:30 UTC (rev 41790)
+++ grass/branches/develbranch_6/vector/v.net.connectivity/main.c 2010-04-10 19:44:12 UTC (rev 41791)
@@ -60,7 +60,7 @@
map_out = G_define_standard_option(G_OPT_V_OUTPUT);
- ncol = G_define_standard_option(G_OPT_DB_COLUMN);
+ ncol = G_define_standard_option(G_OPT_COLUMN);
ncol->key = "ncolumn";
ncol->required = NO;
ncol->description = _("Name of node capacity column");
@@ -75,7 +75,7 @@
catset1_opt->label = _("Set1 category values");
catset1_opt->guisection = _("Set1");
- whereset1_opt = G_define_standard_option(G_OPT_DB_WHERE);
+ whereset1_opt = G_define_standard_option(G_OPT_WHERE);
whereset1_opt->key = "set1_where";
whereset1_opt->label =
_("Set1 WHERE conditions of SQL statement without 'where' keyword");
@@ -91,7 +91,7 @@
catset2_opt->description = _("Set2 category values");
catset2_opt->guisection = _("Set2");
- whereset2_opt = G_define_standard_option(G_OPT_DB_WHERE);
+ whereset2_opt = G_define_standard_option(G_OPT_WHERE);
whereset2_opt->key = "set2_where";
whereset2_opt->label =
_("Set2 WHERE conditions of SQL statement without 'where' keyword");
Modified: grass/branches/develbranch_6/vector/v.net.distance/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.distance/main.c 2010-04-10 19:40:30 UTC (rev 41790)
+++ grass/branches/develbranch_6/vector/v.net.distance/main.c 2010-04-10 19:44:12 UTC (rev 41791)
@@ -78,7 +78,7 @@
catf_opt->label = _("From category values");
catf_opt->guisection = _("From");
- wheref_opt = G_define_standard_option(G_OPT_DB_WHERE);
+ wheref_opt = G_define_standard_option(G_OPT_WHERE);
wheref_opt->key = "from_where";
wheref_opt->label =
_("From WHERE conditions of SQL statement without 'where' keyword");
@@ -94,7 +94,7 @@
catt_opt->label = _("To category values");
catt_opt->guisection = _("To");
- wheret_opt = G_define_standard_option(G_OPT_DB_WHERE);
+ wheret_opt = G_define_standard_option(G_OPT_WHERE);
wheret_opt->key = "to_where";
wheret_opt->label =
_("To WHERE conditions of SQL statement without 'where' keyword");
@@ -107,12 +107,12 @@
to_type_opt->description = _("To feature type");
to_type_opt->guisection = _("To");
- afcol = G_define_standard_option(G_OPT_DB_COLUMN);
+ afcol = G_define_standard_option(G_OPT_COLUMN);
afcol->key = "afcolumn";
afcol->required = YES;
afcol->description = _("Arc forward/both direction(s) cost column");
- abcol = G_define_standard_option(G_OPT_DB_COLUMN);
+ abcol = G_define_standard_option(G_OPT_COLUMN);
abcol->key = "abcolumn";
abcol->required = NO;
abcol->description = _("Arc backward direction cost column");
Modified: grass/branches/develbranch_6/vector/v.net.flow/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.flow/main.c 2010-04-10 19:40:30 UTC (rev 41790)
+++ grass/branches/develbranch_6/vector/v.net.flow/main.c 2010-04-10 19:44:12 UTC (rev 41791)
@@ -70,13 +70,13 @@
cut_out->description =
_("Name for output vector map containing a minimum cut");
- afcol = G_define_standard_option(G_OPT_DB_COLUMN);
+ afcol = G_define_standard_option(G_OPT_COLUMN);
afcol->key = "afcolumn";
afcol->required = NO;
afcol->description =
_("Name of arc forward/both direction(s) capacity column");
- abcol = G_define_standard_option(G_OPT_DB_COLUMN);
+ abcol = G_define_standard_option(G_OPT_COLUMN);
abcol->key = "abcolumn";
abcol->required = NO;
abcol->description = _("Name of arc backward direction capacity column");
@@ -91,7 +91,7 @@
catsource_opt->label = _("Source category values");
catsource_opt->guisection = _("Source");
- wheresource_opt = G_define_standard_option(G_OPT_DB_WHERE);
+ wheresource_opt = G_define_standard_option(G_OPT_WHERE);
wheresource_opt->key = "source_where";
wheresource_opt->label =
_("Source WHERE conditions of SQL statement without 'where' keyword");
@@ -107,7 +107,7 @@
catsink_opt->label = _("Sink category values");
catsink_opt->guisection = _("Sink");
- wheresink_opt = G_define_standard_option(G_OPT_DB_WHERE);
+ wheresink_opt = G_define_standard_option(G_OPT_WHERE);
wheresink_opt->key = "sink_where";
wheresink_opt->label =
_("Sink WHERE conditions of SQL statement without 'where' keyword");
Modified: grass/branches/develbranch_6/vector/v.net.spanningtree/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.spanningtree/main.c 2010-04-10 19:40:30 UTC (rev 41790)
+++ grass/branches/develbranch_6/vector/v.net.spanningtree/main.c 2010-04-10 19:44:12 UTC (rev 41791)
@@ -53,7 +53,7 @@
field_opt = G_define_standard_option(G_OPT_V_FIELD);
- accol = G_define_standard_option(G_OPT_DB_COLUMN);
+ accol = G_define_standard_option(G_OPT_COLUMN);
accol->key = "accol";
accol->required = NO;
accol->description = _("Name of Arc cost column");
Modified: grass/branches/develbranch_6/vector/v.net.timetable/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.net.timetable/main.c 2010-04-10 19:40:30 UTC (rev 41790)
+++ grass/branches/develbranch_6/vector/v.net.timetable/main.c 2010-04-10 19:44:12 UTC (rev 41791)
@@ -271,26 +271,26 @@
path_layer_opt->answer = "-1";
path_layer_opt->label = _("Layer number or name with route paths or -1");
- route_id_opt = G_define_standard_option(G_OPT_DB_COLUMN);
+ route_id_opt = G_define_standard_option(G_OPT_COLUMN);
route_id_opt->key = "route_id";
route_id_opt->required = YES;
route_id_opt->answer = "route_id";
route_id_opt->description = _("Name of column name with route ids");
- stop_time_opt = G_define_standard_option(G_OPT_DB_COLUMN);
+ stop_time_opt = G_define_standard_option(G_OPT_COLUMN);
stop_time_opt->key = "stop_time";
stop_time_opt->required = YES;
stop_time_opt->answer = "stop_time";
stop_time_opt->description =
_("Name of column name with stop timestamps");
- to_stop_opt = G_define_standard_option(G_OPT_DB_COLUMN);
+ to_stop_opt = G_define_standard_option(G_OPT_COLUMN);
to_stop_opt->key = "to_stop";
to_stop_opt->required = YES;
to_stop_opt->answer = "to_stop";
to_stop_opt->description = _("Name of column name with stop ids");
- walk_length_opt = G_define_standard_option(G_OPT_DB_COLUMN);
+ walk_length_opt = G_define_standard_option(G_OPT_COLUMN);
walk_length_opt->key = "walk_length";
walk_length_opt->required = YES;
walk_length_opt->answer = "length";
More information about the grass-commit
mailing list