[GRASS-SVN] r41733 - grass/branches/develbranch_6/scripts/v.krige

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-04-05 12:05:29 -0400 (Mon, 05 Apr 2010)
New Revision: 41733

Modified:
   grass/branches/develbranch_6/scripts/v.krige/v.krige.py
Log:
v.krige: don't use Region global variable
(merge r41732 from trunk)


Modified: grass/branches/develbranch_6/scripts/v.krige/v.krige.py
===================================================================
--- grass/branches/develbranch_6/scripts/v.krige/v.krige.py	2010-04-05 15:51:25 UTC (rev 41732)
+++ grass/branches/develbranch_6/scripts/v.krige/v.krige.py	2010-04-05 16:05:29 UTC (rev 41733)
@@ -171,6 +171,7 @@
         return Rpointmap
     
     def CreateGrid(self, inputdata):
+        Region = grass.region()
         Grid = robjects.r.gmeta2grd()
 
         # addition of coordinates columns into dataframe.
@@ -247,7 +248,8 @@
     def Run(self, input, column, output, package, sill, nugget, range, logger, \
             overwrite, model, block, output_var, command, **kwargs):
         """ Wrapper for all functions above. """
-        logger.message(_("Processing %d cells. Computing time raises exponentially with resolution." % Region['cells']))
+        logger.message(_("Processing %d cells. Computing time raises "
+                         "exponentially with resolution." % grass.region()['cells']))
         logger.message(_("Importing data..."))
         if globals()["InputData"] is None:
             globals()["InputData"] = self.ImportMap(input, column)
@@ -410,5 +412,4 @@
     if len(sys.argv) > 1:
         sys.exit(main(argv = grass.parser()))
     else:
-        Region = grass.region()
         main()