Changeset d97dd6f in sasview for sansguiframe/src/sans

Timestamp:

Sep 21, 2011 6:01:53 PM (13 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:

22ce7e2

Parents:

e1a97f8

Message:

fixed a bug in delete plotpanels

Location:

sansguiframe/src/sans/guiframe

Files:

• gui_manager.py (modified) (1 diff)
• local_perspectives/plotting/plotting.py (modified) (3 diffs)

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -1646 +1646 @@
             self.panel_on_focus = None
             panel = self.panels[ID]
+            self._mgr.DetachPane(panel)
             self._plotting_plugin.delete_panel(panel.group_id)
-            self._mgr.DetachPane(panel)
             panel.Hide()
             panel.clear()
             panel.Close()
+            if panel in self.schedule_full_draw_list:
+               self.schedule_full_draw_list.remove(panel) 
             #CallAfter: make sure panel is clear before updating mgr
             wx.CallAfter(self._mgr.Update)

sansguiframe/src/sans/guiframe/local_perspectives/plotting/plotting.py

@@ -175 +175 @@
 
         wx.EVT_SHOW(new_panel, self._on_close_panel)
-         
+
         
     def create_1d_panel(self, data, group_id):
@@ -258 +258 @@
             self.delete_menu_item(panel.window_caption, panel.uid)
             del self.plot_panels[group_id]
-            self.parent.delete_panel(uid)
+            #self.parent.delete_panel(uid)
             return True
+
         return False
     
@@ -280 +281 @@
                 return self.hide_panel(group_id)
             if event.action.lower() == 'delete':
-                return self.delete_panel(group_id)
+                panel = self.plot_panels[group_id]
+                uid = panel.uid
+                return self.parent.delete_panel(uid)
             if event.action.lower() == "clear":
                 return self.clear_panel_by_id(group_id)