浏览代码

wxGUI: avoid creating Map() instance twice

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63435 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 10 年之前
父节点
当前提交
b4721ee0f5
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 1 0
      gui/wxpython/core/render.py
  2. 2 2
      gui/wxpython/mapdisp/frame.py

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

@@ -389,6 +389,7 @@ class Map(object):
 
 
         :param gisrc: alternative gisrc (used eg. by georectifier)
         :param gisrc: alternative gisrc (used eg. by georectifier)
         """
         """
+        Debug.msg (1, "Map.__init__(): %s" % gisrc)
         # region/extent settigns
         # region/extent settigns
         self.wind      = dict() # WIND settings (wind file)
         self.wind      = dict() # WIND settings (wind file)
         self.region    = dict() # region settings (g.region)
         self.region    = dict() # region settings (g.region)

+ 2 - 2
gui/wxpython/mapdisp/frame.py

@@ -68,7 +68,7 @@ class MapFrame(SingleMapFrame):
     """
     """
     def __init__(self, parent, giface, title = _("GRASS GIS - Map display"),
     def __init__(self, parent, giface, title = _("GRASS GIS - Map display"),
                  toolbars = ["map"], tree = None, notebook = None, lmgr = None,
                  toolbars = ["map"], tree = None, notebook = None, lmgr = None,
-                 page = None, Map = Map(), auimgr = None, name = 'MapWindow', **kwargs):
+                 page = None, Map = None, auimgr = None, name = 'MapWindow', **kwargs):
         """Main map display window with toolbars, statusbar and
         """Main map display window with toolbars, statusbar and
         2D map window, 3D map window and digitizer.
         2D map window, 3D map window and digitizer.
         
         
@@ -83,7 +83,7 @@ class MapFrame(SingleMapFrame):
         :param kwargs: wx.Frame attributes
         :param kwargs: wx.Frame attributes
         """
         """
         SingleMapFrame.__init__(self, parent = parent, title = title,
         SingleMapFrame.__init__(self, parent = parent, title = title,
-                              Map = Map, auimgr = auimgr, name = name, **kwargs)
+                                Map = Map, auimgr = auimgr, name = name, **kwargs)
         
         
         self._giface = giface
         self._giface = giface
         # Layer Manager object
         # Layer Manager object