wxGUI: bogus rectangles on map display (trac https://trac.osgeo.org/grass/ticket/414)

       (merge from devbr6, https://trac.osgeo.org/grass/changeset/35060)


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

gui/wxpython/gui_modules/mapdisp.py

@@ -3380,7 +3380,7 @@ class MapFrame(wx.Frame):
         self.toolbars['map'].action['desc'] = 'modifyAttrb'
         
         self.MapWindow.mouse['use'] = "queryVector"
-        self.MapWindow.mouse['box'] = "box"
+        self.MapWindow.mouse['box'] = "point"
         self.MapWindow.pen = wx.Pen(colour='Red', width=2, style=wx.SHORT_DASH)
         self.MapWindow.zoomtype = 0
 

gui/wxpython/gui_modules/toolbars.py

@@ -630,6 +630,11 @@ class VDigitToolbar(AbstractToolbar):
         # disable the toolbar
         self.parent.RemoveToolbar ("vdigit")
 
+        # set default mouse settings
+        self.parent.MapWindow.mouse['use'] = "pointer"
+        self.parent.MapWindow.mouse['box'] = "point"
+        self.parent.MapWindow.polycoords = []
+        
     def OnMoveVertex(self, event):
         """Move line vertex"""
         Debug.msg(2, "Digittoolbar.OnMoveVertex():")

gui/wxpython/gui_modules/wxgui_utils.py

@@ -487,15 +487,11 @@ class LayerTree(treemixin.DragAndDrop, CT.CustomTreeCtrl):
         """
         Stop editing the current vector map layer
         """
-        try:
-            maplayer = self.GetPyData(self.layer_selected)[0]['maplayer']
-        except:
-            event.Skip()
-            return
-
+        maplayer = self.GetPyData(self.layer_selected)[0]['maplayer']
+        
         self.mapdisplay.toolbars['vdigit'].OnExit()
         self.mapdisplay.imgVectorMap = None
-
+        
     def OnSetBgMap(self, event):
         """Set background vector map for editing sesstion"""
         if event.IsChecked():