瀏覽代碼

Added r.usler with menu for both GUIs

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@33827 15284696-431f-4ddb-bdfa-cd5b030d7da7
Yann Chemin 16 年之前
父節點
當前提交
d8a7dd3f43
共有 4 個文件被更改,包括 17 次插入1 次删除
  1. 3 0
      gui/tcltk/gis.m/gmmenu.tcl
  2. 11 0
      gui/wxpython/gui_modules/menudata.py
  3. 1 0
      raster/Makefile
  4. 2 1
      raster/r.uslek/r.uslek.html

+ 3 - 0
gui/tcltk/gis.m/gmmenu.tcl

@@ -310,6 +310,9 @@ set descmenu [subst  {
 		{command {[G_msg "Topographic index map"]} {} "r.topidx: Topographic index map" {} -command {execute r.topidx }}
 		{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 }}
 		{command {[G_msg "TOPMODEL simulation"]} {} "r.topmodel: TOPMODEL simulation" {} -command {execute r.topmodel }}
 		{separator}
 		{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 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 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 }}
 		{command {[G_msg "Watershed basin creation"]} {} "r.water.outlet: Watershed basin creation" {} -command {execute r.water.outlet }}

+ 11 - 0
gui/wxpython/gui_modules/menudata.py

@@ -833,6 +833,17 @@ class Data:
                                  "r.topmodel"),
                                  "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"),
                                 (_("Watershed subbasins"),
                                  _("Generates a raster map layer showing watershed subbasins."),
                                  _("Generates a raster map layer showing watershed subbasins."),
                                  "self.OnMenuCmd",
                                  "self.OnMenuCmd",

+ 1 - 0
raster/Makefile

@@ -103,6 +103,7 @@ SUBDIRS = \
 	r.transect \
 	r.transect \
 	r.univar \
 	r.univar \
 	r.uslek \
 	r.uslek \
+	r.usler \
 	r.volume \
 	r.volume \
 	r.walk \
 	r.walk \
 	r.water.outlet \
 	r.water.outlet \

+ 2 - 1
raster/r.uslek/r.uslek.html

@@ -4,7 +4,7 @@
 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.
 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>
 <H2>NOTES</H2>
-
+r.watershed provides for USLE L,S,LS factors.
 
 
 <H2>TODO</H2>
 <H2>TODO</H2>
 
 
@@ -12,6 +12,7 @@ It takes input of soil texture classes (sand, clay, silt) and organic matter, al
 <H2>SEE ALSO</H2>
 <H2>SEE ALSO</H2>
 
 
 <em>
 <em>
+<A HREF="r.usler.html">r.usler</A><br>
 <A HREF="r.watershed.html">r.watershed</A><br>
 <A HREF="r.watershed.html">r.watershed</A><br>
 </em>
 </em>