[GRASS-SVN] r32117 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-07-15 01:53:52 -0400 (Tue, 15 Jul 2008)
New Revision: 32117

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
Log:
wxGUI: removed accidently backported code from trunk, r32113

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py	2008-07-15 05:52:37 UTC (rev 32116)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py	2008-07-15 05:53:52 UTC (rev 32117)
@@ -8,7 +8,6 @@
     * GCPToolbar
     * VDigitToolbar
     * ProfileToolbar
-    * NvizToolbar
 
 PURPOSE: Toolbars for Map Display window
 
@@ -112,7 +111,7 @@
         
         # optional tools
         self.combo = wx.ComboBox(parent=self.toolbar, id=wx.ID_ANY, value='Tools',
-                                 choices=['Digitize', 'Nviz'], style=wx.CB_READONLY, size=(90, -1))
+                                 choices=['Digitize'], style=wx.CB_READONLY, size=(90, -1))
 
         self.comboid = self.toolbar.AddControl(self.combo)
         self.mapdisplay.Bind(wx.EVT_COMBOBOX, self.OnSelectTool, self.comboid)
@@ -202,24 +201,6 @@
         if tool == "Digitize" and not self.mapdisplay.toolbars['vdigit']:
             self.mapdisplay.AddToolbar("vdigit")
 
-        elif tool == "Nviz" and not self.mapdisplay.toolbars['nviz']:
-            self.mapdisplay.AddToolbar("nviz")
-
-    def Enable2D(self, enabled):
-        """Enable/Disable 2D display mode specific tools"""
-        for tool in (self.pointer,
-                     self.query,
-                     self.pan,
-                     self.zoomin,
-                     self.zoomout,
-                     self.zoomback,
-                     self.zoommenu,
-                     self.analyze,
-                     self.dec,
-                     self.savefile,
-                     self.printmap):
-            self.toolbar.EnableTool(tool, enabled)
-
 class GRToolbar(AbstractToolbar):
     """
     Georectify Display toolbar
@@ -1015,51 +996,3 @@
              wx.ITEM_NORMAL, Icons["quit"].GetLabel(), Icons["quit"].GetDesc(),
              self.parent.OnQuit),
             )
-
-class NvizToolbar(AbstractToolbar):
-    """
-    Nviz toolbar
-    """
-    def __init__(self, parent, map):
-        self.parent     = parent
-        self.mapcontent = map
-
-        self.toolbar = wx.ToolBar(parent=self.parent, id=wx.ID_ANY)
-
-        # self.SetToolBar(self.toolbar)
-        self.toolbar.SetToolBitmapSize(globalvar.toolbarSize)
-
-        self.InitToolbar(self.parent, self.toolbar, self.ToolbarData())
-
-        # realize the toolbar
-        self.toolbar.Realize()
-
-    def ToolbarData(self):
-        """Toolbar data"""
-
-        self.settings = wx.NewId()
-        self.quit = wx.NewId()
-                
-        # tool, label, bitmap, kind, shortHelp, longHelp, handler
-        return   (
-            (self.settings, "settings", Icons["nvizSettings"].GetBitmap(),
-             wx.ITEM_NORMAL, Icons["nvizSettings"].GetLabel(), Icons["nvizSettings"].GetDesc(),
-             self.OnSettings),
-            (self.quit, 'quit', Icons["quit"].GetBitmap(),
-             wx.ITEM_NORMAL, Icons["quit"].GetLabel(), Icons["quit"].GetDesc(),
-             self.OnExit),
-            )
-
-    def OnSettings(self, event):
-        win = self.parent.nvizToolWin
-        if not win.IsShown():
-            self.parent.nvizToolWin.Show()
-        else:
-            self.parent.nvizToolWin.Hide()
-
-    def OnExit (self, event=None):
-        """Quit nviz tool (swith to 2D mode)"""
-
-        # disable the toolbar
-        self.parent.RemoveToolbar ("nviz")
-