[GRASS-SVN] r63126 - in grass/branches/releasebranch_7_0: . vector/v.out.vtk

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-26 08:43:42 -0800 (Wed, 26 Nov 2014)
New Revision: 63126

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/vector/v.out.vtk/main.c
Log:
v.out.vtk: use standardized options (#2409) - (merge r63123 from trunk)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,
 63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121
   + /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,
 63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123

Modified: grass/branches/releasebranch_7_0/vector/v.out.vtk/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.out.vtk/main.c	2014-11-26 16:43:32 UTC (rev 63125)
+++ grass/branches/releasebranch_7_0/vector/v.out.vtk/main.c	2014-11-26 16:43:42 UTC (rev 63126)
@@ -52,6 +52,8 @@
 
     input = G_define_standard_option(G_OPT_V_INPUT);
 
+    layer_opt = G_define_standard_option(G_OPT_V_FIELD);
+    
     output = G_define_standard_option(G_OPT_F_OUTPUT);
     output->required = NO;
     output->description = _("Name for output VTK file");
@@ -61,26 +63,21 @@
     type_opt->options = "point,kernel,centroid,line,boundary,area,face";
 
     dp_opt = G_define_option();
-    dp_opt->key = "dp";
+    dp_opt->key = "precision";
     dp_opt->type = TYPE_INTEGER;
     dp_opt->required = NO;
     dp_opt->description =
 	_("Number of significant digits (floating point only)");
 
     scale = G_define_option();
-    scale->key = "scale";
+    scale->key = "zmultiplier";
     scale->type = TYPE_DOUBLE;
     scale->required = NO;
     scale->description = _("Scale factor for elevation");
     scale->answer = "1.0";
 
-    layer_opt = G_define_option();
-    layer_opt->key = "layer";
-    layer_opt->type = TYPE_INTEGER;
-    layer_opt->required = NO;
-    layer_opt->answer = "1";
-    layer_opt->description = _("Layer number");
 
+
     coorcorr = G_define_flag();                                            
     coorcorr->key = 'c';                                                   
     coorcorr->description =