Explorar o código

wxGUI/vdigit: deselect lines on re-render
default layer opacity changed to 1.0
(merge from devbr6, https://trac.osgeo.org/grass/changeset/33195)


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@33196 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa %!s(int64=16) %!d(string=hai) anos
pai
achega
97a5b953d8

+ 14 - 2
gui/wxpython/gui_modules/mapdisp.py

@@ -345,6 +345,7 @@ class BufferedWindow(MapWindow, wx.Window):
             bg = wx.WHITE_BRUSH
             bg = wx.WHITE_BRUSH
             # bg = wx.Brush(self.GetBackgroundColour())
             # bg = wx.Brush(self.GetBackgroundColour())
             pdc.SetBackground(bg)
             pdc.SetBackground(bg)
+            pdc.RemoveAll()
             pdc.Clear()
             pdc.Clear()
             self.Refresh()
             self.Refresh()
             pdc.EndDrawing()
             pdc.EndDrawing()
@@ -801,7 +802,12 @@ class BufferedWindow(MapWindow, wx.Window):
         Erase the canvas
         Erase the canvas
         """
         """
         self.Draw(self.pdc, pdctype='clear')
         self.Draw(self.pdc, pdctype='clear')
-
+                  
+        if self.pdcVector:
+            self.Draw(self.pdcVector, pdctype='clear')
+        
+        self.Draw(self.pdcVector, pdctype='clear')
+        
     def DragMap(self, moveto):
     def DragMap(self, moveto):
         """
         """
         Drag the entire map image for panning.
         Drag the entire map image for panning.
@@ -2837,8 +2843,14 @@ class MapFrame(wx.Frame):
         qlayer = self.Map.GetListOfLayers(l_name=globalvar.QUERYLAYER)
         qlayer = self.Map.GetListOfLayers(l_name=globalvar.QUERYLAYER)
         for layer in qlayer:
         for layer in qlayer:
             self.Map.DeleteLayer(layer)
             self.Map.DeleteLayer(layer)
-        self.MapWindow.UpdateMap(render=True)
 
 
+        # deselect features in vdigit
+        if self.toolbars['vdigit']:
+            self.digit.driver.SetSelected([])
+            self.MapWindow.UpdateMap(render=True, renderVector=True)
+        else:
+            self.MapWindow.UpdateMap(render=True)
+        
         # update statusbar
         # update statusbar
         self.StatusbarUpdate()
         self.StatusbarUpdate()
 
 

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

@@ -515,7 +515,7 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
         self.EditLabel(self.layer_selected)
         self.EditLabel(self.layer_selected)
 
 
     def AddLayer(self, ltype, lname=None, lchecked=None,
     def AddLayer(self, ltype, lname=None, lchecked=None,
-                 lopacity=None, lcmd=None, lgroup=None, lnviz=None):
+                 lopacity=1.0, lcmd=None, lgroup=None, lnviz=None):
         """Add new item to the layer tree, create corresponding MapLayer instance.
         """Add new item to the layer tree, create corresponding MapLayer instance.
         Launch property dialog if needed (raster, vector, etc.)
         Launch property dialog if needed (raster, vector, etc.)