[GRASS-SVN] r32553 - grass/trunk/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: cmbarton
Date: 2008-08-06 02:15:01 -0400 (Wed, 06 Aug 2008)
New Revision: 32553

Modified:
   grass/trunk/gui/wxpython/gui_modules/toolbars.py
Log:
Changed GCPToolBar a little so that it can load more easily into GCP management window. Fixed a couple minor errors.

Modified: grass/trunk/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/toolbars.py	2008-08-06 05:51:13 UTC (rev 32552)
+++ grass/trunk/gui/wxpython/gui_modules/toolbars.py	2008-08-06 06:15:01 UTC (rev 32553)
@@ -222,7 +222,7 @@
 
 class GRToolbar(AbstractToolbar):
     """
-    Georectify Display toolbar
+    Georectification Display toolbar
     """
 
     def __init__(self, mapdisplay, map):
@@ -282,23 +282,23 @@
             (self.zoommenu, "zoommenu", Icons["zoommenu"].GetBitmap(),
              wx.ITEM_NORMAL, Icons["zoommenu"].GetLabel(), Icons["zoommenu"].GetDesc(),
              self.mapdisplay.OnZoomMenu),
+            ("", "", "", "", "", "", ""),
             )
 
 class GCPToolbar(AbstractToolbar):
     """
-    Toolbar for digitization
+    Toolbar for managing ground control points during georectification
     """
-    def __init__(self, parent, mapdisplay, map):
-        self.parent     = parent # GCP
-        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()
@@ -377,7 +377,7 @@
         self.numOfRows = 1 # number of rows for toolbar
         for row in range(0, self.numOfRows):
             self.toolbar.append(wx.ToolBar(parent=self.parent, id=wx.ID_ANY))
-	    self.toolbar[row].SetToolBitmapSize(globalvar.toolbarSize)
+            self.toolbar[row].SetToolBitmapSize(globalvar.toolbarSize)
             self.toolbar[row].Bind(wx.EVT_TOOL, self.OnTool)
             
             # create toolbar