[GRASS-SVN] r49891 - in grass/branches/develbranch_6/gui/wxpython: lmgr modules

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Dec 24 11:49:38 EST 2011


Author: martinl
Date: 2011-12-24 08:49:38 -0800 (Sat, 24 Dec 2011)
New Revision: 49891

Modified:
   grass/branches/develbranch_6/gui/wxpython/lmgr/frame.py
   grass/branches/develbranch_6/gui/wxpython/modules/vclean.py
Log:
wxGUI: OnVectorCleaning(): don't call self.Show() twice
       (merge r49890 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/lmgr/frame.py	2011-12-24 16:48:08 UTC (rev 49890)
+++ grass/branches/develbranch_6/gui/wxpython/lmgr/frame.py	2011-12-24 16:49:38 UTC (rev 49891)
@@ -54,7 +54,6 @@
 from gui_core.menu         import Menu
 from gmodeler.model        import Model
 from gmodeler.frame        import ModelFrame
-from modules.vclean        import VectorCleaningFrame
 from psmap.frame           import PsMapFrame
 from core.debug            import Debug
 from gui_core.ghelp        import MenuTreeWindow, AboutWindow
@@ -1190,6 +1189,7 @@
     def OnVectorCleaning(self, event, cmd = ''):
         """!Init interactive vector cleaning
         """
+        from modules.vclean import VectorCleaningFrame
         win = VectorCleaningFrame(parent = self)
         win.CentreOnScreen()
         win.Show()

Modified: grass/branches/develbranch_6/gui/wxpython/modules/vclean.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/modules/vclean.py	2011-12-24 16:48:08 UTC (rev 49890)
+++ grass/branches/develbranch_6/gui/wxpython/modules/vclean.py	2011-12-24 16:49:38 UTC (rev 49891)
@@ -169,15 +169,14 @@
         self.btn_remove.Bind(wx.EVT_BUTTON, self.OnClearTool)
         self.btn_moveup.Bind(wx.EVT_BUTTON, self.OnMoveToolUp)
         self.btn_movedown.Bind(wx.EVT_BUTTON, self.OnMoveToolDown)
-
+        
         # layout
         self._layout()
-
+        
         self.SetMinSize(self.GetBestSize())
         
         self.CentreOnScreen()
-        self.Show()
-        
+                
     def _layout(self):
         sizer = wx.BoxSizer(wx.VERTICAL)
         



More information about the grass-commit mailing list