Просмотр исходного кода

Fix bug with layers not rendering correctly or obscuring underlying layers.

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@32829 15284696-431f-4ddb-bdfa-cd5b030d7da7
Michael Barton 16 лет назад
Родитель
Сommit
9063947dec
2 измененных файлов с 6 добавлено и 3 удалено
  1. 3 0
      gui/wxpython/gui_modules/mapdisp.py
  2. 3 3
      gui/wxpython/gui_modules/wxgui_utils.py

+ 3 - 0
gui/wxpython/gui_modules/mapdisp.py

@@ -644,6 +644,9 @@ class BufferedWindow(MapWindow, wx.Window):
         # 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():

+ 3 - 3
gui/wxpython/gui_modules/wxgui_utils.py

@@ -725,8 +725,8 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
         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 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
 
         vislayer = self.GetFirstVisibleItem()
 
-        if not vislayer:
+        if not vislayer or self.GetPyData(vislayer) is None:
             return
 
         itemList = ""