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

[svn_grass at osgeo.org]

Author: cmbarton
Date: 2008-08-16 21:38:11 -0400 (Sat, 16 Aug 2008)
New Revision: 32829

Modified:
   grass/trunk/gui/wxpython/gui_modules/mapdisp.py
   grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py
Log:
Fix bug with layers not rendering correctly or obscuring underlying layers.

Modified: grass/trunk/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2008-08-16 22:54:00 UTC (rev 32828)
+++ grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2008-08-17 01:38:11 UTC (rev 32829)
@@ -644,6 +644,9 @@
         # render background image if needed
         #
         if render:
+            # walk layer tree and update current layers
+            self.tree.ReorderLayers()
+            # update display size
             self.Map.ChangeMapSize(self.GetClientSize())
             windres = False
             if self.parent.compResolution.GetValue():

Modified: grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py	2008-08-16 22:54:00 UTC (rev 32828)
+++ grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py	2008-08-17 01:38:11 UTC (rev 32829)
@@ -725,8 +725,8 @@
         elif ltype == 'raster':
             cmd = ['d.rast']
             
-            if UserSettings.Get(group='cmd', key='rasterOpaque', subkey='enabled'):
-                cmd.append('-n')
+            if UserSettings.Get(group='cmd', key='rasterOverlay', subkey='enabled'):
+                cmd.append('-o')
             menuform.GUI().ParseCommand(cmd, completed=(self.GetOptData,layer,params),
                                         parentframe=self)
         elif ltype == '3d-raster':
@@ -1197,7 +1197,7 @@
 
         vislayer = self.GetFirstVisibleItem()
 
-        if not vislayer:
+        if not vislayer or self.GetPyData(vislayer) is None:
             return
 
         itemList = ""