[GRASS-SVN] r49366 - in grass/trunk/gui/wxpython: gui_core mapdisp nviz

[svn_grass at osgeo.org]

Author: annakrat
Date: 2011-11-26 10:00:33 -0800 (Sat, 26 Nov 2011)
New Revision: 49366

Modified:
   grass/trunk/gui/wxpython/gui_core/widgets.py
   grass/trunk/gui/wxpython/mapdisp/frame.py
   grass/trunk/gui/wxpython/nviz/tools.py
   grass/trunk/gui/wxpython/nviz/workspace.py
Log:
wxGUI major code reorganization (wxnviz)

Modified: grass/trunk/gui/wxpython/gui_core/widgets.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/widgets.py	2011-11-26 17:45:42 UTC (rev 49365)
+++ grass/trunk/gui/wxpython/gui_core/widgets.py	2011-11-26 18:00:33 UTC (rev 49366)
@@ -40,6 +40,7 @@
     import wx.lib.customtreectrl as CT
 
 from core import globalvar
+from core.debug         import Debug
 
 class GNotebook(FN.FlatNotebook):
     """!Generic notebook widget

Modified: grass/trunk/gui/wxpython/mapdisp/frame.py
===================================================================
--- grass/trunk/gui/wxpython/mapdisp/frame.py	2011-11-26 17:45:42 UTC (rev 49365)
+++ grass/trunk/gui/wxpython/mapdisp/frame.py	2011-11-26 18:00:33 UTC (rev 49366)
@@ -55,6 +55,8 @@
 from wxplot.histogram   import Histogram2Frame
 from wxplot.profile     import ProfileFrame
 from wxplot.scatter     import ScatterFrame
+from nviz.main          import haveNviz
+from nviz.mapwindow     import GLWindow
 
 from mapdisp import statusbar as sb
 
@@ -269,7 +271,7 @@
         import nviz
         
         # check for GLCanvas and OpenGL
-        if not nviz.haveNviz:
+        if not haveNviz:
             self.toolbars['map'].combo.SetValue(_("2D view"))
             GError(parent = self,
                    message = _("Unable to switch to 3D display mode.\nThe Nviz python extension "
@@ -303,7 +305,7 @@
         
         # create GL window
         if not self.MapWindow3D:
-            self.MapWindow3D = nviz.GLWindow(self, id = wx.ID_ANY,
+            self.MapWindow3D = GLWindow(self, id = wx.ID_ANY,
                                              Map = self.Map, tree = self.tree, lmgr = self._layerManager)
             self.MapWindow = self.MapWindow3D
             self.MapWindow.SetCursor(self.cursors["default"])

Modified: grass/trunk/gui/wxpython/nviz/tools.py
===================================================================
--- grass/trunk/gui/wxpython/nviz/tools.py	2011-11-26 17:45:42 UTC (rev 49365)
+++ grass/trunk/gui/wxpython/nviz/tools.py	2011-11-26 18:00:33 UTC (rev 49366)
@@ -49,9 +49,10 @@
 from core.settings      import UserSettings
 from nviz.animation     import EVT_ANIM_FIN, EVT_ANIM_UPDATE_IDX
 from gui_core.widgets   import ScrolledPanel, NumTextCtrl, FloatSlider, SymbolButton
+from gui_core.gselect   import Select
 from core.debug         import Debug
 try:
-    from nviz.mapwindow import wxUpdateProperties
+    from nviz.mapwindow import wxUpdateProperties, wxUpdateView, wxUpdateLight
     import wxnviz
 except ImportError:
     pass

Modified: grass/trunk/gui/wxpython/nviz/workspace.py
===================================================================
--- grass/trunk/gui/wxpython/nviz/workspace.py	2011-11-26 17:45:42 UTC (rev 49365)
+++ grass/trunk/gui/wxpython/nviz/workspace.py	2011-11-26 18:00:33 UTC (rev 49366)
@@ -18,7 +18,7 @@
 from core.settings import UserSettings
 
 try:
-    import nviz.wxcore as wxnviz
+    import nviz.wxnviz as wxnviz
 except ImportError:
     wxnviz = None