Selaa lähdekoodia

wxGUI/vdigit: do not switch notebook page when digitizer is closed

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@48047 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 13 vuotta sitten
vanhempi
commit
7ddca3649d
1 muutettua tiedostoa jossa 5 lisäystä ja 6 poistoa
  1. 5 6
      gui/wxpython/gui_modules/toolbars.py

+ 5 - 6
gui/wxpython/gui_modules/toolbars.py

@@ -1129,15 +1129,15 @@ class VDigitToolbar(AbstractToolbar):
                                                   "closing and rebuilding topology of "
                                                   "closing and rebuilding topology of "
                                                   "vector map <%s>...") % self.mapLayer.GetName(),
                                                   "vector map <%s>...") % self.mapLayer.GetName(),
                                                 0)
                                                 0)
+            self.digit.CloseMap()
+            
             lmgr = self.parent.GetLayerManager()
             lmgr = self.parent.GetLayerManager()
             if lmgr:
             if lmgr:
                 lmgr.toolbars['tools'].Enable('vdigit', enable = True)
                 lmgr.toolbars['tools'].Enable('vdigit', enable = True)
-                lmgr.notebook.SetSelectionByName('output')
-            self.digit.CloseMap()
-            if lmgr:
                 lmgr.GetLogWindow().GetProgressBar().SetValue(0)
                 lmgr.GetLogWindow().GetProgressBar().SetValue(0)
                 lmgr.GetLogWindow().WriteCmdLog(_("Editing of vector map <%s> successfully finished") % \
                 lmgr.GetLogWindow().WriteCmdLog(_("Editing of vector map <%s> successfully finished") % \
-                                                    self.mapLayer.GetName())
+                                                    self.mapLayer.GetName(),
+                                                switchPage = False)
             # re-active layer 
             # re-active layer 
             item = self.parent.tree.FindItemByData('maplayer', self.mapLayer)
             item = self.parent.tree.FindItemByData('maplayer', self.mapLayer)
             if item and self.parent.tree.IsItemChecked(item):
             if item and self.parent.tree.IsItemChecked(item):
@@ -1163,8 +1163,7 @@ class VDigitToolbar(AbstractToolbar):
         return True
         return True
     
     
     def UpdateListOfLayers (self, updateTool = False):
     def UpdateListOfLayers (self, updateTool = False):
-        """!
-        Update list of available vector map layers.
+        """!Update list of available vector map layers.
         This list consists only editable layers (in the current mapset)
         This list consists only editable layers (in the current mapset)
 
 
         @param updateTool True to update also toolbar
         @param updateTool True to update also toolbar