Changeset 13a63ab in sasview

Timestamp:

May 13, 2011 3:26:08 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

a03d419

Parents:

f22e626

Message:

working on delete data

Location:

guiframe

Files:

• data_panel.py (modified) (4 diffs)
• events.py (modified) (1 diff)
• local_perspectives/plotting/plotting.py (modified) (2 diffs)

guiframe/data_panel.py

@@ -15 +15 @@
 import sys
 import warnings
+import logging
 from wx.lib.scrolledpanel import ScrolledPanel
 import  wx.lib.agw.customtreectrl as CT
@@ -21 +22 @@
 from sans.guiframe.panel_base import PanelBase
 from sans.guiframe.events import StatusEvent
+from sans.guiframe.events import EVT_DELETE_PLOTPANEL
 from DataLoader.loader import Loader
-import logging
 
 try:
@@ -129 +130 @@
         self.fill_cbox_analysis(self.list_of_perspective)
         self.Bind(wx.EVT_SHOW, self.on_close_page)
+        if self.parent is not None:
+            self.parent.Bind(EVT_DELETE_PLOTPANEL, self._on_delete_plot_panel)
        
         
@@ -765 +768 @@
         self.perspective_cbox.SetStringSelection(name)
         self.enable_import()
+        
+    def _on_delete_plot_panel(self, event):
+        """
+        get an event with attribute name and caption to delete existing name 
+        from the combobox of the current panel
+        """
+        name = event.name
+        caption = event.caption
+        if self.cb_plotpanel is not None:
+            pos = self.cb_plotpanel.FindString(str(caption)) 
+            if pos != wx.NOT_FOUND:
+                self.cb_plotpanel.Delete(pos)
+        self.enable_append()
         
     def set_panel_on_focus(self, name=None):

guiframe/events.py

@@ -16 +16 @@
 #slicer event
 (SlicerEvent, EVT_SLICER)   = wx.lib.newevent.NewEvent()
+## event that that destroy panel name in the datapanel combobox
+(DeletePlotPanelEvent, EVT_DELETE_PLOTPANEL)   = wx.lib.newevent.NewEvent()
 ##event that allow to add more that to the same plot
 (AddManyDataEvent, EVT_ADD_MANY_DATA)   = wx.lib.newevent.NewEvent()

guiframe/local_perspectives/plotting/plotting.py

@@ -16 +16 @@
 from sans.guiframe.events import EVT_NEW_PLOT
 from sans.guiframe.events import StatusEvent 
+from sans.guiframe.events import DeletePlotPanelEvent
 from sans.guiframe.plugin_base import PluginBase
 from sans.guiframe.dataFitting import Data1D
@@ -244 +245 @@
         if group_id in self.plot_panels.keys():
             panel = self.plot_panels[group_id]
+            wx.PostEvent(self.parent, 
+                         DeletePlotPanelEvent(name=panel.window_caption,
+                                    caption=panel.window_caption))
             #remove menu item
             self.delete_menu_item(panel.window_caption, panel.uid)