closing Map Display and layer tree from different places (#427)

gui/wxpython/lmgr/frame.py

@@ -407,7 +407,7 @@ class GMFrame(wx.Frame):
             self.OnCBPageChanged)
         self.notebookLayers.Bind(
             FN.EVT_FLATNOTEBOOK_PAGE_CLOSING,
-            self.OnCBPageClosed)
+            self.OnCBPageClosing)
 
         return self.notebook
 
@@ -651,11 +651,34 @@ class GMFrame(wx.Frame):
 
         event.Skip()
 
-    def OnCBPageClosed(self, event):
-        """Page of notebook closed
-        Also close associated map display
+    def OnCBPageClosing(self, event):
+        """Page of notebook is being closed
+        from Layer Manager (x button next to arrows)
+        Also close associated map display.
         """
+        # save changes in the workspace
+        if not self.CanClosePage():
+            event.Veto()
+
+        maptree = self.notebookLayers.GetPage(event.GetSelection()).maptree
+        maptree.GetMapDisplay().CleanUp()
+        maptree.Close(True)
 
+        self.currentPage = None
+
+        event.Skip()
+
+    def _closePageNoEvent(self, page_index):
+        """Close page and destroy map display without
+        generating notebook page closing event"""
+        self.notebookLayers.Unbind(FN.EVT_FLATNOTEBOOK_PAGE_CLOSING)
+        self.notebookLayers.DeletePage(page_index)
+        self.notebookLayers.Bind(FN.EVT_FLATNOTEBOOK_PAGE_CLOSING,
+                                 self.OnCBPageClosing)
+
+    def CanClosePage(self):
+        """Ask if page with map display can be closed
+        """
         # save changes in the workspace
         maptree = self.GetLayerTree()
         if  self.workspaceChanged and UserSettings.Get(
@@ -675,24 +698,15 @@ class GMFrame(wx.Frame):
                                        style=wx.YES_NO | wx.YES_DEFAULT |
                                        wx.CANCEL | wx.ICON_QUESTION | wx.CENTRE)
                 ret = dlg.ShowModal()
+                dlg.Destroy()
                 if ret == wx.ID_YES:
                     if not self.workspaceFile:
                         self.OnWorkspaceSaveAs()
                     else:
                         self.SaveToWorkspaceFile(self.workspaceFile)
                 elif ret == wx.ID_CANCEL:
-                    event.Veto()
-                    dlg.Destroy()
-                    return
-                dlg.Destroy()
-
-        self.notebookLayers.GetPage(event.GetSelection()).maptree.Map.Clean()
-        self.notebookLayers.GetPage(event.GetSelection()).maptree.Close(True)
-        self.notebookLayers.GetPage(event.GetSelection()).maptree.mapdisplay._mgr.UnInit()
-
-        self.currentPage = None
-
-        event.Skip()
+                    return False
+        return True
 
     def _switchPageHandler(self, event, notification):
         self._switchPage(notification=notification)
@@ -1740,7 +1754,8 @@ class GMFrame(wx.Frame):
         """Close all open map display windows
         """
         for display in self.GetMapDisplay(onlyCurrent=False):
-            display.OnCloseWindow(event)
+            display.CleanUp()
+            display.Destroy()
 
     def OnRenderAllMapDisplays(self, event=None):
         for display in self.GetAllMapDisplays():
@@ -2114,6 +2129,7 @@ class GMFrame(wx.Frame):
             self._onMapDisplayStarting3dMode(mapDisplayPage))
         mapdisplay.starting3dMode.connect(self.AddNvizTools)
         mapdisplay.ending3dMode.connect(self.RemoveNvizTools)
+        mapdisplay.closingDisplay.connect(self._closePageNoEvent)
 
         # use default window layout
         if UserSettings.Get(
@@ -2584,6 +2600,7 @@ class GMFrame(wx.Frame):
 
         self.OnDisplayCloseAll()
 
+        self.notebookLayers.Unbind(FN.EVT_FLATNOTEBOOK_PAGE_CLOSING)
         self.notebookLayers.DeleteAllPages()
         self._auimgr.UnInit()
         self.Destroy()

gui/wxpython/mapdisp/frame.py

@@ -103,6 +103,9 @@ class MapFrame(SingleMapFrame):
         # Emitted when ending (switching from) 3D mode.
         self.ending3dMode = Signal("MapFrame.ending3dMode")
 
+        # Emitted when closing display by closing its window.
+        self.closingDisplay = Signal("MapFrame.closingDisplay")
+
         # properties are shared in other objects, so defining here
         self.mapWindowProperties = MapWindowProperties()
         self.mapWindowProperties.setValuesFromUserSettings()
@@ -826,14 +829,11 @@ class MapFrame(SingleMapFrame):
         self.PopupMenu(printmenu)
         printmenu.Destroy()
 
-    def OnCloseWindow(self, event):
-        """Window closed.
-        Also close associated layer tree page
-        """
-        Debug.msg(2, "MapFrame.OnCloseWindow(): function starts")
-        pgnum = None
+    def CleanUp(self):
+        """Clean up before closing map display.
+        End digitizer/nviz."""
+        Debug.msg(2, "MapFrame.CleanUp()")
         self.Map.Clean()
-
         # close edited map and 3D tools properly
         if self.GetToolbar('vdigit'):
             maplayer = self.toolbars['vdigit'].GetLayer()
@@ -843,15 +843,23 @@ class MapFrame(SingleMapFrame):
             self.RemoveNviz()
         if hasattr(self, 'rdigit') and self.rdigit:
             self.rdigit.CleanUp()
+        self._mgr.UnInit()
 
-        if not self._layerManager:
+    def OnCloseWindow(self, event):
+        """Window closed.
+        Also close associated layer tree page
+        """
+        Debug.msg(2, "MapFrame.OnCloseWindow()")
+        if self._layerManager:
+            if self._layerManager.CanClosePage():
+                self.CleanUp()
+                pgnum = self.layerbook.GetPageIndex(self.page)
+                if pgnum > -1:
+                    self.closingDisplay.emit(page_index=pgnum)
+                    # Destroy is called when notebook page is deleted
+        else:
+            self.CleanUp()
             self.Destroy()
-        elif self.page:
-            pgnum = self.layerbook.GetPageIndex(self.page)
-            if pgnum > -1:
-                self._mgr.UnInit()
-                self.layerbook.DeletePage(pgnum)
-        Debug.msg(2, "MapFrame.OnCloseWindow(): function ends")
 
     def Query(self, x, y):
         """Query selected layers.