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

[svn_grass at osgeo.org]

Author: neteler
Date: 2012-09-07 16:55:43 -0700 (Fri, 07 Sep 2012)
New Revision: 53127

Modified:
   grass/trunk/gui/wxpython/scripts/vkrige.py
   grass/trunk/scripts/v.krige/v.krige.py
Log:
v.krige update (fixes bug #1619)

Modified: grass/trunk/gui/wxpython/scripts/vkrige.py
===================================================================
--- grass/trunk/gui/wxpython/scripts/vkrige.py	2012-09-07 22:31:39 UTC (rev 53126)
+++ grass/trunk/gui/wxpython/scripts/vkrige.py	2012-09-07 23:55:43 UTC (rev 53127)
@@ -37,9 +37,8 @@
 sys.path.append(GUIModulesPath)
 
 from core import globalvar
-import gui_core.gselect
-import gui_core.goutput
-import menuform
+from gui_core import gselect
+from gui_core import goutput
 from core.settings import UserSettings
 #import help
 

Modified: grass/trunk/scripts/v.krige/v.krige.py
===================================================================
--- grass/trunk/scripts/v.krige/v.krige.py	2012-09-07 22:31:39 UTC (rev 53126)
+++ grass/trunk/scripts/v.krige/v.krige.py	2012-09-07 23:55:43 UTC (rev 53127)
@@ -95,6 +95,10 @@
 import time
 import thread
 
+if __name__ == "__main__":
+    sys.path.append(os.path.join(os.getenv('GISBASE'), 'etc', 'gui', 'wxpython'))
+from core import globalvar
+
 if not os.environ.has_key("GISBASE"):
     print "You must be in GRASS GIS to run this program."
     sys.exit(1)
@@ -296,7 +300,6 @@
         importR()
         argv = sys.argv[1:] # stripping first item, the full name of this script
         # wxGUI call
-        import globalvar
         if not os.getenv("GRASS_WXBUNDLED"):
             globalvar.CheckForWx()
         import vkrige as GUI