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

[svn_grass at osgeo.org]

Author: annakrat
Date: 2011-10-12 09:46:01 -0700 (Wed, 12 Oct 2011)
New Revision: 48766

Modified:
   grass/trunk/gui/wxpython/gui_modules/gcpmapdisp.py
   grass/trunk/gui/wxpython/gui_modules/mapdisp.py
Log:
wxGUI: fix bug in georectifier caused by previous change (co-author V. Petras)

Modified: grass/trunk/gui/wxpython/gui_modules/gcpmapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/gcpmapdisp.py	2011-10-12 16:36:36 UTC (rev 48765)
+++ grass/trunk/gui/wxpython/gui_modules/gcpmapdisp.py	2011-10-12 16:46:01 UTC (rev 48766)
@@ -344,7 +344,7 @@
         Zoom in the map.
         Set mouse cursor, zoombox attributes, and zoom direction
         """
-        if self.toolbars['map']:
+        if self.GetToolbar('map'):
             self.toolbars['map'].OnTool(event)
             self.toolbars['map'].action['desc'] = ''
         
@@ -374,7 +374,7 @@
         Zoom out the map.
         Set mouse cursor, zoombox attributes, and zoom direction
         """
-        if self.toolbars['map']:
+        if self.GetToolbar('map'):
             self.toolbars['map'].OnTool(event)
             self.toolbars['map'].action['desc'] = ''
         
@@ -409,7 +409,7 @@
         """
         Panning, set mouse to drag
         """
-        if self.toolbars['map']:
+        if self.GetToolbar('map'):
             self.toolbars['map'].OnTool(event)
             self.toolbars['map'].action['desc'] = ''
         

Modified: grass/trunk/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2011-10-12 16:36:36 UTC (rev 48765)
+++ grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2011-10-12 16:46:01 UTC (rev 48766)
@@ -255,7 +255,10 @@
        raise NotImplementedError()
        
     def GetToolbar(self, name):
-        """!Returns toolbar if exists else None"""
+        """!Returns toolbar if exists else None.
+        
+        Toolbars dictionary contains currently used toolbars only.
+        """
         if name in self.toolbars:
             return self.toolbars[name]