[GRASS-SVN] r42135 - in grass/branches/releasebranch_6_4: gui/wxpython scripts/v.rast.stats

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-05-05 19:33:37 -0400 (Wed, 05 May 2010)
New Revision: 42135

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gis_set.py
   grass/branches/releasebranch_6_4/scripts/v.rast.stats/v.rast.stats
Log:
bugfix #1050
(merge r42133 from devbr6)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gis_set.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gis_set.py	2010-05-05 23:31:23 UTC (rev 42134)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gis_set.py	2010-05-05 23:33:37 UTC (rev 42135)
@@ -423,19 +423,20 @@
             self.lbmapsets.SetSelection(0)
 
     def OnManageLoc(self, event):
+        """!Location management choice control handler
         """
-        Location management choice control handler
-        """
-
-        if event.GetString() == 'Rename mapset':
+        sel = event.GetSelection()
+        if sel == 0:
             self.RenameMapset()
-        elif event.GetString() == 'Rename location':
+        elif sel == 1:
             self.RenameLocation()
-        elif event.GetString() == 'Delete mapset':
+        elif sel == 2:
             self.DeleteMapset()
-        elif event.GetString() == 'Delete location':
+        elif sel == 3:
             self.DeleteLocation()
-
+        
+        event.Skip()
+        
     def RenameMapset(self):
         """!Rename selected mapset
         """

Modified: grass/branches/releasebranch_6_4/scripts/v.rast.stats/v.rast.stats
===================================================================
--- grass/branches/releasebranch_6_4/scripts/v.rast.stats/v.rast.stats	2010-05-05 23:31:23 UTC (rev 42134)
+++ grass/branches/releasebranch_6_4/scripts/v.rast.stats/v.rast.stats	2010-05-05 23:33:37 UTC (rev 42135)
@@ -16,7 +16,7 @@
 #############################################################################
 
 #%Module
-#%  description: Calculates univariate statistics from a GRASS raster map based on vector polygons and uploads statistics to new attribute columns.
+#%  description: Calculates univariate statistics from a raster map based on vector polygons and uploads statistics to new attribute columns.
 #%  keywords: vector, raster, statistics
 #%End
 #%flag
@@ -38,7 +38,8 @@
 #%option
 #% key: layer
 #% type: integer
-#% description: Layer to which the table to be changed is connected
+#% label: Layer number
+#% description: A single vector map can be connected to multiple database tables. This number determines which table to use
 #% answer: 1
 #% required : no
 #%end
@@ -263,7 +264,7 @@
   fi
 done
 
-g.message -v "Adding columns <$ADDCOLS>"
+g.message -v "Adding columns '$ADDCOLS'"
 v.db.addcol map="$VECTOR" columns="$ADDCOLS"
 if [ $? -ne 0 ] ; then
    g.message -e "Cannot continue (problem adding columns)."
@@ -273,7 +274,7 @@
 
 
 #loop over cats and calculate statistics:
-g.message -v "Processing data ..."
+g.message "Processing data ($NUMBER categories)..."
 CURRNUM=1
 # get rid of any earlier attempts
 rm -f "$SQLTMP"
@@ -318,7 +319,7 @@
 done
 
 
-g.message -v "Updating the database ..."
+g.message "Updating the database ..."
 db.execute input="$SQLTMP" database="${DB_DATABASE}" driver="$DB_SQLDRIVER"
 EXITCODE=$?