[GRASS-SVN] r57163 - in grass/trunk: gui/wxpython/scripts scripts/v.krige

[svn_grass at osgeo.org]

Author: aghisla
Date: 2013-07-16 03:14:04 -0700 (Tue, 16 Jul 2013)
New Revision: 57163

Modified:
   grass/trunk/gui/wxpython/scripts/vkrige.py
   grass/trunk/scripts/v.krige/v.krige.py
Log:
Fixed the missing Formula parameter in doKriging function, and some other edits in GUI.

Modified: grass/trunk/gui/wxpython/scripts/vkrige.py
===================================================================
--- grass/trunk/gui/wxpython/scripts/vkrige.py	2013-07-15 21:58:07 UTC (rev 57162)
+++ grass/trunk/gui/wxpython/scripts/vkrige.py	2013-07-16 10:14:04 UTC (rev 57163)
@@ -175,7 +175,7 @@
         
     def CreatePage(self, package, Rinstance, controller):
         """ Creates the three notebook pages, one for each R package """
-        for package in ["gstat"]: 
+        for package in ["gstat"]: #@TODO add here other packages when they will be implemented
             classobj = eval("RBook"+package+"Panel")
             setattr(self, "RBook"+package+"Panel", (classobj(self,
                                                              id = wx.ID_ANY,
@@ -478,7 +478,7 @@
             self.predictor = 'x+y'
         else:
             self.predictor = '1'
-        print(type(str(column)))
+        
         self.controller.Variogram = self.controller.FitVariogram(robjects.Formula(str(column) + "~" + self.predictor),
                                                          self.controller.InputData,
                                                          model = self.model,
@@ -501,7 +501,7 @@
     def refresh(self):
         while True:
             rinterface.process_revents()
-            time.sleep(0.1)
+            time.sleep(0.2)
         
 class RBookgeoRPanel(RBookPanel):
     """ Subclass of RBookPanel, with specific geoR options and kriging functions. """

Modified: grass/trunk/scripts/v.krige/v.krige.py
===================================================================
--- grass/trunk/scripts/v.krige/v.krige.py	2013-07-15 21:58:07 UTC (rev 57162)
+++ grass/trunk/scripts/v.krige/v.krige.py	2013-07-16 10:14:04 UTC (rev 57163)
@@ -284,7 +284,7 @@
         logger.message(_("Variogram fitting complete."))
         
         logger.message(_("Kriging..."))
-        KrigingResult = self.DoKriging(Formula, self.InputData,
+        KrigingResult = self.DoKriging(robjects.Formula(column + "~" + self.predictor), self.InputData,
                  GridPredicted, self.Variogram['variogrammodel'], block) # using global ones
         logger.message(_("Kriging complete."))