Changeset 6e75ed0 in sasview for sansguiframe/src/sans/guiframe/gui_manager.py

Timestamp:

Apr 23, 2012 10:00:49 AM (12 years ago)

Author:

Robert Whitley <robert.whitley@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

2ee5c61

Parents:

3553ad2

Message:

Refs #36. Delete should be cross button and hide should be a toolbar button.

Clean up some warnings.

File:

• sansguiframe/src/sans/guiframe/gui_manager.py (modified) (13 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -427 +427 @@
             if count >= 2:
                 column_names_line = line
-                first_data_index = index
                 break 
            
@@ -460 +459 @@
         fd.write(str(details))
         for col_name  in data.keys():
-             fd.write(str(col_name))
-             fd.write(separator)
+            fd.write(str(col_name))
+            fd.write(separator)
         fd.write('\n')
         max_list = [len(value) for value in data.values()]
@@ -904 +903 @@
         # Show a default panel with some help information
         # It also sets the size of the application windows
-        #TODO: Use this for slpash screen
+        #TODO: Use this for splash screen
         if self.defaultPanel is None:
             self.defaultPanel = DefaultPanel(self, -1, style=wx.RAISED_BORDER)
@@ -1028 +1027 @@
         return menu_list
         
+        
+    def on_panel_close(self, event):
+        """
+        Gets called when the close event for a panel runs.
+        This will check which panel has been closed and
+        delete it.
+        """
+        panel = event.GetPane()
+        for ID in self.plot_panels.keys():
+            if self.plot_panels[ID].window_name == panel.name:
+                self.delete_panel(ID)
+                break
+    
+    
     def popup_panel(self, p):
         """
@@ -1045 +1058 @@
             windowcaption = 'Graph'#p.window_caption
         windowname = p.window_name
-        """
-        count = 0
-        for item in self.panels:
-            if self.panels[item].window_name.startswith(p.window_name)\
-               or self._mgr.GetPane(p.window_name).IsOk(): 
-                count += 1
-        
-        if count > 0:
-            windowname += str(count+1)
-        """
+
         # Append nummber
         captions = self._get_plotpanel_captions()
@@ -1067 +1071 @@
         if p.window_caption.split()[0] not in NOT_SO_GRAPH_LIST:
             p.window_caption = caption 
-        #p.window_caption = windowcaption+ str(self.graph_num)
         p.window_name = windowname + str(self.graph_num)
         
@@ -1100 +1103 @@
             
             self._popup_floating_panel(p)
-  
+        
+        # Register for closing of panels
+        self.Bind(wx.aui.EVT_AUI_PANE_CLOSE, self.on_panel_close)
         # Register for showing/hiding the panel
         wx.EVT_MENU(self, ID, self.on_view)
@@ -1475 +1480 @@
         """
         
-         # File menu
+        # File menu
         self._file_menu = wx.Menu()
         #append item from plugin under menu file if necessary
@@ -1742 +1747 @@
             if self._mgr.GetPane(self.panels[ID].window_name).IsShown():
                 self._mgr.GetPane(self.panels[ID].window_name).Hide()
+                item = self._plotting_plugin.menu.FindItemById(uid)
+                item.Check(False)
                 if self._data_panel is not None and \
                             ID in self.plot_panels.keys():
@@ -1769 +1776 @@
             panel.Close()
             if panel in self.schedule_full_draw_list:
-               self.schedule_full_draw_list.remove(panel) 
+                self.schedule_full_draw_list.remove(panel) 
             
             #delete uid number not str(uid)
@@ -1839 +1846 @@
             path = os.path.abspath(path)
             if not os.path.isfile(path) and not os.path.isdir(path):
-               return
+                return
             
             if os.path.isdir(path):
@@ -2054 +2061 @@
                 logging.error(msg)
         except:
-           msg = "Error occurred while saving: "
-           msg += "To save, at leat one application panel "
-           msg += "should have a data set.."
-           wx.PostEvent(self, StatusEvent(status=msg))    
+            msg = "Error occurred while saving: "
+            msg += "To save, at leat one application panel "
+            msg += "should have a data set.."
+            wx.PostEvent(self, StatusEvent(status=msg))    
                     
     def on_save_helper(self, doc, reader, panel, path):
@@ -3497 +3504 @@
     app = ViewApp(0)
     app.MainLoop()
-
-