Fixed the missing Formula parameter in doKriging function, and some other edits in GUI.

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@57163 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/scripts/vkrige.py

@@ -175,7 +175,7 @@ class KrigingPanel(wx.Panel):
         
     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 @@ class RBookgstatPanel(RBookPanel):
             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 @@ class RBookgstatPanel(RBookPanel):
     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. """

scripts/v.krige/v.krige.py

@@ -284,7 +284,7 @@ class Controller:
         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."))