[GRASS-SVN] r56247 - in grass-addons/grass7: imagery/i.eb.h_sebal95 imagery/i.spec.unmix raster raster/r.area raster/r.convergence raster/r.stream.basins raster/r.stream.channel raster/r.stream.distance raster/r.stream.order raster/r.stream.segment raster/r.stream.slope raster/r.stream.snap raster/r.stream.stats
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue May 14 02:11:11 PDT 2013
Author: neteler
Date: 2013-05-14 02:11:11 -0700 (Tue, 14 May 2013)
New Revision: 56247
Modified:
grass-addons/grass7/imagery/i.eb.h_sebal95/main.c
grass-addons/grass7/imagery/i.spec.unmix/main.c
grass-addons/grass7/raster/Makefile
grass-addons/grass7/raster/r.area/main.c
grass-addons/grass7/raster/r.convergence/main.c
grass-addons/grass7/raster/r.stream.basins/main.c
grass-addons/grass7/raster/r.stream.channel/main.c
grass-addons/grass7/raster/r.stream.distance/main.c
grass-addons/grass7/raster/r.stream.order/main.c
grass-addons/grass7/raster/r.stream.segment/main.c
grass-addons/grass7/raster/r.stream.slope/main.c
grass-addons/grass7/raster/r.stream.snap/main.c
grass-addons/grass7/raster/r.stream.stats/main.c
Log:
various G_add_keyword() fixes
Modified: grass-addons/grass7/imagery/i.eb.h_sebal95/main.c
===================================================================
--- grass-addons/grass7/imagery/i.eb.h_sebal95/main.c 2013-05-14 08:58:43 UTC (rev 56246)
+++ grass-addons/grass7/imagery/i.eb.h_sebal95/main.c 2013-05-14 09:11:11 UTC (rev 56247)
@@ -86,6 +86,8 @@
G_gisinit(argv[0]);
module = G_define_module();
+ G_add_keyword(_("imagery"));
+ G_add_keyword(_("heat flux"));
module->description = _("Sensible Heat Flux iteration SEBAL 95");
/* Define different options */
Modified: grass-addons/grass7/imagery/i.spec.unmix/main.c
===================================================================
--- grass-addons/grass7/imagery/i.spec.unmix/main.c 2013-05-14 08:58:43 UTC (rev 56246)
+++ grass-addons/grass7/imagery/i.spec.unmix/main.c 2013-05-14 09:11:11 UTC (rev 56247)
@@ -89,15 +89,15 @@
/* initialize GIS engine */
G_gisinit(argv[0]);
+
module = G_define_module();
-
- module->keywords = _("imagery, spectral unmixing");
+ G_add_keyword(_("imagery"));
+ G_add_keyword(_("spectral unmixing"));
module->description =
_("Perfroms Spectral mixture analysis of satellite/aerial images");
parm.group = G_define_standard_option(G_OPT_I_GROUP);
-
parm.matrixfile = G_define_standard_option(G_OPT_F_INPUT);
parm.matrixfile->key = "matrix";
parm.matrixfile->type = TYPE_STRING;
Modified: grass-addons/grass7/raster/Makefile
===================================================================
--- grass-addons/grass7/raster/Makefile 2013-05-14 08:58:43 UTC (rev 56246)
+++ grass-addons/grass7/raster/Makefile 2013-05-14 09:11:11 UTC (rev 56247)
@@ -16,7 +16,6 @@
r.mcda.output \
r.mcda.roughset \
r.modis \
- r.regression.multi \
r.regression.series \
r.stream.basins \
r.stream.channel \
Modified: grass-addons/grass7/raster/r.area/main.c
===================================================================
--- grass-addons/grass7/raster/r.area/main.c 2013-05-14 08:58:43 UTC (rev 56246)
+++ grass-addons/grass7/raster/r.area/main.c 2013-05-14 09:11:11 UTC (rev 56247)
@@ -3,7 +3,7 @@
* MODULE: r.area
* AUTHOR(S): Jarek Jasiewicz <jarekj amu.edu.pl>
* PURPOSE: Calculate area of clumped areas. Remove areas smaller than
- * given treshold.
+ * given threshold.
*
* COPYRIGHT: (C) 1999-2010 by the GRASS Development Team
*
@@ -45,6 +45,13 @@
G_gisinit(argv[0]);
+ module = G_define_module();
+ G_add_keyword(_("raster"));
+ G_add_keyword(_("statistics"));
+ G_add_keyword(_("area"));
+ module->description =
+ _("Calculates area of clumped areas and remove areas smaller than given threshold.");
+
input = G_define_standard_option(G_OPT_R_INPUT);
input->description = _("Map created with r.clump");
Modified: grass-addons/grass7/raster/r.convergence/main.c
===================================================================
--- grass-addons/grass7/raster/r.convergence/main.c 2013-05-14 08:58:43 UTC (rev 56246)
+++ grass-addons/grass7/raster/r.convergence/main.c 2013-05-14 09:11:11 UTC (rev 56247)
@@ -1,17 +1,17 @@
/****************************************************************************
*
- * MODULE: r.convergence
+ * MODULE: r.convergence
* AUTHOR(S): Jarek Jasiewicz jarekj amu.edu.pl
- * Original convergence index in SAGA GIS sofware: Olaf Conrad
+ * Original convergence index in SAGA GIS sofware: Olaf Conrad
*
- * PURPOSE: Calculate convergence index (parameter defining the local convergence of the relief)
+ * PURPOSE: Calculate convergence index (parameter defining the local convergence of the relief)
*
*
-* COPYRIGHT: (C) 2002,2010 by the GRASS Development Team
+* COPYRIGHT: (C) 2002,2010 by the GRASS Development Team
*
-* This program is free software under the GNU General Public
-* License (>=v2). Read the file COPYING that comes with GRASS
+* This program is free software under the GNU General Public
+* License (>=v2). Read the file COPYING that comes with GRASS
* for details.
*
*****************************************************************************/
@@ -21,6 +21,7 @@
int main(int argc, char **argv)
{
+ struct GModule *module;
struct Option *map_dem,
*map_slope,
*map_aspect, *par_window, *par_method, *par_differnce, *map_output;
@@ -37,6 +38,12 @@
G_gisinit(argv[0]);
+ module = G_define_module();
+ G_add_keyword(_("raster"));
+ G_add_keyword(_("terrain"));
+ module->description =
+ _("Calculate convergence index.");
+
map_dem = G_define_standard_option(G_OPT_R_INPUT);
map_dem->description = _("Digital elevation model map");
Modified: grass-addons/grass7/raster/r.stream.basins/main.c
===================================================================
--- grass-addons/grass7/raster/r.stream.basins/main.c 2013-05-14 08:58:43 UTC (rev 56246)
+++ grass-addons/grass7/raster/r.stream.basins/main.c 2013-05-14 09:11:11 UTC (rev 56247)
@@ -1,4 +1,3 @@
-
/****************************************************************************
*
* MODULE: r.stream.basins
@@ -47,6 +46,8 @@
module = G_define_module();
module->description = _("Delineate basins according user' input. \
Input can be stream network, point file with outlets or outlet coordinates");
+ G_add_keyword(_("raster"));
+ G_add_keyword(_("hydrology"));
G_add_keyword("basins creation");
in_dir_opt = G_define_standard_option(G_OPT_R_INPUT); /* input directon file */
Modified: grass-addons/grass7/raster/r.stream.channel/main.c
===================================================================
--- grass-addons/grass7/raster/r.stream.channel/main.c 2013-05-14 08:58:43 UTC (rev 56246)
+++ grass-addons/grass7/raster/r.stream.channel/main.c 2013-05-14 09:11:11 UTC (rev 56247)
@@ -58,6 +58,8 @@
G_add_keyword("Horton statisctics");
module->description =
_("Calculate local parameters for individual streams");
+ G_add_keyword(_("raster"));
+ G_add_keyword(_("hydrology"));
G_add_keyword("Stream parameters");
G_add_keyword("Stream gradient");
G_add_keyword("Stream curvature");
Modified: grass-addons/grass7/raster/r.stream.distance/main.c
===================================================================
--- grass-addons/grass7/raster/r.stream.distance/main.c 2013-05-14 08:58:43 UTC (rev 56246)
+++ grass-addons/grass7/raster/r.stream.distance/main.c 2013-05-14 09:11:11 UTC (rev 56247)
@@ -51,6 +51,8 @@
and outlets according user' input. It can work in stream mode where target are streams and outlets mode \
where targets are outlets");
+ G_add_keyword(_("raster"));
+ G_add_keyword(_("hydrology"));
G_add_keyword("watercourse distance");
G_add_keyword("relative elevation");
Modified: grass-addons/grass7/raster/r.stream.order/main.c
===================================================================
--- grass-addons/grass7/raster/r.stream.order/main.c 2013-05-14 08:58:43 UTC (rev 56246)
+++ grass-addons/grass7/raster/r.stream.order/main.c 2013-05-14 09:11:11 UTC (rev 56247)
@@ -72,11 +72,13 @@
module = G_define_module();
module->description =
_("Calculate Strahler's and more streams hierarchy. Basic module for topological analysis of drainage network");
- G_add_keyword("Strahler Stream Order");
- G_add_keyword("Hack Streams");
+ G_add_keyword(_("raster"));
+ G_add_keyword(_("hydrology"));
+ G_add_keyword("Strahler stream order");
+ G_add_keyword("Hack streams");
G_add_keyword("Stream network topology");
G_add_keyword("Stream network geometry");
- G_add_keyword("Nework vectorisation");
+ G_add_keyword("Network vectorisation");
for (i = 0; i < input_size; ++i) {
opt_input[i] = G_define_standard_option(G_OPT_R_INPUT);
Modified: grass-addons/grass7/raster/r.stream.segment/main.c
===================================================================
--- grass-addons/grass7/raster/r.stream.segment/main.c 2013-05-14 08:58:43 UTC (rev 56246)
+++ grass-addons/grass7/raster/r.stream.segment/main.c 2013-05-14 09:11:11 UTC (rev 56247)
@@ -54,6 +54,8 @@
module = G_define_module();
module->description =
_("Divide network into near strigh-line segments and calculate its order");
+ G_add_keyword(_("raster"));
+ G_add_keyword(_("hydrology"));
G_add_keyword("Stream divide");
G_add_keyword("Stream direction");
G_add_keyword("Stream gradient");
Modified: grass-addons/grass7/raster/r.stream.slope/main.c
===================================================================
--- grass-addons/grass7/raster/r.stream.slope/main.c 2013-05-14 08:58:43 UTC (rev 56246)
+++ grass-addons/grass7/raster/r.stream.slope/main.c 2013-05-14 09:11:11 UTC (rev 56247)
@@ -4,15 +4,15 @@
* MODULE: r.stream.slope
* AUTHOR(S): Jarek Jasiewicz jarekj amu.edu.pl
*
- * PURPOSE: Suplementary module for r.stream.distance for slope subsystem,
- * calculate local downsteam elevation change
- * and local downstream minimum and maximum curvature
+ * PURPOSE: Supplementary module for r.stream.distance for slope subsystem,
+ * calculate local downstream elevation change
+ * and local downstream minimum and maximum curvature
- * COPYRIGHT: (C) 2002,2010 by the GRASS Development Team
+ * COPYRIGHT: (C) 2002, 2010 by the GRASS Development Team
*
* This program is free software under the GNU General Public
- * License (>=v2). Read the file COPYING that comes with GRASS
- * for details.
+ * License (>=v2). Read the file COPYING that comes with GRASS
+ * for details.
*
*****************************************************************************/
#include <stdio.h>
@@ -69,6 +69,9 @@
G_gisinit(argv[0]);
module = G_define_module();
+ G_add_keyword(_("raster"));
+ G_add_keyword(_("hydrology"));
+ G_add_keyword("Stream local parameters");
module->description = _("Calculate local parameters for slope subsystem");
in_dir_opt = G_define_standard_option(G_OPT_R_INPUT);
Modified: grass-addons/grass7/raster/r.stream.snap/main.c
===================================================================
--- grass-addons/grass7/raster/r.stream.snap/main.c 2013-05-14 08:58:43 UTC (rev 56246)
+++ grass-addons/grass7/raster/r.stream.snap/main.c 2013-05-14 09:11:11 UTC (rev 56247)
@@ -46,6 +46,8 @@
module = G_define_module();
module->description = _("Delineate basins according user' input. \
Input can be stream network, point file with outlets or outlet coordinates");
+ G_add_keyword(_("raster"));
+ G_add_keyword(_("hydrology"));
G_add_keyword("basins creation");
in_points_opt = G_define_standard_option(G_OPT_V_INPUT);
Modified: grass-addons/grass7/raster/r.stream.stats/main.c
===================================================================
--- grass-addons/grass7/raster/r.stream.stats/main.c 2013-05-14 08:58:43 UTC (rev 56246)
+++ grass-addons/grass7/raster/r.stream.stats/main.c 2013-05-14 09:11:11 UTC (rev 56247)
@@ -50,9 +50,11 @@
module = G_define_module();
module->description =
_("Calculate Horton's statistics for Strahler and Horton ordered networks created with r.stream.");
+ G_add_keyword(_("raster"));
+ G_add_keyword(_("hydrology"));
G_add_keyword("Horton's statistics");
- G_add_keyword("Bifuracation ratio");
- G_add_keyword("Drainege density");
+ G_add_keyword("Bifurcation ratio");
+ G_add_keyword("Drainage density");
G_add_keyword("Catchment statistics");
in_stm_opt = G_define_standard_option(G_OPT_R_INPUT);
More information about the grass-commit
mailing list