[GRASS-SVN] r46661 - in grass/trunk/gui/wxpython: . gui_modules

[svn_grass at osgeo.org]

Author: annakrat
Date: 2011-06-10 10:32:19 -0700 (Fri, 10 Jun 2011)
New Revision: 46661

Modified:
   grass/trunk/gui/wxpython/gui_modules/mapdisp.py
   grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py
   grass/trunk/gui/wxpython/gui_modules/nviz_tools.py
   grass/trunk/gui/wxpython/wxgui.py
Log:
wxNviz: wx debug messages added

Modified: grass/trunk/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2011-06-10 16:21:24 UTC (rev 46660)
+++ grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2011-06-10 17:32:19 UTC (rev 46661)
@@ -356,7 +356,7 @@
         """!Add 3D view mode toolbar
         """
         import nviz
-        
+        Debug.msg(5, "MapFrame._addToolbarNviz(): begin")
         # check for GLCanvas and OpenGL
         if not nviz.haveNviz:
             self.toolbars['map'].combo.SetValue(_("2D view"))
@@ -388,6 +388,7 @@
         
         # create GL window & NVIZ toolbar
         if not self.MapWindow3D:
+            Debug.msg(5, "MapFrame._addToolbarNviz(): GLWindow will be created")
             self.MapWindow3D = nviz.GLWindow(self, id = wx.ID_ANY,
                                              Map = self.Map, tree = self.tree, lmgr = self._layerManager)
             self.MapWindow = self.MapWindow3D
@@ -424,6 +425,7 @@
                           CloseButton(False).Layer(2))
         
         self.SetStatusText("", 0)
+        Debug.msg(5, "MapFrame._addToolbarNviz(): end")
         
     def AddToolbar(self, name):
         """!Add defined toolbar to the window

Modified: grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py	2011-06-10 16:21:24 UTC (rev 46660)
+++ grass/trunk/gui/wxpython/gui_modules/nviz_mapdisp.py	2011-06-10 17:32:19 UTC (rev 46661)
@@ -50,7 +50,7 @@
 class NvizThread(Thread):
     def __init__(self, log, progressbar, window):
         Thread.__init__(self)
-        
+        Debug.msg(5, "NvizThread.__init__():")
         self.log = log
         self.progressbar = progressbar
         self.window = window
@@ -71,7 +71,7 @@
     def __init__(self, parent, id = wx.ID_ANY,
                  Map = None, tree = None, lmgr = None):
         self.parent = parent # MapFrame
-        
+        Debug.msg(5, "GLCanvas.__init__(): begin")
         glcanvas.GLCanvas.__init__(self, parent, id)
         MapWindow.__init__(self, parent, id, 
                            Map, tree, lmgr)
@@ -155,6 +155,7 @@
         
         self.Bind(wx.EVT_CLOSE, self.OnClose)
         
+        Debug.msg(5, "GLCanvas.__init__(): end")
         #cplanes cannot be initialized now
         wx.CallAfter(self.InitCPlanes)
         

Modified: grass/trunk/gui/wxpython/gui_modules/nviz_tools.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/nviz_tools.py	2011-06-10 16:21:24 UTC (rev 46660)
+++ grass/trunk/gui/wxpython/gui_modules/nviz_tools.py	2011-06-10 17:32:19 UTC (rev 46661)
@@ -116,6 +116,7 @@
     def __init__(self, parent, display, id = wx.ID_ANY,
                  style = globalvar.FNPageStyle|FN.FNB_NO_X_BUTTON|FN.FNB_NO_NAV_BUTTONS,
                  **kwargs):
+        Debug.msg(5, "NvizToolWindow.__init__()")
         self.parent     = parent # GMFrame
         self.mapDisplay = display
         self.mapWindow  = display.GetWindow()

Modified: grass/trunk/gui/wxpython/wxgui.py
===================================================================
--- grass/trunk/gui/wxpython/wxgui.py	2011-06-10 16:21:24 UTC (rev 46660)
+++ grass/trunk/gui/wxpython/wxgui.py	2011-06-10 17:32:19 UTC (rev 46661)
@@ -277,11 +277,13 @@
             
     def AddNviz(self):
         """!Add nviz notebook page"""
+        Debug.msg(5, "GMFrame.AddNviz(): begin")
         self.nviz = nviz_tools.NvizToolWindow(parent = self,
                                               display = self.curr_page.maptree.GetMapDisplay())
         self.notebook.AddPage(page = self.nviz, text = _("3D view"), name = 'nviz')
         self.notebook.SetSelectionByName('nviz')
         self.existNviz = True
+        Debug.msg(5, "GMFrame.AddNviz(): end")
         
     def RemoveNviz(self):
         """!Remove nviz notebook page"""