[GRASS-SVN] r61069 - in grass/trunk/vector: v.net.alloc v.net.iso v.net.path v.net.salesman

[svn_grass at osgeo.org]

Author: turek
Date: 2014-06-29 11:41:50 -0700 (Sun, 29 Jun 2014)
New Revision: 61069

Modified:
   grass/trunk/vector/v.net.alloc/main.c
   grass/trunk/vector/v.net.iso/main.c
   grass/trunk/vector/v.net.path/main.c
   grass/trunk/vector/v.net.salesman/main.c
Log:
v.net.path/alloc/iso/salesman: move -t flag into turntable guisection

Modified: grass/trunk/vector/v.net.alloc/main.c
===================================================================
--- grass/trunk/vector/v.net.alloc/main.c	2014-06-29 18:24:30 UTC (rev 61068)
+++ grass/trunk/vector/v.net.alloc/main.c	2014-06-29 18:41:50 UTC (rev 61069)
@@ -120,6 +120,11 @@
     ncol->description = _("Node cost column (number)");
     ncol->guisection = _("Costs");
 
+    turntable_f = G_define_flag();
+    turntable_f->key = 't';
+    turntable_f->description = _("Use turntable");
+    turntable_f->guisection = _("Turntable");
+
     tfield_opt = G_define_standard_option(G_OPT_V_FIELD);
     tfield_opt->key = "tlayer";
     tfield_opt->answer = "3";
@@ -141,10 +146,6 @@
     geo_f->description =
 	_("Use geodesic calculation for longitude-latitude locations");
 
-    turntable_f = G_define_flag();
-    turntable_f->key = 't';
-    turntable_f->description = _("Use turntable");
-
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 

Modified: grass/trunk/vector/v.net.iso/main.c
===================================================================
--- grass/trunk/vector/v.net.iso/main.c	2014-06-29 18:24:30 UTC (rev 61068)
+++ grass/trunk/vector/v.net.iso/main.c	2014-06-29 18:41:50 UTC (rev 61069)
@@ -131,6 +131,11 @@
     ncol->description = _("Node cost column (number)");
     ncol->guisection = _("Costs");
 
+    turntable_f = G_define_flag();
+    turntable_f->key = 't';
+    turntable_f->description = _("Use turntable");
+    turntable_f->guisection = _("Turntable");
+
     tfield_opt = G_define_standard_option(G_OPT_V_FIELD);
     tfield_opt->key = "tlayer";
     tfield_opt->answer = "3";
@@ -152,10 +157,6 @@
     geo_f->description =
 	_("Use geodesic calculation for longitude-latitude locations");
 
-    turntable_f = G_define_flag();
-    turntable_f->key = 't';
-    turntable_f->description = _("Use turntable");
-
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 

Modified: grass/trunk/vector/v.net.path/main.c
===================================================================
--- grass/trunk/vector/v.net.path/main.c	2014-06-29 18:24:30 UTC (rev 61068)
+++ grass/trunk/vector/v.net.path/main.c	2014-06-29 18:41:50 UTC (rev 61069)
@@ -104,6 +104,11 @@
 			      "and error message is printed. To speed up the process, keep this "
 			      "value as low as possible.");
 
+    turntable_f = G_define_flag();
+    turntable_f->key = 't';
+    turntable_f->description = _("Use turntable");
+    turntable_f->guisection = _("Turntable");
+
     tfield_opt = G_define_standard_option(G_OPT_V_FIELD);
     tfield_opt->key = "tlayer";
     tfield_opt->answer = "3";
@@ -130,10 +135,6 @@
     segments_f->description = _("Write output as original input segments, "
 				"not each path as one line.");
 
-    turntable_f = G_define_flag();
-    turntable_f->key = 't';
-    turntable_f->description = _("Use turntable");
-
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);
 

Modified: grass/trunk/vector/v.net.salesman/main.c
===================================================================
--- grass/trunk/vector/v.net.salesman/main.c	2014-06-29 18:24:30 UTC (rev 61068)
+++ grass/trunk/vector/v.net.salesman/main.c	2014-06-29 18:41:50 UTC (rev 61069)
@@ -161,20 +161,6 @@
     nfield_opt->required = YES;
     nfield_opt->label = _("Node layer (used for cities)");
 
-    tfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    tfield_opt->key = "tlayer";
-    tfield_opt->answer = "3";
-    tfield_opt->label = _("Layer with turntable");
-    tfield_opt->description = _("Relevant only with -t flag.");
-    tfield_opt->guisection = _("Turntable");
-
-    tucfield_opt = G_define_standard_option(G_OPT_V_FIELD);
-    tucfield_opt->key = "tuclayer";
-    tucfield_opt->answer = "4";
-    tucfield_opt->label = _("Layer with unique categories used in turntable");
-    tucfield_opt->description = _("Relevant only with -t flag.");
-    tucfield_opt->guisection = _("Turntable");
-
     afcol = G_define_option();
     afcol->key = "afcolumn";
     afcol->type = TYPE_STRING;
@@ -191,6 +177,25 @@
 	_("EXPERIMENTAL: Arc backward direction cost column (number)");
     abcol->guisection = _("Costs");
 
+    turntable_f = G_define_flag();
+    turntable_f->key = 't';
+    turntable_f->description = _("Use turntable");
+    turntable_f->guisection = _("Turntable");
+
+    tfield_opt = G_define_standard_option(G_OPT_V_FIELD);
+    tfield_opt->key = "tlayer";
+    tfield_opt->answer = "3";
+    tfield_opt->label = _("Layer with turntable");
+    tfield_opt->description = _("Relevant only with -t flag.");
+    tfield_opt->guisection = _("Turntable");
+
+    tucfield_opt = G_define_standard_option(G_OPT_V_FIELD);
+    tucfield_opt->key = "tuclayer";
+    tucfield_opt->answer = "4";
+    tucfield_opt->label = _("Layer with unique categories used in turntable");
+    tucfield_opt->description = _("Relevant only with -t flag.");
+    tucfield_opt->guisection = _("Turntable");
+
     seq = G_define_standard_option(G_OPT_F_OUTPUT);
     seq->key = "sequence";
     seq->type = TYPE_STRING;
@@ -203,10 +208,6 @@
     geo_f->description =
 	_("Use geodesic calculation for longitude-latitude locations");
 
-    turntable_f = G_define_flag();
-    turntable_f->key = 't';
-    turntable_f->description = _("Use turntable");
-
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);