[GRASS-SVN] r49639 - grass/branches/develbranch_6/gui/wxpython/mapdisp

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-12-09 04:15:41 -0800 (Fri, 09 Dec 2011)
New Revision: 49639

Modified:
   grass/branches/develbranch_6/gui/wxpython/mapdisp/frame.py
Log:
wxGUI: fix loading vdigit


Modified: grass/branches/develbranch_6/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/mapdisp/frame.py	2011-12-09 12:01:40 UTC (rev 49638)
+++ grass/branches/develbranch_6/gui/wxpython/mapdisp/frame.py	2011-12-09 12:15:41 UTC (rev 49639)
@@ -49,7 +49,6 @@
 from mapdisp.mapwindow  import BufferedWindow
 from modules.histogram  import HistogramFrame
 from wxplot.profile     import ProfileFrame
-from nviz.main          import haveNviz, GLWindow
 
 from mapdisp import statusbar as sb
 
@@ -186,7 +185,7 @@
     def _addToolbarVDigit(self):
         """!Add vector digitizer toolbar
         """
-        from vdigit import haveVDigit
+        from vdigit.main import haveVDigit
         
         if not haveVDigit:
             from vdigit import errorMsg
@@ -214,7 +213,7 @@
             log = None
         
         if not self.MapWindowVDigit:
-            from mapdisp_vdigit import VDigitWindow
+            from vdigit.mapwindow import VDigitWindow
             self.MapWindowVDigit = VDigitWindow(self, id = wx.ID_ANY,
                                                 Map = self.Map, tree = self.tree,
                                                 lmgr = self._layerManager)
@@ -253,6 +252,8 @@
     def AddNviz(self):
         """!Add 3D view mode window
         """
+        from nviz.main import haveNviz, GLWindow
+        
         # check for GLCanvas and OpenGL
         if not haveNviz:
             self.toolbars['map'].combo.SetValue(_("2D view"))