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

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-02-23 19:46:41 -0500 (Sat, 23 Feb 2008)
New Revision: 30314

Modified:
   grass/trunk/gui/wxpython/gui_modules/dbm.py
   grass/trunk/gui/wxpython/gui_modules/digit.py
   grass/trunk/gui/wxpython/gui_modules/mapdisp.py
   grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py
Log:
wxGUI: Fix calling OnRender (fn renamed)

Modified: grass/trunk/gui/wxpython/gui_modules/dbm.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/dbm.py	2008-02-24 00:39:39 UTC (rev 30313)
+++ grass/trunk/gui/wxpython/gui_modules/dbm.py	2008-02-24 00:46:41 UTC (rev 30314)
@@ -481,12 +481,6 @@
         self.SetSize((680, 520))
         self.SetMinSize(self.GetSize())
 
-    def __del__(self):
-        pass
-        #         if self.qlayer and self.map:
-        #             self.map.DeleteLayer(self.qlayer)
-        #             self.mapdisplay.ReRender(None)
-
     def __createBrowsePage(self, onlyLayer=-1):
         """Create browse tab page"""
         for layer in self.mapDBInfo.layers.keys():

Modified: grass/trunk/gui/wxpython/gui_modules/digit.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/digit.py	2008-02-24 00:39:39 UTC (rev 30313)
+++ grass/trunk/gui/wxpython/gui_modules/digit.py	2008-02-24 00:46:41 UTC (rev 30314)
@@ -1865,7 +1865,7 @@
 
         # redraw map if auto-rendering is enabled
         if self.parent.autoRender.GetValue(): 
-            self.parent.ReRender(None)
+            self.parent.OnRender(None)
 
 class DigitCategoryDialog(wx.Dialog, listmix.ColumnSorterMixin):
     """

Modified: grass/trunk/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2008-02-24 00:39:39 UTC (rev 30313)
+++ grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2008-02-24 00:46:41 UTC (rev 30314)
@@ -2515,7 +2515,7 @@
     def OnToggleRender(self, event):
         """Enable/disable auto-rendering"""
         if self.autoRender.GetValue():
-            self.ReRender(None)
+            self.OnRender(None)
 
     def OnToggleShowRegion(self, event):
         """Show/Hide extent in map canvas"""
@@ -2527,7 +2527,7 @@
 
         # redraw map if auto-rendering is enabled
         if self.autoRender.GetValue():
-            self.ReRender(None)
+            self.OnRender(None)
 
 
     def OnToggleStatus(self, event):
@@ -3534,7 +3534,7 @@
     def watcher(self):
         """Redraw, if new layer appears"""
         if self.redraw:
-            self.mapFrm.ReDraw(None)
+            self.mapFrm.OnDraw(None)
         self.redraw = False
         return
 # end of class MapApp

Modified: grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py	2008-02-24 00:39:39 UTC (rev 30313)
+++ grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py	2008-02-24 00:46:41 UTC (rev 30314)
@@ -646,7 +646,7 @@
 
         # redraw map if auto-rendering is enabled
         if self.mapdisplay.autoRender.GetValue(): 
-            self.mapdisplay.ReRender(None)
+            self.mapdisplay.OnRender(None)
 
         if self.mapdisplay.digittoolbar:
             self.mapdisplay.digittoolbar.UpdateListOfLayers (updateTool=True)
@@ -674,7 +674,7 @@
 
         # redraw map if auto-rendering is enabled
         if self.mapdisplay.autoRender.GetValue(): 
-            self.mapdisplay.ReRender(None)
+            self.mapdisplay.OnRender(None)
 
         # update progress bar range (mapwindow statusbar)
         self.mapdisplay.onRenderGauge.SetRange(len(self.Map.GetListOfLayers(l_active=True)))
@@ -736,7 +736,7 @@
 
         # redraw map if auto-rendering is enabled
         if self.mapdisplay.autoRender.GetValue(): 
-            self.mapdisplay.ReRender(None)
+            self.mapdisplay.OnRender(None)
 
     def OnChangeSel(self, event):
         oldlayer = event.GetOldItem()
@@ -982,7 +982,7 @@
 
         # redraw map if auto-rendering is enabled
         if self.mapdisplay.autoRender.GetValue(): 
-            self.mapdisplay.ReRender(None)
+            self.mapdisplay.OnRender(None)
 
     def setNotebookPage(self,pg):
         self.parent.notebook.SetSelection(pg)