[GRASS-SVN] r33827 - in grass/trunk: gui/tcltk/gis.m gui/wxpython/gui_modules raster raster/r.uslek

[svn_grass at osgeo.org]

Author: ychemin
Date: 2008-10-11 20:41:38 -0400 (Sat, 11 Oct 2008)
New Revision: 33827

Modified:
   grass/trunk/gui/tcltk/gis.m/gmmenu.tcl
   grass/trunk/gui/wxpython/gui_modules/menudata.py
   grass/trunk/raster/Makefile
   grass/trunk/raster/r.uslek/r.uslek.html
Log:
Added r.usler with menu for both GUIs

Modified: grass/trunk/gui/tcltk/gis.m/gmmenu.tcl
===================================================================
--- grass/trunk/gui/tcltk/gis.m/gmmenu.tcl	2008-10-12 00:29:45 UTC (rev 33826)
+++ grass/trunk/gui/tcltk/gis.m/gmmenu.tcl	2008-10-12 00:41:38 UTC (rev 33827)
@@ -310,6 +310,9 @@
 		{command {[G_msg "Topographic index map"]} {} "r.topidx: Topographic index map" {} -command {execute r.topidx }}
 		{command {[G_msg "TOPMODEL simulation"]} {} "r.topmodel: TOPMODEL simulation" {} -command {execute r.topmodel }}
 		{separator}
+		{command {[G_msg "USLE K Factor"]} {} "r.uslek: Soil Erodibility" {} -command {execute r.uslek }}
+		{command {[G_msg "USLE R Factor"]} {} "r.usler: Rainfall Erosivity" {} -command {execute r.usler }}
+		{separator}
 		{command {[G_msg "Watershed subbasins"]} {} "r.basins.fill: Watershed subbasins" {} -command {execute r.basins.fill }}
 		{command {[G_msg "Watershed analysis"]} {} "r.watershed: Watershed analysis" {} -command {execute r.watershed }}
 		{command {[G_msg "Watershed basin creation"]} {} "r.water.outlet: Watershed basin creation" {} -command {execute r.water.outlet }}

Modified: grass/trunk/gui/wxpython/gui_modules/menudata.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/menudata.py	2008-10-12 00:29:45 UTC (rev 33826)
+++ grass/trunk/gui/wxpython/gui_modules/menudata.py	2008-10-12 00:41:38 UTC (rev 33827)
@@ -833,6 +833,17 @@
                                  "r.topmodel"),
                                 ("","","", ""),
 
+                                (_("USLE K Factor"),
+                                 _("USLE K Factor: Soil Erodibility."),
+                                 "self.OnMenuCmd",
+                                 "r.uslek"),
+
+                                (_("USLE R Factor"),
+                                 _("USLE R Factor: Rainfall Erosivity."),
+                                 "self.OnMenuCmd",
+                                 "r.usler"),
+                                ("","","", ""),
+
                                 (_("Watershed subbasins"),
                                  _("Generates a raster map layer showing watershed subbasins."),
                                  "self.OnMenuCmd",

Modified: grass/trunk/raster/Makefile
===================================================================
--- grass/trunk/raster/Makefile	2008-10-12 00:29:45 UTC (rev 33826)
+++ grass/trunk/raster/Makefile	2008-10-12 00:41:38 UTC (rev 33827)
@@ -103,6 +103,7 @@
 	r.transect \
 	r.univar \
 	r.uslek \
+	r.usler \
 	r.volume \
 	r.walk \
 	r.water.outlet \

Modified: grass/trunk/raster/r.uslek/r.uslek.html
===================================================================
--- grass/trunk/raster/r.uslek/r.uslek.html	2008-10-12 00:29:45 UTC (rev 33826)
+++ grass/trunk/raster/r.uslek/r.uslek.html	2008-10-12 00:41:38 UTC (rev 33827)
@@ -4,14 +4,15 @@
 It takes input of soil texture classes (sand, clay, silt) and organic matter, all in range of [0.0-1.0]. The FAO World Soil CD documentation was used to produce the conversion system between soil textures and soil classes. The soil classes are in number of 12 and apparently come from a USDA publication of 1951 (p.209). Once the soil classes have been identified (by vector cross-products tests), a general conversion table was applied for transforming soil classes into K factor.
 
 <H2>NOTES</H2>
+r.watershed provides for USLE L,S,LS factors.
 
-
 <H2>TODO</H2>
 
 
 <H2>SEE ALSO</H2>
 
 <em>
+<A HREF="r.usler.html">r.usler</A><br>
 <A HREF="r.watershed.html">r.watershed</A><br>
 </em>