Changeset 00b76931 in sasview for guiframe/local_perspectives

Timestamp:

Mar 10, 2011 5:33:43 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:

2bdb52b

Parents:

c9937c0

Message:

working on plot 1D \2D

File:

• guiframe/local_perspectives/plotting/plotting.py (modified) (9 diffs)

guiframe/local_perspectives/plotting/plotting.py

@@ -20 +20 @@
 from sans.guiframe.dataFitting import Data2D
 
+DEFAULT_MENU_ITEM_LABEL = "No plot available"
+DEFAULT_MENU_ITEM_ID = wx.NewId()
+
 class Plugin(PluginBase):
     """
@@ -31 +34 @@
         self.plot_panels = {}
         self._panel_on_focus = None
+        self.menu_default_id = None
      
     def set_panel_on_focus(self, panel):
@@ -54 +58 @@
         """
         self.menu = wx.Menu()
-        
-        self.menu.Append(wx.NewId(), "No plot available", 
+        self.menu.Append(DEFAULT_MENU_ITEM_ID, DEFAULT_MENU_ITEM_LABEL, 
                              "No plot available")
         self.menu.FindItemByPosition(0).Enable(False)
@@ -95 +98 @@
             panel = self.plot_panels[group_id]
             self.parent.hide_panel(panel.uid)
-            print "plotting hide_panel"
             return True
         return False
@@ -112 +114 @@
         #remove the default item in the menu
         if len(self.plot_panels) == 0:
-            self.menu.RemoveItem(self.menu.FindItemByPosition(0))
+            pos = self.menu.FindItem(DEFAULT_MENU_ITEM_LABEL)
+            if pos != -1:
+                self.menu.Delete(DEFAULT_MENU_ITEM_ID)
+           
         self.menu.Append(event_id, new_panel.window_caption, 
                          "Show %s plot panel" % new_panel.window_caption)
@@ -120 +125 @@
         new_panel.plot_data(data) 
         self.plot_panels[new_panel.group_id] = new_panel
-        print "self.plot_panels.keys()", self.plot_panels.keys()
+        
         
     def create_1d_panel(self, data, group_id):
@@ -172 +177 @@
             self.parent.show_panel(panel.uid)   
     
+    def delete_panel(self, group_id):
+        """
+        """
+        if group_id in self.plot_panels.keys():
+            panel = self.plot_panels[group_id]
+            #remove menu item
+            self.menu.Delete(panel.uid)
+            self.parent.delete_panel(panel.uid)
+            del self.plot_panels[group_id]
+            return True
+        return False
+    
     def _on_plot_event(self, event):
         """
@@ -181 +198 @@
         
         """
-        
         if hasattr(event, 'action'):
             group_id = event.group_id
@@ -190 +206 @@
             if event.action.lower() == 'hide':
                 return self.hide_panel(group_id)
-           
+            if event.action.lower() == 'delete':
+                return self.delete_panel(group_id)
+                
         data = event.plot
         group_id_list = data.group_id