Changeset 848a2ef in sasview for sansview/perspectives/fitting

Timestamp:

May 12, 2009 11:37:55 AM (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:

ddd864e

Parents:

63c7d85d

Message:

automatic clear of slicer when panel closed

Location:

sansview/perspectives/fitting

Files:

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

sansview/perspectives/fitting/fitpage.py

@@ -538 +538 @@
             evt = ModelEventbox(model=self.model)
             wx.PostEvent(self.event_owner, evt)   
-        
+        self.btFit.SetFocus() 
    
     def _onparamRangeEnter(self, event):

sansview/perspectives/fitting/fitpanel.py

@@ -52 +52 @@
     CENTER_PANE = True
     def __init__(self, parent, *args, **kwargs):
-        #wx.aui.AuiNotebook.__init__(self,parent,-1, style=wx.aui.AUI_NB_DEFAULT_STYLE  )
         wx.aui.AuiNotebook.__init__(self,parent,-1,
-                    style= wx.aui.AUI_NB_WINDOWLIST_BUTTON|wx.aui.AUI_NB_DEFAULT_STYLE \
-                    |wx.CLIP_CHILDREN  )
-       
-        
+                    style= wx.aui.AUI_NB_WINDOWLIST_BUTTON|wx.aui.AUI_NB_DEFAULT_STYLE|wx.CLIP_CHILDREN  )
+    
         self.manager=None
         self.parent=parent
@@ -121 +118 @@
             self.count =0
             ## page on menu
-            #self.manager._add_page_onmenu(page_name, fitproblem)
+            self.manager._add_page_onmenu(page_name, fitproblem)
         else:
             if selected_page in page_finder:
@@ -131 +128 @@
                     self.fit_page2D_number=None
                 ## page on menu
-                #self.manager._add_page_onmenu(page_name, fitproblem)
+                self.manager._add_page_onmenu(page_name, fitproblem)
                 del page_finder[selected_page]
             ##remove the check box link to the model name of this page (selected_page)
@@ -270 +267 @@
                 self.fit_page_name[page_title].insert(0,self.model_page.createMemento())
       
-           
+      
+      
+    def _close_fitpage(self,data):
+        """
+            close a fit page when its data is completely remove from the graph
+        """
+        name = data.name
+        for index in range(self.GetPageCount()):
+            if self.GetPageText(index)== name:
+                selected_page = self.GetPage(index) 
+    
+                if index ==self.fit_page1D_number:
+                    self.fit_page1D_number=None
+                if index ==self.fit_page2D_number:
+                    self.fit_page2D_number=None
+                if selected_page in self.manager.page_finder:
+                    del self.manager.page_finder[selected_page]
+                ##remove the check box link to the model name of this page (selected_page)
+                try:
+                    self.sim_page.draw_page()
+                except:
+                    ## that page is already deleted no need to remove check box on
+                    ##non existing page
+                    pass
+                
+                #Delete the name of the page into the list of open page
+                if selected_page.window_name in self.list_fitpage_name:
+                    self.list_fitpage_name.remove(selected_page.window_name)
+                self.DeletePage(index)
+                break
+        
+        
     def  _onGetstate(self, event):
         """
@@ -300 +328 @@
         panel = ModelPage(self,myinfo)
         
-        self.AddPage(page=panel,caption=page_title,select=True)
+        self.AddPage(page=panel, caption=page_title, select=True)
 
         self.model_page_number=self.GetSelection()
@@ -309 +337 @@
         if reset:
             if page_title in self.fit_page_name.keys():
-                
+
                 memento= self.fit_page_name[page_title][0]
+                print ""
                 panel.reset_page(memento)
         else:

sansview/perspectives/fitting/fitting.py

@@ -7 +7 @@
 from danse.common.plottools.PlotPanel import PlotPanel
 from sans.guicomm.events import NewPlotEvent, StatusEvent  
-from sans.guicomm.events import EVT_SLICER_PANEL,ERR_DATA
+from sans.guicomm.events import EVT_SLICER_PANEL,ERR_DATA,EVT_REMOVE_DATA
+from sans.guicomm.events import EVT_SLICER_PARS_UPDATE
 from sans.guiframe import dataFitting
 from sans.fit.AbstractFitEngine import Model
+
 
 from fitproblem import FitProblem
@@ -208 +210 @@
         self.parent.Bind(EVT_SLICER_PANEL, self._on_slicer_event)
         self.parent.Bind( ERR_DATA, self._on_data_error)
+        self.parent.Bind(EVT_REMOVE_DATA, self._closed_fitpage)
+        self.parent.Bind(EVT_SLICER_PARS_UPDATE, self._onEVT_SLICER_PANEL)
         
         #Send the fitting panel to guiframe
@@ -487 +491 @@
             wx.PostEvent(self.parent, StatusEvent(status= msg ,type="stop"))
             return 
-              
-              
+           
+           
+           
+    def _onEVT_SLICER_PANEL(self, event):
+        """
+            receive and event telling to update a panel with a name starting with 
+            event.panel_name. this method update slicer panel for a given interactor.
+            @param event: contains type of slicer , paramaters for updating the panel
+            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): 
+                self.parent.panels[item].set_slicer(event.type, event.params)
+                self.parent._mgr.Update()
+                break   
+            
+            
+    def _closed_fitpage(self, event):   
+        """
+            request fitpanel to close a given page when its unique data is removed 
+            from the plot
+        """    
+        self.fit_panel._close_fitpage(event.data) 
+        
+        
     def _add_page_onmenu(self, name,fitproblem=None):
         """
@@ -729 +756 @@
             @param elapsed: computation time
         """
-        wx.PostEvent(self.parent, StatusEvent(status="Simultaneous fit \
-        complete "))
+        wx.PostEvent(self.parent, StatusEvent(status="Simultaneous fit complete "))
        
         ## fit more than 1 model at the same time 
@@ -805 +831 @@
         if event.panel!=None:
             new_panel = event.panel
+            self.main_panel= event.main_panel
             # Set group ID if available
             event_id = self.parent.popup_panel(new_panel)
@@ -810 +837 @@
             #                 "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) 
         return  
     
-      
+    def _onclearslicer(self, event):
+        """
+            Clear the boxslicer when close the panel associate with this slicer
+        """
+        self.main_panel.onClearSlicer(event)
+        
+        
+        
     def _return_engine_type(self):
         """

sansview/perspectives/fitting/modelpage.py

@@ -330 +330 @@
         """
         self.model = model
-        
         self.set_model_param_sizer(self.model)
-        self.set_model_param_sizer(self.model)  
         ## keep the sizer view consistent with the model menu selecting
         self._set_model_sizer_selection( self.model )
@@ -338 +336 @@
         self.disable_disp.SetValue(True)
         self.set_dispers_sizer()
+        
         self.model_view.SetFocus()
         if self.model !=None:
@@ -353 +352 @@
         box_description= wx.StaticBox(self, -1, 'Model Description')
         boxsizer1 = wx.StaticBoxSizer(box_description, wx.VERTICAL)
-            
+
         sizer_selection=wx.BoxSizer(wx.HORIZONTAL)
-        
         self.description_hide = wx.RadioButton(self, -1, 'Hide', style=wx.RB_GROUP)
         self.description_show = wx.RadioButton(self, -1, 'Show')
@@ -379 +377 @@
         sizer_selection.Add( (20,20)) 
         sizer_selection.Add( self.description_hide )
-        #sizer_selection.Add( (20,20)) 
         sizer_selection.Add((20,20),0, wx.LEFT|wx.RIGHT|wx.EXPAND,67)
         sizer_selection.Add( self.model_description )