浏览代码

wxGUI: fix modules with `main` fn

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@49470 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 13 年之前
父节点
当前提交
a7a3a5c00a

+ 0 - 9
gui/wxpython/core/debug.py

@@ -65,12 +65,3 @@ class DebugMsg:
 
 
 # Debug instance
 # Debug instance
 Debug = DebugMsg()
 Debug = DebugMsg()
-
-# testing
-if __name__ == "__main__":
-    from core import cmd as gcmd
-    gcmd.RunCommand('g.gisenv',
-                    set = 'DEBUG=3')
-                
-    for level in range (4):
-        Debug.msg (level, "message level=%d" % level)

+ 0 - 21
gui/wxpython/core/render.py

@@ -1429,24 +1429,3 @@ class Map(object):
         for layer in self.overlays:
         for layer in self.overlays:
             if force or layer.force_render:
             if force or layer.force_render:
                 layer.Render()
                 layer.Render()
-                
-if __name__ == "__main__":
-    import gettext
-    gettext.install('grasswxpy', os.path.join(os.getenv("GISBASE"), 'locale'), unicode = True)
-    
-    Map = Map()
-    Map.GetRegion(update = True)
-    
-    Map.AddLayer(type = "raster",
-                 name = "elevation",
-                 command = ["d.rast", "map=elevation@PERMANENT"],
-                 l_opacity = .7)
-    
-    Map.AddLayer(type = "vector",
-                 name = "roadsmajor",
-                 command = ["d.vect", "map=roadsmajor@PERMANENT", "color=red", "width=3", "type=line"])
-    
-    image = Map.Render(force = True)
-    
-    if image:
-        grass.call(["display", image])

+ 2 - 0
gui/wxpython/dbmgr/manager.py

@@ -37,6 +37,8 @@ import tempfile
 import copy
 import copy
 import types
 import types
 
 
+if __name__ == "__main__":
+    sys.path.append(os.path.join(os.getenv('GISBASE'), 'etc', 'gui', 'wxpython'))
 from core import globalvar
 from core import globalvar
 import wx
 import wx
 import wx.lib.mixins.listctrl as listmix
 import wx.lib.mixins.listctrl as listmix

+ 4 - 2
gui/wxpython/dbmgr/sqlbuilder.py

@@ -24,14 +24,16 @@ This program is free software under the GNU General Public License
 import os
 import os
 import sys
 import sys
 
 
+if __name__ == "__main__":
+    sys.path.append(os.path.join(os.getenv('GISBASE'), 'etc', 'gui', 'wxpython'))
 from core import globalvar
 from core import globalvar
 import wx
 import wx
 
 
-import grass.script as grass
-
 from core.gcmd   import RunCommand, GError
 from core.gcmd   import RunCommand, GError
 from dbmgr.vinfo import createDbInfoDesc, VectorDBInfo
 from dbmgr.vinfo import createDbInfoDesc, VectorDBInfo
 
 
+import grass.script as grass
+
 class SQLFrame(wx.Frame):
 class SQLFrame(wx.Frame):
     """!SQL Frame class"""
     """!SQL Frame class"""
     def __init__(self, parent, title, vectmap, id = wx.ID_ANY,
     def __init__(self, parent, title, vectmap, id = wx.ID_ANY,

+ 3 - 3
gui/wxpython/gmodeler/frame.py

@@ -32,14 +32,14 @@ import tempfile
 import copy
 import copy
 import re
 import re
 
 
+if __name__ == "__main__":
+    sys.path.append(os.path.join(os.getenv('GISBASE'), 'etc', 'gui', 'wxpython'))
+from core                 import globalvar
 import wx
 import wx
 from wx.lib import ogl
 from wx.lib import ogl
 import wx.lib.flatnotebook    as FN
 import wx.lib.flatnotebook    as FN
 import wx.lib.mixins.listctrl as listmix
 import wx.lib.mixins.listctrl as listmix
 
 
-if __name__ == "__main__":
-    sys.path.append(os.path.join(os.getenv('GISBASE'), 'etc', 'gui', 'wxpython'))
-from core                 import globalvar
 from gui_core.widgets     import GNotebook
 from gui_core.widgets     import GNotebook
 from gui_core.goutput     import GMConsole
 from gui_core.goutput     import GMConsole
 from core.debug           import Debug
 from core.debug           import Debug

+ 3 - 2
gui/wxpython/mapdisp/main.py

@@ -24,10 +24,11 @@ This program is free software under the GNU General Public License
 import os
 import os
 import sys
 import sys
 
 
+if __name__ == "__main__":
+    sys.path.append(os.path.join(os.getenv('GISBASE'), 'etc', 'gui', 'wxpython'))
+from core          import globalvar
 import wx
 import wx
 
 
-sys.path.append(os.path.join(os.getenv('GISBASE'), 'etc', 'gui', 'wxpython'))
-from core          import globalvar
 from core.gcmd     import RunCommand
 from core.gcmd     import RunCommand
 from core.render   import Map
 from core.render   import Map
 from mapdisp.frame import MapFrame
 from mapdisp.frame import MapFrame

+ 3 - 0
gui/wxpython/modules/mcalc_builder.py

@@ -17,7 +17,10 @@ This program is free software under the GNU General Public License
 """
 """
 
 
 import os
 import os
+import sys
 
 
+if __name__ == "__main__":
+    sys.path.append(os.path.join(os.getenv('GISBASE'), 'etc', 'gui', 'wxpython'))
 from core import globalvar
 from core import globalvar
 import wx
 import wx
 
 

+ 3 - 3
gui/wxpython/psmap/frame.py

@@ -26,6 +26,9 @@ try:
 except ImportError:
 except ImportError:
     havePILImage = False
     havePILImage = False
 
 
+if __name__ == "__main__":
+    sys.path.append(os.path.join(os.getenv('GISBASE'), 'etc', 'gui', 'wxpython'))
+from core             import globalvar
 import wx
 import wx
 
 
 try:
 try:
@@ -35,9 +38,6 @@ except ImportError:
 
 
 import grass.script as grass
 import grass.script as grass
 
 
-if __name__ == "__main__":
-    sys.path.append(os.path.join(os.getenv('GISBASE'), 'etc', 'gui', 'wxpython'))
-from core             import globalvar
 from gui_core.menu    import Menu
 from gui_core.menu    import Menu
 from gui_core.goutput import CmdThread, EVT_CMD_DONE
 from gui_core.goutput import CmdThread, EVT_CMD_DONE
 from psmap.toolbars   import PsMapToolbar
 from psmap.toolbars   import PsMapToolbar

+ 8 - 10
gui/wxpython/tools/update_menudata.py

@@ -30,7 +30,10 @@ except ImportError:
 from grass.script import core as grass
 from grass.script import core as grass
 from grass.script import task as gtask
 from grass.script import task as gtask
 
 
-from core.menudata import ManagerData
+if __name__ == "__main__":
+    sys.path.append(os.path.join(os.getenv('GISBASE'), 'etc', 'gui', 'wxpython'))
+from lmgr.menudata  import ManagerData
+from core.globalvar import grassCmd
 
 
 def parseModules():
 def parseModules():
     """!Parse modules' interface"""
     """!Parse modules' interface"""
@@ -42,9 +45,9 @@ def parseModules():
                 'g.parser',
                 'g.parser',
                 'vcolors' ]
                 'vcolors' ]
     
     
-    count = len(globalvar.grassCmd['all'])
+    count = len(grassCmd['all'])
     i = 0
     i = 0
-    for module in globalvar.grassCmd['all']:
+    for module in grassCmd['all']:
         i += 1
         i += 1
         if i % 10 == 0:
         if i % 10 == 0:
             grass.info('* %d/%d' % (i, count))
             grass.info('* %d/%d' % (i, count))
@@ -52,8 +55,8 @@ def parseModules():
             continue
             continue
         try:
         try:
             interface = gtask.parse_interface(module)
             interface = gtask.parse_interface(module)
-        except IOError, e:
-            grass.error(e)
+        except StandardError, e:
+            grass.error(module + ': ' + str(e))
             continue
             continue
         modules[interface.name] = { 'label'   : interface.label,
         modules[interface.name] = { 'label'   : interface.label,
                                     'desc'    : interface.description,
                                     'desc'    : interface.description,
@@ -170,9 +173,4 @@ if __name__ == '__main__':
     if os.getenv("GISBASE") is None:
     if os.getenv("GISBASE") is None:
         sys.exit("You must be in GRASS GIS to run this program.")
         sys.exit("You must be in GRASS GIS to run this program.")
     
     
-    sys.path.append(os.path.join(os.getenv("GISBASE"), 'etc', 'wxpython', 'gui_modules'))
-    import menudata
-    import menuform
-    from core import globalvar
-    
     sys.exit(main())
     sys.exit(main())