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

[svn_grass at osgeo.org]

Author: cmbarton
Date: 2008-08-27 02:03:01 -0400 (Wed, 27 Aug 2008)
New Revision: 33107

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/profile.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
Log:
Moved profile toolbar back to profile window. All buttons except transect pertain to items in profile window, not map display window.

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/profile.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/profile.py	2008-08-27 06:02:00 UTC (rev 33106)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/profile.py	2008-08-27 06:03:01 UTC (rev 33107)
@@ -89,8 +89,8 @@
         #
         # Add toolbar
         #
-        toolbar = toolbars.ProfileToolbar(parent=self, mapdisplay=self.mapwin, map=self.Map).GetToolbar()
-        self.SetToolBar(toolbar)
+        self.toolbar = toolbars.ProfileToolbar(parent=self, tbframe=self).GetToolbar()
+        self.SetToolBar(self.toolbar)
         
         #
         # Set the size & cursor

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py	2008-08-27 06:02:00 UTC (rev 33106)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/toolbars.py	2008-08-27 06:03:01 UTC (rev 33107)
@@ -1100,18 +1100,17 @@
 class ProfileToolbar(AbstractToolbar):
     """
     Toolbar for profiling raster map
-    """
-    def __init__(self, parent, mapdisplay, map):
-        self.parent     = parent
-        self.mapcontent = map
-        self.mapdisplay = mapdisplay
+    """ 
+    def __init__(self, parent, tbframe):
+        self.parent  = parent # GCP
+        self.tbframe = tbframe
 
-        self.toolbar = wx.ToolBar(parent=self.mapdisplay, id=wx.ID_ANY)
+        self.toolbar = wx.ToolBar(parent=self.tbframe, id=wx.ID_ANY)
 
         # self.SetToolBar(self.toolbar)
         self.toolbar.SetToolBitmapSize(globalvar.toolbarSize)
 
-        self.InitToolbar(self.mapdisplay, self.toolbar, self.ToolbarData())
+        self.InitToolbar(self.tbframe, self.toolbar, self.ToolbarData())
 
         # realize the toolbar
         self.toolbar.Realize()