[GRASS-SVN] r50527 - grass/trunk/gui/wxpython/iclass

[svn_grass at osgeo.org]

Author: annakrat
Date: 2012-01-28 09:46:58 -0800 (Sat, 28 Jan 2012)
New Revision: 50527

Modified:
   grass/trunk/gui/wxpython/iclass/dialogs.py
   grass/trunk/gui/wxpython/iclass/frame.py
   grass/trunk/gui/wxpython/iclass/toolbars.py
Log:
wxGUI/wxIClass: remove redundant code, fix zoom back tool

Modified: grass/trunk/gui/wxpython/iclass/dialogs.py
===================================================================
--- grass/trunk/gui/wxpython/iclass/dialogs.py	2012-01-28 12:38:18 UTC (rev 50526)
+++ grass/trunk/gui/wxpython/iclass/dialogs.py	2012-01-28 17:46:58 UTC (rev 50527)
@@ -1,5 +1,5 @@
 """!
- at package iclass::toolbars
+ at package iclass::dialogs
 
 @brief wxIClass dialogs
 
@@ -93,13 +93,6 @@
         
         self.element = gselect.Select(parent = self.panel, type = 'raster',
                                       size = globalvar.DIALOG_GSELECT_SIZE)
-        #self.firstMapCheck = wx.CheckBox(parent = self.panel, id = wx.ID_ANY,
-                                         #label = _("Add raster map to Training display"))
-        #self.secondMapCheck = wx.CheckBox(parent = self.panel, id = wx.ID_ANY,
-                                         #label = _("Add raster map to Preview display"))
-        # in user settings
-        #self.firstMapCheck.SetValue(True)
-        #self.secondMapCheck.SetValue(True)
         
         self.PostInit()
         
@@ -110,10 +103,7 @@
         """!Do layout"""
         self.dataSizer.Add(self.element, proportion = 0,
                       flag = wx.EXPAND | wx.ALL, border = 5)
-        #self.dataSizer.Add(self.firstMapCheck, proportion = 0,
-                      #flag = wx.ALL, border = 5)
-        #self.dataSizer.Add(self.secondMapCheck, proportion = 0,
-                      #flag = wx.ALL, border = 5)
+        
         self.panel.SetSizer(self.sizer)
         self.sizer.Fit(self)
 
@@ -121,13 +111,7 @@
         """!Returns selected raster map"""
         return self.GetElement()
         
-    #def IfAddToFirstMap(self):
-        #return self.firstMapCheck.IsChecked()
         
-    #def IfAddToSecondMap(self):
-        #return self.secondMapCheck.IsChecked()
-        
-        
 class IClassCategoryManagerDialog(wx.Dialog):
     """!Dialog for managing categories (classes).
     

Modified: grass/trunk/gui/wxpython/iclass/frame.py
===================================================================
--- grass/trunk/gui/wxpython/iclass/frame.py	2012-01-28 12:38:18 UTC (rev 50526)
+++ grass/trunk/gui/wxpython/iclass/frame.py	2012-01-28 17:46:58 UTC (rev 50527)
@@ -53,7 +53,7 @@
                                IClassToolbar, IClassMapManagerToolbar
 from iclass.statistics  import Statistics, BandStatistics
 from iclass.dialogs     import CategoryListCtrl, IClassCategoryManagerDialog,\
-                               IClassGroupDialog, IClassMapDialog, IClassSignatureFileDialog
+                               IClassGroupDialog, IClassSignatureFileDialog
 from iclass.plots       import PlotPanel
         
 class IClassMapFrame(DoubleMapFrame):
@@ -352,7 +352,7 @@
         """
         mapTb = self.GetMapToolbar()
         # optionally disable tool zoomback tool
-        mapTb.Enable('zoomback', enable = (len(self.MapWindow.zoomhistory) > 1))
+        mapTb.Enable('zoomBack', enable = (len(self.MapWindow.zoomhistory) > 1))
 
         if mapTb.GetActiveMap() != (win == self.secondMapWindow):
             mapTb.SetActiveMap((win == self.secondMapWindow))

Modified: grass/trunk/gui/wxpython/iclass/toolbars.py
===================================================================
--- grass/trunk/gui/wxpython/iclass/toolbars.py	2012-01-28 12:38:18 UTC (rev 50526)
+++ grass/trunk/gui/wxpython/iclass/toolbars.py	2012-01-28 17:46:58 UTC (rev 50527)
@@ -72,7 +72,7 @@
         
         self.OnTool(None)
         
-        self.EnableTool(self.zoomback, False)
+        self.EnableTool(self.zoomBack, False)
         
     def GetActiveMapTool(self):
         """!Return widget for selecting active maps"""
@@ -99,18 +99,18 @@
                                      ("pan", icons["pan"],
                                       self.parent.OnPan,
                                       wx.ITEM_CHECK),
-                                     ("zoomin", icons["zoomIn"],
+                                     ("zoomIn", icons["zoomIn"],
                                       self.parent.OnZoomIn,
                                       wx.ITEM_CHECK),
-                                     ("zoomout", icons["zoomOut"],
+                                     ("zoomOut", icons["zoomOut"],
                                       self.parent.OnZoomOut,
                                       wx.ITEM_CHECK),
-                                     ("zoommenu", icons["zoomMenu"],
+                                     ("zoomMenu", icons["zoomMenu"],
                                       self.parent.OnZoomMenu),
                                      (None, ),
-                                     ("zoomback", icons["zoomBack"],
+                                     ("zoomBack", icons["zoomBack"],
                                       self.parent.OnZoomBack),
-                                     ("zoomtomap", icons["zoomExtent"],
+                                     ("zoomToMap", icons["zoomExtent"],
                                       self.parent.OnZoomToMap),
                                     ))
 class IClassToolbar(BaseToolbar):