Changeset 168a845 in sasview

Timestamp:

Apr 26, 2011 10:41:50 AM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

23ccf07

Parents:

34b9813

Message:

Improved open project (Graph menu)

Location:

guiframe

Files:

• gui_manager.py (modified) (2 diffs)
• local_perspectives/plotting/plotting.py (modified) (2 diffs)

guiframe/gui_manager.py

@@ -213 +213 @@
                     self.panels[ID].on_kill_focus(None)
 
-            if self._data_panel is not None:
+            if self._data_panel is not None and \
+                            self.panel_on_focus is not None:
                 panel_name = self.panel_on_focus.window_caption
                 ID = self.panel_on_focus.uid
@@ -1213 +1214 @@
                     plug.clear_panel() 
                 if self.defaultPanel != None:
-                    default_panel = self.panels['default']
-                    self.panels = {'default': default_panel}
+                    self.panels = {'default': self.defaultPanel}
                 else:
                     #self.clear_panel()
                     self.panels = {}
-                    
+                self._data_panel.clear_panel()    
                 self.plot_panels = {}
             self.panel_on_focus = None    

guiframe/local_perspectives/plotting/plotting.py

@@ -94 +94 @@
     def clear_panel(self):
         """
-        Clear and Hide all plot panels
+        Clear and Hide all plot panels, and remove them from menu
         """
         for group_id in self.plot_panels.keys():
@@ -100 +100 @@
             panel.graph.reset()
             self.hide_panel(group_id)
-        self.plot_panels = {}     
+        self.plot_panels = {}
+        item = self.menu.FindItemByPosition(0)
+        while item != None:
+            self.menu.DeleteItem(item) 
+            try:
+                item = self.menu.FindItemByPosition(0)
+            except:
+                item = None
+               
     
     def clear_panel_by_id(self, group_id):