[GRASS-SVN] r47185 - grass-addons/grass7/raster/r.threshold

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-07-20 04:14:53 -0700 (Wed, 20 Jul 2011)
New Revision: 47185

Modified:
   grass-addons/grass7/raster/r.threshold/r.threshold.py
Log:
r.threshold: use grass.warning() to print warnings
	     minor clean-up


Modified: grass-addons/grass7/raster/r.threshold/r.threshold.py
===================================================================
--- grass-addons/grass7/raster/r.threshold/r.threshold.py	2011-07-20 11:05:25 UTC (rev 47184)
+++ grass-addons/grass7/raster/r.threshold/r.threshold.py	2011-07-20 11:14:53 UTC (rev 47185)
@@ -4,72 +4,67 @@
 #
 # MODULE:       r.threshold.py
 #
-# AUTHOR(S):    Margherita Di Leo 
+# AUTHOR(S):    Margherita Di Leo <dileomargherita at gmail.com>
 #               
 # PURPOSE:      Find optimal threshold for stream extraction
 #
 # COPYRIGHT:    (c) 2011 by Margherita Di Leo and the GRASS Development Team
-#               dileomargherita at gmail.com
+#               
+#               This program is free software under the GNU General
+#               Public License (>=v2). Read the file COPYING that
+#               comes with GRASS for details.
 #
-#               This program is free software under the GNU General Public
-#               License (>=v2). Read the file COPYING that comes with GRASS
-#               for details.              
-#
 ################################################################################
+
 #%module
-#%  description: Find optimal threshold for stream extraction
-#%  keywords: raster
+#% description: Find optimal threshold for stream extraction
+#% keywords: raster
+#% keywords: hydrology
 #%end
 #%option
-#%  key: acc
-#%  type: string
-#%  gisprompt: old, raster, raster
-#%  key_desc: acc
-#%  description: Name of accumulation raster map 
-#%  required: yes
-#%END
+#% key: acc
+#% type: string
+#% gisprompt: old, raster, raster
+#% key_desc: acc
+#% description: Name of accumulation raster map 
+#% required: yes
+#%end
 
-
-import grass.script as grass
 import os, sys
 import math
 import numpy as np
 
-if not os.environ.has_key("GISBASE"):
-    sys.exit("You must be in GRASS GIS to run this program.")
+import grass.script as grass
 
 def main():
-
     stats = grass.read_command('r.stats', input = options['acc'], fs = 'space', nv = '*', nsteps = '1000', flags = 'Anc').split('\n')[:-1]
-
+    
     mappatella = np.zeros((len(stats),3),float)
     
-    ''' mappatella is a matrix, in the first column the value of upslope area is stored, 
-in the second the number of cells, in the third the distance from origin is calculated '''
- 
+    # mappatella is a matrix, in the first column the value of upslope area is stored, 
+    # in the second the number of cells, in the third the distance from origin is calculated
+    
     for i in range(len(stats)):
         mappatella[i,0],  mappatella[i,1] = map(float, stats[i].split(' '))
-
         # calculating distance from origin of each point; origin of the plot is in low left point 
-
         mappatella[i,2] = math.sqrt((mappatella[i,0]**2) + (mappatella[i,1]**2))
-
+    
     area = mappatella[:,0]
     num_cells = mappatella[:,1]
     distance = mappatella[:,2]
-
+    
     index = np.where(distance==min(distance))
     th = area[index]
-
+    
     if th < 0:
-        grass.message("Warning: Flow accumulation contains negative values")
+        grass.warning("Flow accumulation contains negative values")
     else:
         grass.message("Suggested threshold is %d" % th )
+    
+    grass.message("Done!")
+    
+    return 0
 
-    grass.message( 'Done!' )	 
-
 if __name__ == "__main__":
     options, flags = grass.parser()
     sys.exit(main())
-
-