Changeset 6f023e8 in sasview for sansview/perspectives/fitting

Timestamp:

Mar 30, 2009 12:31:41 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:

9619367

Parents:

ded92e4

Message:

simultaneous fit and single fit combine fix

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (2 diffs)
• fitpanel.py (modified) (5 diffs)
• fitting.py (modified) (11 diffs)
• modelpage.py (modified) (1 diff)
• pageInfo.py (modified) (2 diffs)
• simfitpage.py (modified) (4 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -29 +29 @@
             Initialization of the Panel
         """
+        self.name= self.data.name
         ## fit page does not content npts txtcrtl
         self.npts=None
@@ -328 +329 @@
         self.qmin_x=float(self.qmin.GetValue())
         self.qmax_x =float( self.qmax.GetValue())
-        
+        self.manager._reset_schedule_problem( value=0)
         self.manager.schedule_for_fit( value=1,page=self,fitproblem =None) 
         self.manager.set_fit_range(page= self,qmin= self.qmin_x, qmax= self.qmax_x)

sansview/perspectives/fitting/fitpanel.py

@@ -6 +6 @@
 #import models
 _BOX_WIDTH = 80
-(FitPageEvent, EVT_FIT_PAGE)   = wx.lib.newevent.NewEvent()
+(PageInfoEvent, EVT_PAGE_INFO)   = wx.lib.newevent.NewEvent()
 
 class FitPanel(wx.aui.AuiNotebook):    
@@ -61 +61 @@
              close page and remove all references to the closed page
         """
+        page_info=self.get_current_page().page_info.clone()
+        self.manager._add_page_onmenu("Model", page_info)
+        
         selected_page = self.GetPage(self.GetSelection())
         page_number = self.GetSelection()
@@ -152 +155 @@
             panel = FitPage(parent= self, page_info=myinfo, name=name )
             panel.name=name
-            
+            panel.window_name= "fitpage"
             panel.set_manager(self.manager)
             panel.set_owner(self.event_owner)
@@ -159 +162 @@
             #panel.populate_box( self.model_list_box)
             self.fit_page_name.append(name)
-    
+            
             return panel 
         else:
@@ -199 +202 @@
         #FOR PLUGIN  for some reason model.name is = BASEcomponent
         self.manager.draw_model(model)
+        
      
         

sansview/perspectives/fitting/fitting.py

@@ -3 +3 @@
 import string, numpy, math
 
-from copy import deepcopy 
+#import copy,deepcopy 
 from danse.common.plottools.plottables import Data1D, Theory1D,Data2D
 from danse.common.plottools.PlotPanel import PlotPanel
@@ -22 +22 @@
 import time
 import thread
+
+(PageInfoEvent, EVT_PAGE_INFO)   = wx.lib.newevent.NewEvent()
 class PlotInfo:
     """
@@ -63 +65 @@
         #Flag to let the plug-in know that it is running stand alone
         self.standalone=True
+        ## dictionary of page closed and id 
+        self.closed_page_dict ={}
         ## Fit engine
         self._fit_engine = 'scipy'
@@ -87 +91 @@
         #Menu for fitting
         self.menu1 = wx.Menu()
-        id1 = wx.NewId()
-        self.menu1.Append(id1, '&Simultaneous')
-        wx.EVT_MENU(owner, id1, self.on_add_sim_page)
-        self.menu1.AppendSeparator()
+        
         #Set park engine
         id3 = wx.NewId()
         scipy_help= "Scipy Engine: Perform Simple fit. More in Help window...."
-        self.menu1.Append(id3, "Scipy",scipy_help) 
+        #self.menu1.Append(id3, "Scipy",scipy_help) 
+        self.menu1.AppendCheckItem(id3, "Scipy",scipy_help) 
         wx.EVT_MENU(owner, id3,  self._onset_engine_scipy)
-        self.menu1.AppendSeparator()
+        
         id3 = wx.NewId()
         park_help = "Park Engine: Perform Complex fit. More in Help window...."
-        self.menu1.Append(id3, "park",park_help) 
+        self.menu1.AppendCheckItem(id3, "Park",park_help) 
         wx.EVT_MENU(owner, id3,  self._onset_engine_park)
-        
+        self.menu1.AppendSeparator()
+        
+        id1 = wx.NewId()
+        simul_help = "Allow to edit fit engine with multiple model and data"
+        self.menu1.Append(id1, '&Simultaneous page',simul_help)
+        wx.EVT_MENU(owner, id1, self.on_add_sim_page)
+    
         #menu for model
         menu2 = wx.Menu()
@@ -113 +121 @@
         owner.Bind(fitpage.EVT_MODEL_BOX,self._on_model_panel)
         
+        self.menu3= wx.Menu()
+        id4 = wx.NewId()
+        
         #create  menubar items
-        return [(id, self.menu1, "Fitting"),(id2, menu2, "Model")]
+        return [(id, self.menu1, "Fitting"),
+                (id4,self.menu3,"Averagers"),
+                (id2, menu2, "Model")]
     
     def on_add_sim_page(self, event):
@@ -356 +369 @@
                            qstep=qstep)
         
+  
+                        
     def onFit(self):
         """
@@ -427 +442 @@
             return 
               
-       
-        
-        
-        
-        
+              
+    def _add_page_onmenu(self, name, page_info):
+        """
+            Add name of a closed page of fitpanel in a menu 
+        """
+        # Post paramters
+        event_id = wx.NewId()
+        self.menu1.Append(event_id, name, 
+             "Show %s fit panel" % name)
+        self.closed_page_dict[event_id ]= page_info
+        wx.EVT_MENU(self.parent,event_id,  self._open_closed_page)
+        
+        
+    def _open_closed_page(self, event):    
+        """
+            reopen a closed page
+        """
+        print "reopen"
+        
+    def _reset_schedule_problem(self, value=0):
+        """
+             unschedule or schedule all fitproblem to be fit
+        """
+        for page, fitproblem in self.page_finder.iteritems():
+            fitproblem.schedule_tofit(value)
+            
     def _fit_helper(self,current_pg,pars,value, id, title="Single Fit " ):
         """
@@ -637 +673 @@
             set engine to park
         """
+        if event.IsChecked():
+            self.menu1.FindItemByPosition(0).Check(False)
         self._on_change_engine('park')
        
@@ -644 +682 @@
             set engine to scipy
         """
+        if event.IsChecked():
+            self.menu1.FindItemByPosition(1).Check(False)
         self._on_change_engine('scipy')
        
@@ -655 +695 @@
             # Set group ID if available
             event_id = self.parent.popup_panel(new_panel)
-            self.menu1.Append(event_id, new_panel.window_caption, 
+            self.menu3.Append(event_id, new_panel.window_caption, 
                              "Show %s plot panel" % new_panel.window_caption)
             # Set UID to allow us to reference the panel later
@@ -662 +702 @@
             self.mypanels.append(new_panel) 
         return    
-    
+   
     def _on_change_engine(self, engine='park'):
         """

sansview/perspectives/fitting/modelpage.py

@@ -29 +29 @@
             Initialization of the Panel
         """
-        
+        self.name ="Model"
         self._fill_model_sizer( self.sizer1)  
         self._fill_range_sizer() 

sansview/perspectives/fitting/pageInfo.py

@@ -2 +2 @@
 
 import wx
+import copy
 
 class PageInfo(object):
@@ -69 +70 @@
         self.list_of_radiobox[label]=[label, id, state]    
     
-
+    def clone(self):
+        model=None
+        if self.model !=None:
+            model = self.model.clone()
+        
+        obj          = PageInfo( self.parent,model= model )
+        obj.data = copy.deepcopy(self.data)
+        
+        return obj
 
        

sansview/perspectives/fitting/simfitpage.py

@@ -125 +125 @@
         ## model was actually selected from this page to be fit
         if len(self.model_toFit) >= 1 :
+            self.manager._reset_schedule_problem( value=0)
+            for item in self.model_list:
+                if item[0].GetValue():
+                    self.manager.schedule_for_fit( value=1,fitproblem =item[1]) 
             self.manager.onFit()
         else:
@@ -148 +152 @@
             for item in self.model_list:
                 item[0].SetValue(True)
-                self.manager.schedule_for_fit( value=1,fitproblem =item[1]) 
                 self.model_toFit.append(item)
                 
@@ -160 +163 @@
             for item in self.model_list:
                 item[0].SetValue(False) 
-                self.manager.schedule_for_fit( value=0,fitproblem =item[1]) 
                 
             self.model_toFit=[]
@@ -175 +177 @@
             if item[0].GetValue()==True:
                 self.model_toFit.append(item)
-                self.manager.schedule_for_fit( value=1,fitproblem =item[1]) 
             else:
-                self.manager.schedule_for_fit( value=0,fitproblem =item[1]) 
                 if item in self.model_toFit:
                     self.model_toFit.remove(item)