[GRASS-SVN] r63724 - in grass/trunk: lib/gis vector/v.net.alloc vector/v.net.allpairs vector/v.net.bridge vector/v.net.centrality vector/v.net.components vector/v.net.connectivity vector/v.net.distance vector/v.net.flow vector/v.net.iso vector/v.net.path vector/v.net.spanningtree vector/v.net.timetable
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Dec 24 05:28:25 PST 2014
Author: martinl
Date: 2014-12-24 05:28:25 -0800 (Wed, 24 Dec 2014)
New Revision: 63724
Modified:
grass/trunk/lib/gis/renamed_options
grass/trunk/vector/v.net.alloc/main.c
grass/trunk/vector/v.net.allpairs/main.c
grass/trunk/vector/v.net.bridge/main.c
grass/trunk/vector/v.net.centrality/main.c
grass/trunk/vector/v.net.components/main.c
grass/trunk/vector/v.net.connectivity/main.c
grass/trunk/vector/v.net.connectivity/v.net.connectivity.html
grass/trunk/vector/v.net.distance/main.c
grass/trunk/vector/v.net.flow/main.c
grass/trunk/vector/v.net.iso/main.c
grass/trunk/vector/v.net.path/main.c
grass/trunk/vector/v.net.spanningtree/main.c
grass/trunk/vector/v.net.timetable/main.c
Log:
v.net: ncolumn -> node_column (#2409)
Modified: grass/trunk/lib/gis/renamed_options
===================================================================
--- grass/trunk/lib/gis/renamed_options 2014-12-24 13:19:38 UTC (rev 63723)
+++ grass/trunk/lib/gis/renamed_options 2014-12-24 13:28:25 UTC (rev 63724)
@@ -446,25 +446,32 @@
v.net.alloc|nlayer:node_layer
v.net.alloc|type:arc_type
v.net.alloc|ccats:center_cats
+v.net.alloc|ncolumn:node_column
# v.net.allpairs
v.net.allpairs|alayer:arc_layer
v.net.allpairs|nlayer:node_layer
+v.net.allpairs|ncolumn:node_column
# v.net.bridge
v.net.bridge|alayer:arc_layer
v.net.bridge|nlayer:node_layer
+v.net.bridge|ncolumn:node_column
# v.net.centrality
v.net.centrality|alayer:arc_layer
v.net.centrality|nlayer:node_layer
+v.net.centrality|ncolumn:node_column
# v.net.components
v.net.components|alayer:arc_layer
v.net.components|nlayer:node_layer
+v.net.components|ncolumn:node_column
# v.net.connectivity
v.net.connectivity|alayer:arc_layer
v.net.connectivity|nlayer:node_layer
+v.net.connectivity|ncolumn:node_column
# v.net.distance
v.net.distance|alayer:arc_layer
v.net.distance|nlayer:node_layer
v.net.distance|type:arc_type
+v.net.distance|ncolumn:node_column
# v.net.flow
v.net.flow|alayer:arc_layer
v.net.flow|nlayer:node_layer
@@ -473,10 +480,12 @@
v.net.iso|nlayer:node_layer
v.net.iso|type:arc_type
v.net.iso|ccats:center_cats
+v.net.iso|ncolumn:node_column
# v.net.path
v.net.path|alayer:arc_layer
v.net.path|nlayer:node_layer
v.net.path|type:arc_type
+v.net.path|ncolumn:node_column
# v.net.salesman
v.net.salesman|alayer:arc_layer
v.net.salesman|nlayer:node_layer
@@ -485,6 +494,7 @@
# v.net.spanningtree
v.net.spanningtree|alayer:arc_layer
v.net.spanningtree|nlayer:node_layer
+v.net.spanningtree|ncolumn:node_column
# v.net.steiner
v.net.steiner|alayer:arc_layer
v.net.steiner|nlayer:node_layer
@@ -492,6 +502,7 @@
# v.net.timetable
v.net.timetable|alayer:arc_layer
v.net.timetable|nlayer:node_layer
+v.net.timetable|ncolumn:node_column
# v.outlier
v.outlier|soe:ew_step
v.outlier|son:ns_step
Modified: grass/trunk/vector/v.net.alloc/main.c
===================================================================
--- grass/trunk/vector/v.net.alloc/main.c 2014-12-24 13:19:38 UTC (rev 63723)
+++ grass/trunk/vector/v.net.alloc/main.c 2014-12-24 13:28:25 UTC (rev 63724)
@@ -116,7 +116,7 @@
abcol->guisection = _("Cost");
ncol = G_define_option();
- ncol->key = "ncolumn";
+ ncol->key = "node_column";
ncol->type = TYPE_STRING;
ncol->required = NO;
ncol->description = _("Node cost column (number)");
Modified: grass/trunk/vector/v.net.allpairs/main.c
===================================================================
--- grass/trunk/vector/v.net.allpairs/main.c 2014-12-24 13:19:38 UTC (rev 63723)
+++ grass/trunk/vector/v.net.allpairs/main.c 2014-12-24 13:28:25 UTC (rev 63724)
@@ -100,7 +100,7 @@
abcol->guisection = _("Cost");
ncol = G_define_option();
- ncol->key = "ncolumn";
+ ncol->key = "node_column";
ncol->type = TYPE_STRING;
ncol->required = NO;
ncol->description = _("Node cost column (number)");
Modified: grass/trunk/vector/v.net.bridge/main.c
===================================================================
--- grass/trunk/vector/v.net.bridge/main.c 2014-12-24 13:19:38 UTC (rev 63723)
+++ grass/trunk/vector/v.net.bridge/main.c 2014-12-24 13:28:25 UTC (rev 63724)
@@ -80,7 +80,7 @@
abcol->guisection = _("Cost");
ncol = G_define_option();
- ncol->key = "ncolumn";
+ ncol->key = "node_column";
ncol->type = TYPE_STRING;
ncol->required = NO;
ncol->description = _("Node cost column (number)");
Modified: grass/trunk/vector/v.net.centrality/main.c
===================================================================
--- grass/trunk/vector/v.net.centrality/main.c 2014-12-24 13:19:38 UTC (rev 63723)
+++ grass/trunk/vector/v.net.centrality/main.c 2014-12-24 13:28:25 UTC (rev 63724)
@@ -136,7 +136,7 @@
abcol->guisection = _("Cost");
ncol = G_define_option();
- ncol->key = "ncolumn";
+ ncol->key = "node_column";
ncol->type = TYPE_STRING;
ncol->required = NO;
ncol->description = _("Node cost column (number)");
Modified: grass/trunk/vector/v.net.components/main.c
===================================================================
--- grass/trunk/vector/v.net.components/main.c 2014-12-24 13:19:38 UTC (rev 63723)
+++ grass/trunk/vector/v.net.components/main.c 2014-12-24 13:28:25 UTC (rev 63724)
@@ -103,7 +103,7 @@
abcol->guisection = _("Cost");
ncol = G_define_option();
- ncol->key = "ncolumn";
+ ncol->key = "node_column";
ncol->type = TYPE_STRING;
ncol->required = NO;
ncol->description = _("Node cost column (number)");
Modified: grass/trunk/vector/v.net.connectivity/main.c
===================================================================
--- grass/trunk/vector/v.net.connectivity/main.c 2014-12-24 13:19:38 UTC (rev 63723)
+++ grass/trunk/vector/v.net.connectivity/main.c 2014-12-24 13:28:25 UTC (rev 63724)
@@ -86,7 +86,7 @@
map_out = G_define_standard_option(G_OPT_V_OUTPUT);
ncol = G_define_standard_option(G_OPT_DB_COLUMN);
- ncol->key = "ncolumn";
+ ncol->key = "node_column";
ncol->required = NO;
ncol->description = _("Node cost column (number)");
ncol->guisection = _("Cost");
Modified: grass/trunk/vector/v.net.connectivity/v.net.connectivity.html
===================================================================
--- grass/trunk/vector/v.net.connectivity/v.net.connectivity.html 2014-12-24 13:19:38 UTC (rev 63723)
+++ grass/trunk/vector/v.net.connectivity/v.net.connectivity.html 2014-12-24 13:28:25 UTC (rev 63724)
@@ -8,7 +8,7 @@
Two sets (<em>set1</em> and <em>set2</em>) are specified by respective
<b>layer</b>, <b>where</b> and <b>cats</b> parameters. Similarly to
<a href="v.net.flow.html">v.net.flow</a> module, capacities of nodes can
-be given by <b>ncolumn</b> option. <em>v.net.connectivity</em> finds the
+be given by <b>node_column</b> option. <em>v.net.connectivity</em> finds the
set of nodes of minimum total capacitiy separating the two given sets and
outputs map containing points on the positions of these nodes. Default
capacity, which is used when no column is specified, is one.
@@ -24,7 +24,7 @@
<div class="code"><pre>
v.net.connectivity input=airtraffic output=connectivity \
- set1_where="name=JFK" set2_where="name=Heathrow" ncolumn=capacity
+ set1_where="name=JFK" set2_where="name=Heathrow" node_column=capacity
</pre></div>
Modified: grass/trunk/vector/v.net.distance/main.c
===================================================================
--- grass/trunk/vector/v.net.distance/main.c 2014-12-24 13:19:38 UTC (rev 63723)
+++ grass/trunk/vector/v.net.distance/main.c 2014-12-24 13:28:25 UTC (rev 63724)
@@ -146,7 +146,7 @@
abcol->guisection = _("Cost");
ncol = G_define_standard_option(G_OPT_DB_COLUMN);
- ncol->key = "ncolumn";
+ ncol->key = "node_column";
ncol->required = NO;
ncol->description = _("Node cost column (number)");
ncol->guisection = _("Cost");
Modified: grass/trunk/vector/v.net.flow/main.c
===================================================================
--- grass/trunk/vector/v.net.flow/main.c 2014-12-24 13:19:38 UTC (rev 63723)
+++ grass/trunk/vector/v.net.flow/main.c 2014-12-24 13:28:25 UTC (rev 63724)
@@ -97,7 +97,7 @@
abcol->guisection = _("Cost");
ncol = G_define_standard_option(G_OPT_DB_COLUMN);
- ncol->key = "ncolumn";
+ ncol->key = "node_column";
ncol->required = NO;
ncol->description = _("Node cost column (number)");
ncol->guisection = _("Cost");
Modified: grass/trunk/vector/v.net.iso/main.c
===================================================================
--- grass/trunk/vector/v.net.iso/main.c 2014-12-24 13:19:38 UTC (rev 63723)
+++ grass/trunk/vector/v.net.iso/main.c 2014-12-24 13:28:25 UTC (rev 63724)
@@ -128,7 +128,7 @@
abcol->guisection = _("Cost");
ncol = G_define_standard_option(G_OPT_DB_COLUMN);
- ncol->key = "ncolumn";
+ ncol->key = "node_column";
ncol->description = _("Node cost column (number)");
ncol->guisection = _("Cost");
Modified: grass/trunk/vector/v.net.path/main.c
===================================================================
--- grass/trunk/vector/v.net.path/main.c 2014-12-24 13:19:38 UTC (rev 63723)
+++ grass/trunk/vector/v.net.path/main.c 2014-12-24 13:28:25 UTC (rev 63724)
@@ -87,7 +87,7 @@
abcol->guisection = _("Cost");
ncol = G_define_option();
- ncol->key = "ncolumn";
+ ncol->key = "node_column";
ncol->type = TYPE_STRING;
ncol->required = NO;
ncol->description = _("Node cost column (number)");
Modified: grass/trunk/vector/v.net.spanningtree/main.c
===================================================================
--- grass/trunk/vector/v.net.spanningtree/main.c 2014-12-24 13:19:38 UTC (rev 63723)
+++ grass/trunk/vector/v.net.spanningtree/main.c 2014-12-24 13:28:25 UTC (rev 63724)
@@ -73,7 +73,7 @@
afcol->guisection = _("Cost");
ncol = G_define_standard_option(G_OPT_DB_COLUMN);
- ncol->key = "ncolumn";
+ ncol->key = "node_column";
ncol->required = NO;
ncol->description = _("Node cost column (number)");
ncol->guisection = _("Cost");
Modified: grass/trunk/vector/v.net.timetable/main.c
===================================================================
--- grass/trunk/vector/v.net.timetable/main.c 2014-12-24 13:19:38 UTC (rev 63723)
+++ grass/trunk/vector/v.net.timetable/main.c 2014-12-24 13:28:25 UTC (rev 63724)
@@ -296,7 +296,7 @@
abcol->guisection = _("Cost");
ncol = G_define_option();
- ncol->key = "ncolumn";
+ ncol->key = "node_column";
ncol->type = TYPE_STRING;
ncol->required = NO;
ncol->description = _("Node cost column (number)");
More information about the grass-commit
mailing list