[GRASS-SVN] r44939 - grass/branches/releasebranch_6_4/vector/v.transform

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-01-10 07:31:28 -0800 (Mon, 10 Jan 2011)
New Revision: 44939

Modified:
   grass/branches/releasebranch_6_4/vector/v.transform/main.c
Log:
v.transform: more guisection, fix gisprompt for 'columns'
(merge r44934 from devbr6)


Modified: grass/branches/releasebranch_6_4/vector/v.transform/main.c
===================================================================
--- grass/branches/releasebranch_6_4/vector/v.transform/main.c	2011-01-10 14:15:42 UTC (rev 44938)
+++ grass/branches/releasebranch_6_4/vector/v.transform/main.c	2011-01-10 15:31:28 UTC (rev 44939)
@@ -82,12 +82,13 @@
     tozero_flag = G_define_flag();
     tozero_flag->key = 't';
     tozero_flag->description = _("Shift all z values to bottom=0");
+    tozero_flag->guisection = _("Custom");
 
     print_mat_flag = G_define_flag();
     print_mat_flag->key = 'm';
     print_mat_flag->description =
 	_("Print the transformation matrix to stdout");
-
+    
     /* remove in GRASS7 */
     shift_flag = G_define_flag();
     shift_flag->key = 's';
@@ -95,9 +96,11 @@
 	_("Instead of points use transformation parameters "
 	  "(xshift, yshift, zshift, xscale, yscale, zscale, zrot)");
     shift_flag->guisection = _("Custom");
-
+	
     vold = G_define_standard_option(G_OPT_V_INPUT);
 
+    field = G_define_standard_option(G_OPT_V_FIELD);
+    
     vnew = G_define_standard_option(G_OPT_V_OUTPUT);
 
     pointsfile = G_define_standard_option(G_OPT_F_INPUT);
@@ -108,7 +111,8 @@
 				"(xshift, yshift, zshift, xscale, yscale, zscale, zrot) are used instead");
 
     pointsfile->gisprompt = "old_file,file,points";
-
+    pointsfile->guisection = _("Points");
+    
     xshift = G_define_option();
     xshift->key = "xshift";
     xshift->type = TYPE_DOUBLE;
@@ -176,18 +180,19 @@
     table = G_define_standard_option(G_OPT_TABLE);
     table->description =
 	_("Name of table containing transformation parameters");
-    table->guisection = _("Custom");
+    table->guisection = _("Attributes");
 
-    columns = G_define_standard_option(G_OPT_COLUMNS);
+    columns = G_define_option();
+    columns->key = "columns";
+    columns->type = TYPE_STRING;
+    columns->required = NO;
+    columns->multiple = NO;
     columns->label =
 	_("Name of attribute column(s) used as transformation parameters");
     columns->description =
 	_("Format: parameter:column, e.g. xshift:xs,yshift:ys,zrot:zr");
-    columns->guisection = _("Custom");
+    columns->guisection = _("Attributes");
 
-    field = G_define_standard_option(G_OPT_V_FIELD);
-    field->guisection = _("Custom");
-
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);