[GRASS-SVN] r46470 - grass/branches/releasebranch_6_4/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-05-31 02:57:43 -0700 (Tue, 31 May 2011)
New Revision: 46470

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/layertree.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mapdisp.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py
   grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/wxvdigit.py
Log:
#1375 wxGUI: vector digitizer: cannot close (empty) vector map
     (merge r46464 from trunk)


Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/layertree.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/layertree.py	2011-05-31 09:49:27 UTC (rev 46469)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/layertree.py	2011-05-31 09:57:43 UTC (rev 46470)
@@ -571,7 +571,7 @@
         
         self.mapdisplay.toolbars['vdigit'].OnExit()
         if self.lmgr:
-            self.lmgr.toolbar.Enable('vdigit', enable = True)
+            self.lmgr.toolbars['tools'].Enable('vdigit', enable = True)
         
         self._setGradient()
         self.RefreshLine(self.layer_selected)

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mapdisp.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mapdisp.py	2011-05-31 09:49:27 UTC (rev 46469)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/mapdisp.py	2011-05-31 09:57:43 UTC (rev 46470)
@@ -569,7 +569,7 @@
         
         # deselect features in vdigit
         if self.toolbars['vdigit']:
-            self.MapWindow.display.SetSelected([])
+            self.MapWindow.digit.GetDisplay().SetSelected([])
             self.MapWindow.UpdateMap(render = True, renderVector = True)
         else:
             self.MapWindow.UpdateMap(render = True)

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py	2011-05-31 09:49:27 UTC (rev 46469)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/toolbars.py	2011-05-31 09:57:43 UTC (rev 46470)
@@ -499,8 +499,8 @@
         self.layerTree     = layerTree  # reference to layer tree associated to map display
         self.log           = log        # log area
         AbstractToolbar.__init__(self, parent)
-        self.digit         = self.parent.MapWindow.digit
-
+        self.digit         = None
+        
         # currently selected map layer for editing (reference to MapLayer instance)
         self.mapLayer = None
         # list of vector layers from Layer Manager (only in the current mapset)
@@ -649,7 +649,7 @@
         # clear tmp canvas
         if self.action['id'] != id:
             self.parent.MapWindow.ClearLines(pdc = self.parent.MapWindow.pdcTmp)
-            if self.parent.MapWindow.digit and \
+            if self.digit and \
                     len(self.parent.MapWindow.digit.GetDisplay().GetSelected()) > 0:
                 # cancel action
                 self.parent.MapWindow.OnMiddleDown(None)
@@ -718,7 +718,7 @@
         
         # disable the toolbar
         self.parent.RemoveToolbar("vdigit")
-                
+        
     def OnMoveVertex(self, event):
         """!Move line vertex"""
         Debug.msg(2, "Digittoolbar.OnMoveVertex():")
@@ -1171,7 +1171,7 @@
         self.parent.toolbars['map'].combo.SetValue (_('Digitize'))
         lmgr = self.parent.GetLayerManager()
         if lmgr:
-            lmgr.toolbar.Enable('vdigit', enable = False)
+            lmgr.toolbars['tools'].Enable('vdigit', enable = False)
         
         Debug.msg (4, "VDigitToolbar.StartEditing(): layer=%s" % mapLayer.GetName())
         
@@ -1218,7 +1218,7 @@
                                                 0)
             lmgr = self.parent.GetLayerManager()
             if lmgr:
-                lmgr.toolbar.Enable('vdigit', enable = True)
+                lmgr.toolbars['tools'].Enable('vdigit', enable = True)
                 lmgr.notebook.SetSelection(1)
             self.digit.CloseMap()
             if lmgr:
@@ -1240,8 +1240,8 @@
                 self.parent.dialogs[dialog].Close()
                 self.parent.dialogs[dialog] = None
         
-        self.digit.__del__() # FIXME: destructor is not called here (del)
-        self.digit = self.parent.MapWindow.digit = None
+        del self.digit
+        del self.parent.MapWindow.digit
         
         self.mapLayer = None
         

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/wxvdigit.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/wxvdigit.py	2011-05-31 09:49:27 UTC (rev 46469)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_modules/wxvdigit.py	2011-05-31 09:57:43 UTC (rev 46470)
@@ -165,6 +165,7 @@
             self.InitCats()
         
     def __del__(self):
+        Debug.msg(1, "IVDigit.__del__()")
         Vect_destroy_line_struct(self.poPoints)
         self.poPoints = None
         Vect_destroy_cats_struct(self.poCats)