Changeset c3435b7f in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

May 13, 2009 12:06:34 PM (15 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:

dad49a0

Parents:

df4c3ad

Message:

slicer clear when panel close

File:

• sansview/perspectives/fitting/fitting.py (modified) (3 diffs)

sansview/perspectives/fitting/fitting.py

@@ -76 +76 @@
         #List of selected data
         self.selected_data_list=[]
-        ## list of panel with slicer
-        self.main_panel=[]
+        ## list of slicer panel created to display slicer parameters and results
+        self.slicer_panels=[]
         # Log startup
         logging.info("Fitting plug-in started")   
@@ -835 +835 @@
             @param event: event containing a panel
         """
+       
         if event.panel!=None:
             new_panel = event.panel
-            #self.main_panel.append(event.main_panel)
+            self.slicer_panels.append(event.panel)
             # Set group ID if available
             event_id = self.parent.popup_panel(new_panel)
@@ -853 +854 @@
         """
         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 panel in self.slicer_panels:
+            if panel.window_caption==name:
+                
                 for item in self.parent.panels:
-                    if self.parent.panels[item].window_caption.lower().startswith(panel_name): 
-                        if hasattr(self.parent.panels[item],"slicer"):
+                    if hasattr(self.parent.panels[item],"uid"):
+                        if self.parent.panels[item].uid ==panel.base.uid:
                             self.parent.panels[item].onClearSlicer(event)
                             self.parent._mgr.Update()
                             break 
-               
-            else:
-                return 
-        except:
-            raise 
-            return 
+                break