Explorar o código

move vkrige from scripts to modules
(merge r60066-68 from trunk)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@60120 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa %!s(int64=11) %!d(string=hai) anos
pai
achega
d7f3afaac7
Modificáronse 2 ficheiros con 2 adicións e 11 borrados
  1. 0 0
      gui/wxpython/modules/vkrige.py
  2. 2 11
      scripts/v.krige/v.krige.py

gui/wxpython/scripts/vkrige.py → gui/wxpython/modules/vkrige.py


+ 2 - 11
scripts/v.krige/v.krige.py

@@ -8,7 +8,7 @@ PURPOSE:   Performs ordinary or block kriging
 
 DEPENDS:   R 2.x, packages gstat, maptools and spgrass6, optional: automap
 
-COPYRIGHT: (C) 2009, 2012 by the GRASS Development Team
+COPYRIGHT: (C) 2009-2014 the GRASS Development Team
 
 This program is free software under the GNU General Public
 License (>=v2). Read the file COPYING that comes with GRASS
@@ -95,19 +95,10 @@ from tempfile import gettempdir
 import time
 import thread
 
-if __name__ == "__main__":
-    sys.path.append(os.path.join(os.getenv('GISBASE'), 'etc', 'gui', 'wxpython'))
-
 if not os.environ.has_key("GISBASE"):
     print "You must be in GRASS GIS to run this program."
     sys.exit(1)
 
-GUIModulesPath = os.path.join(os.getenv("GISBASE"), "etc", "gui", "wxpython")
-sys.path.append(GUIModulesPath)
-
-GUIPath = os.path.join(os.getenv("GISBASE"), "etc", "gui", "wxpython", "scripts")
-sys.path.append(GUIPath)
-
 ### i18N
 import gettext
 gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
@@ -314,7 +305,7 @@ def main(argv = None):
         if not os.getenv("GRASS_WXBUNDLED"):
             from core import globalvar
             globalvar.CheckForWx()
-        import vkrige as GUI
+        from modules import vkrige as GUI
         
         import wx