use standardized options (https://trac.osgeo.org/grass/ticket/2409)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63170 15284696-431f-4ddb-bdfa-cd5b030d7da7

display/d.colorlist/main.c

@@ -39,12 +39,9 @@ int main(int argc, char **argv)
 	"separator (default is comma).";
 
     /* set up option */
-    sep = G_define_option();
-    sep->key = "fs";
-    sep->type = TYPE_STRING;
-    sep->required = NO;
+    sep = G_define_standard_option(G_OPT_F_SEP);
+    sep->key = "separator";
     sep->description = "Character for separation of list items";
-    sep->answer = ",";
 
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

imagery/i.biomass/main.c

@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
     input1->description = _("Name of fPAR raster map");
 
     input2 = G_define_standard_option(G_OPT_R_INPUT);
-    input2->key = "lightuseefficiency";
+    input2->key = "lightuse_efficiency";
     input2->description =
 	_("Name of light use efficiency raster map (UZB:cotton=1.9)");
 
@@ -73,12 +73,12 @@ int main(int argc, char *argv[])
     input4->description = _("Name of Day of Year raster map [1-366]");
 
     input5 = G_define_standard_option(G_OPT_R_INPUT);
-    input5->key = "transmissivitysingleway";
+    input5->key = "transmissivity_singleway";
     input5->description =
 	_("Name of single-way transmissivity raster map [0.0-1.0]");
 
     input6 = G_define_standard_option(G_OPT_R_INPUT);
-    input6->key = "wateravailability";
+    input6->key = "water_availability";
     input6->description =
 	_("Value of water availability raster map [0.0-1.0]");
 

imagery/i.evapo.mh/main.c

@@ -74,19 +74,19 @@ int main(int argc, char *argv[])
 
     /* Define different options */
     input_RNET = G_define_standard_option(G_OPT_R_INPUT);
-    input_RNET->key = "netradiationdiurnal";
+    input_RNET->key = "netradiation_diurnal";
     input_RNET->description = _("Name of input diurnal net radiation raster map [W/m2/d]");
 
     input_TEMPKAVG = G_define_standard_option(G_OPT_R_INPUT);
-    input_TEMPKAVG->key = "averagetemperature";
+    input_TEMPKAVG->key = "average_temperature";
     input_TEMPKAVG->description = _("Name of input average air temperature raster map [C]");
 
     input_TEMPKMIN = G_define_standard_option(G_OPT_R_INPUT);
-    input_TEMPKMIN->key = "minimumtemperature";
+    input_TEMPKMIN->key = "minimum_temperature";
     input_TEMPKMIN->description = _("Name of input minimum air temperature raster map [C]");
 
     input_TEMPKMAX = G_define_standard_option(G_OPT_R_INPUT);
-    input_TEMPKMAX->key = "maximumtemperature";
+    input_TEMPKMAX->key = "maximum_temperature";
     input_TEMPKMAX->description = _("Name of input maximum air temperature raster map [C]");
 
     input_P = G_define_standard_option(G_OPT_R_INPUT);

imagery/i.evapo.pt/main.c

@@ -71,23 +71,23 @@ int main(int argc, char *argv[])
     
     /* Define different options */
     input_RNET = G_define_standard_option(G_OPT_R_INPUT);
-    input_RNET->key = "netradiation";
+    input_RNET->key = "net_radiation";
     input_RNET->description = _("Name of input net radiation raster map [W/m2]");
 
     input_G0 = G_define_standard_option(G_OPT_R_INPUT);
-    input_G0->key = "soilheatflux";
+    input_G0->key = "soil_heatflux";
     input_G0->description = _("Name of input soil heat flux raster map [W/m2]");
 
     input_TEMPKA = G_define_standard_option(G_OPT_R_INPUT);
-    input_TEMPKA->key = "airtemperature";
+    input_TEMPKA->key = "air_temperature";
     input_TEMPKA->description = _("Name of input air temperature raster map [K]");
 
     input_PATM = G_define_standard_option(G_OPT_R_INPUT);
-    input_PATM->key = "atmosphericpressure";
+    input_PATM->key = "atmospheric_pressure";
     input_PATM->description = _("Name of input atmospheric pressure raster map [millibars]");
 
     input_PT = G_define_option();
-    input_PT->key = "priestleytaylorcoef";
+    input_PT->key = "priestley_taylor_coef";
     input_PT->type = TYPE_DOUBLE;
     input_PT->required = YES;
     input_PT->description = _("Priestley-Taylor coefficient");

raster/r.to.rast3/main.c

@@ -76,7 +76,7 @@ void fatal_error(void *map, int *fd, int depths, char *errorMsg)
 void set_params()
 {
     param.input = G_define_standard_option(G_OPT_R_INPUTS);
-    param.input->description = _("2d raster maps which represent the slices");
+    param.input->description = _("2D raster maps which represent the slices");
 
     param.output = G_define_standard_option(G_OPT_R3_OUTPUT);
 
@@ -223,11 +223,11 @@ int main(int argc, char *argv[])
     rows = Rast_window_rows();
     cols = Rast_window_cols();
 
-    G_debug(2, "Check the 2d and 3d region settings");
+    G_debug(2, "Check the 2D and 3D region settings");
 
     /*If not equal, set the 2D windows correct */
     if (rows != region.rows || cols != region.cols) {
-        G_message(_("The 2D and 3D region settings are different. I will use the 3D region settings to adjust the 2D region."));
+        G_message(_("The 2D and 3D region settings are different. Using the 3D region settings to adjust the 2D region."));
         G_get_set_window(&window2d);
         window2d.ns_res = region.ns_res;
         window2d.ew_res = region.ew_res;

raster3d/r3.gradient/main.c

@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
     output_opt->description = _("Name for output 3D raster map(s)");
 
     block_opt = G_define_option();
-    block_opt->key = "block_size";
+    block_opt->key = "blocksize";
     block_opt->multiple = TRUE;
     block_opt->answer = "30,30,20"; /* based on testing */
     block_opt->key_desc = "size_x,size_y,size_z";

raster3d/r3.gradient/r3.gradient.html

@@ -1,11 +1,14 @@
 <h2>DESCRIPTION</h2>
-Module <em>r3.gradient</em> computes gradient from a 3D raster map.
-Results are three 3D raster maps describing the x, y, z components of the computed gradient field.
+
+Module <em>r3.gradient</em> computes gradient from a 3D raster map. 
+Results are three 3D raster maps describing the x, y, z components of 
+the computed gradient field.
 
 <h2>EXAMPLES</h2>
+
 <div class="code"><pre>
 # create a 3D raster
-g.region s=0 n=100 w=0 e=100 b=0 t=100
+g.region s=0 n=100 w=0 e=100 b=0 t=100 -p
 r3.mapcalc "test_gradient = sqrt(row()*row() +col()*col()+ depth()*depth())"
 
 # compute gradient
@@ -13,13 +16,16 @@ r3.gradient input=test_gradient output=grad_x,grad_y,grad_z
 </pre></div>
 
 <h2>SEE ALSO</h2>
+
 <em>
 <a href="r3.flow.html">r3.flow</a>,
 <a href="r.flow.html">r.flow</a>
 </em>
 
 <h2>AUTHORS</h2>
-Anna Petrasova, <a href="http://geospatial.ncsu.edu/osgeorel/">NCSU OSGeoREL</a>, developed during GSoC 2014.
+
+Anna Petrasova, <a href="http://geospatial.ncsu.edu/osgeorel/">NCSU OSGeoREL</a>,
+developed during GSoC 2014.
 
 <p>
 <i>Last changed: $Date$</i>

temporal/t.rast3d.extract/t.rast3d.extract.py

@@ -40,7 +40,7 @@
 #%option
 #% key: basename
 #% type: string
-#% description: Base name of the new created 3D raster maps
+#% description: Basename of the new generated 3D raster maps
 #% required: no
 #% multiple: no
 #%end

vector/v.mkgrid/main.c

@@ -99,12 +99,7 @@ int main(int argc, char *argv[])
             _("use 'coor' and 'box' options"));
     position_opt->descriptions = desc;
 
-    coord = G_define_option();
-    coord->key = "coor";
-    coord->key_desc = "x,y";
-    coord->type = TYPE_DOUBLE;
-    coord->required = NO;
-    coord->multiple = NO;
+    coord = G_define_standard_option(G_OPT_M_COORDS);
     coord->description =
 	_("Lower left easting and northing coordinates of map");
 

vector/v.surf.rst/main.c

@@ -221,7 +221,7 @@ int main(int argc, char *argv[])
     parm.mcurv->guisection = _("Outputs");
 
     parm.devi = G_define_standard_option(G_OPT_V_OUTPUT);
-    parm.devi->key = "devi";
+    parm.devi->key = "deviations";
     parm.devi->required = NO;
     parm.devi->description = _("Name for output deviations vector point map");
     parm.devi->guisection = _("Outputs");

vector/v.vol.rst/main.c

@@ -286,7 +286,7 @@ int main(int argc, char *argv[])
     parm.wheresql = G_define_standard_option(G_OPT_DB_WHERE);
 
     parm.devi = G_define_standard_option(G_OPT_V_OUTPUT);
-    parm.devi->key = "devi";
+    parm.devi->key = "deviations";
     parm.devi->required = NO;
     parm.devi->description = _("Name for output deviations vector point map");
     parm.devi->guisection = _("Outputs");