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

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-09-01 12:10:39 -0400 (Mon, 01 Sep 2008)
New Revision: 33196

Modified:
   grass/trunk/gui/wxpython/gui_modules/mapdisp.py
   grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py
Log:
wxGUI/vdigit: deselect lines on re-render
default layer opacity changed to 1.0
(merge from devbr6, r33195)


Modified: grass/trunk/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2008-09-01 16:07:59 UTC (rev 33195)
+++ grass/trunk/gui/wxpython/gui_modules/mapdisp.py	2008-09-01 16:10:39 UTC (rev 33196)
@@ -345,6 +345,7 @@
             bg = wx.WHITE_BRUSH
             # bg = wx.Brush(self.GetBackgroundColour())
             pdc.SetBackground(bg)
+            pdc.RemoveAll()
             pdc.Clear()
             self.Refresh()
             pdc.EndDrawing()
@@ -801,7 +802,12 @@
         Erase the canvas
         """
         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):
         """
         Drag the entire map image for panning.
@@ -2837,8 +2843,14 @@
         qlayer = self.Map.GetListOfLayers(l_name=globalvar.QUERYLAYER)
         for layer in qlayer:
             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
         self.StatusbarUpdate()
 

Modified: grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py
===================================================================
--- grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py	2008-09-01 16:07:59 UTC (rev 33195)
+++ grass/trunk/gui/wxpython/gui_modules/wxgui_utils.py	2008-09-01 16:10:39 UTC (rev 33196)
@@ -515,7 +515,7 @@
         self.EditLabel(self.layer_selected)
 
     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.
         Launch property dialog if needed (raster, vector, etc.)