Changeset df4c3ad in sasview

Timestamp:

May 12, 2009 2:43:29 PM (16 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:

c3435b7f

Parents:

ddd864e

Message:

slicer clear on slicer panel close

Location:

sansview/perspectives/fitting

Files:

• fitpanel.py (modified) (1 diff)
• fitting.py (modified) (6 diffs)

sansview/perspectives/fitting/fitpanel.py

@@ -339 +339 @@
 
                 memento= self.fit_page_name[page_title][0]
-                print ""
                 panel.reset_page(memento)
         else:

sansview/perspectives/fitting/fitting.py

@@ -76 +76 @@
         #List of selected data
         self.selected_data_list=[]
+        ## list of panel with slicer
+        self.main_panel=[]
         # Log startup
         logging.info("Fitting plug-in started")   
@@ -212 +214 @@
         self.parent.Bind(EVT_REMOVE_DATA, self._closed_fitpage)
         self.parent.Bind(EVT_SLICER_PARS_UPDATE, self._onEVT_SLICER_PANEL)
+        self.parent._mgr.Bind(wx.aui.EVT_AUI_PANE_CLOSE,self._onclearslicer)    
+
         
         #Send the fitting panel to guiframe
@@ -501 +505 @@
             and panel_name to find the slicer 's panel concerned.
         """
+        
         for item in self.parent.panels:
-            if self.parent.panels[item].window_caption.startswith(event.panel_name): 
+            if self.parent.panels[item].window_caption.startswith(event.panel_name):
                 self.parent.panels[item].set_slicer(event.type, event.params)
-                self.parent._mgr.Update()
-                break   
+                
+        self.parent._mgr.Update()
+               
             
             
@@ -831 +837 @@
         if event.panel!=None:
             new_panel = event.panel
-            self.main_panel= event.main_panel
+            #self.main_panel.append(event.main_panel)
             # Set group ID if available
             event_id = self.parent.popup_panel(new_panel)
@@ -837 +843 @@
             #                 "Show %s plot panel" % new_panel.window_caption)
             # Set UID to allow us to reference the panel later
-            self.parent._mgr.Bind(wx.aui.EVT_AUI_PANE_CLOSE,
- 
-                 self._onclearslicer)    
-
+         
             new_panel.uid = event_id
             self.mypanels.append(new_panel) 
@@ -849 +852 @@
             Clear the boxslicer when close the panel associate with this slicer
         """
-        self.main_panel.onClearSlicer(event)
-        
+        name =event.GetPane().caption
+        key="boxsum"
+        try:
+            if name.lower().count(key)>0:
+                toks=[]
+                toks= name.lower().split(key)    
+                temp= toks[1].split()
+                panel_name= temp[0].lstrip().rstrip()
+                for item in self.parent.panels:
+                    if self.parent.panels[item].window_caption.lower().startswith(panel_name): 
+                        if hasattr(self.parent.panels[item],"slicer"):
+                            self.parent.panels[item].onClearSlicer(event)
+                            self.parent._mgr.Update()
+                            break 
+               
+            else:
+                return 
+        except:
+            raise 
+            return 
+       
+