Changeset 1b07935d in sasview for sansview

Timestamp:

Sep 8, 2008 9:10:57 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:

6f4b71f

Parents:

d89f09b

Message:

creating a panel for model display

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (2 diffs)
• fitpanel.py (modified) (4 diffs)
• fitproblem.py (modified) (1 diff)
• fitting.py (modified) (12 diffs)
• modelpage.py (added)
• simfitpage.py (modified) (6 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -495 +495 @@
             when enter value on panel redraw model according to changed
         """
+        self.set_model_parameter()
+        
+    def set_model_parameter(self):
         if len(self.parameters) !=0 and self.model !=None:
             for item in self.parameters:
@@ -507 +510 @@
                      wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
                             "Drawing  Error:wrong value entered : %s"% sys.exc_value))
-        
-       
     def select_all_param(self,event): 
         """

sansview/perspectives/fitting/fitpanel.py

@@ -49 +49 @@
         self.model_list_box={}
         # save the title of the last page tab added
-        self.name=None
+        self.fit_page_name=None
+        self.draw_model_name=[]
         self.nb.Update()
         self.SetSizer(self.sizer)
@@ -72 +73 @@
       
         
-    def add_page( self,page_title ):
+    def add_fit_page( self,page_title ):
         """ 
             Add a fitting page on the notebook contained by fitpanel
@@ -79 +80 @@
             @return panel : page just added for futher used. is used by fitting module
         """     
-        if self.name != page_title:
+        if self.fit_page_name != page_title:
             from fitpage import FitPage
             panel = FitPage(self.nb, -1)
@@ -86 +87 @@
             self.nb.AddPage(page=panel,text=page_title,select=True)
             panel.populate_box( self.model_list_box)
-            self.name = page_title
+            self.fit_page_name = page_title
             return panel
+    def add_model_page(self,model,page_title):
+        if not  page_title in self.draw_model_name: 
+            from modelpage import ModelPage
+            panel = ModelPage(self.nb,model, -1)
+            panel.set_manager(self.manager)
+            panel.set_owner(self.event_owner)
+            self.nb.AddPage(page=panel,text=page_title,select=True)
+            panel.populate_box( self.model_list_box)
+            self.draw_model_name.append(page_title)
+           
   
     def get_notebook(self):

sansview/perspectives/fitting/fitproblem.py

@@ -65 +65 @@
         """
         
-        self.model_list[0].model.setParam(name,value)
-        new_model=Model(self.model_list[0].model)
-        self.model_list[0]=new_model
+        self.model_list[0].setParam(name,value)
+       
         
     def reset_model(self,model):

sansview/perspectives/fitting/fitting.py

@@ -74 +74 @@
         self.fit_panel.set_model_list(self.menu_mng.get_model_list())
         owner.Bind(fitpage.EVT_MODEL_BOX,self._on_model_panel)
+        #owner.Bind(modelpage.EVT_MODEL_DRAW,self.draw_model)
       
         return [(id, self.menu1, "Fitting"),(id2, menu2, "Model")]
@@ -154 +155 @@
                     name = 'Fit'
                 try:
-                    page = self.fit_panel.add_page(name)
+                    page = self.fit_panel.add_fit_page(name)
                     page.set_data_name(item)
                     self.page_finder[page]= FitProblem()
@@ -219 +220 @@
             for name in pars:
                 if result.pvec.__class__==numpy.float64:
-                    model.model.setParam(name,result.pvec)
+                    model.setParam(name,result.pvec)
                 else:
-                    model.model.setParam(name,result.pvec[i])
+                    model.setParam(name,result.pvec[i])
                     #print "fitting: i name out[i]", i,name,float(result.pvec[i])
                     i += 1
@@ -255 +256 @@
                     print "fitting: fit in park fitting", p.name, p.value,p.stderr
                     model_name,param_name = self.split_string(p.name)  
-                    print "fitting: simultfit",model.model.name,model_name,param_name ,p.name,param_name,p.value
-                    if model.model.name == model_name:
+                    print "fitting: simultfit",model.name,model_name,param_name ,p.name,param_name,p.value
+                    if model.name == model_name:
                         print "fitting: hello",p.name,param_name,p.value
                         small_out.append(p.value )
                         small_cov.append(p.stderr)
-                        model.model.setParam(param_name,p.value)   
+                        model.setParam(param_name,p.value)   
                 #print "fitting: out of each page",page,small_out,small_cov,data.group_id
                 page.onsetValues(result.fitness, small_out,small_cov)
@@ -408 +409 @@
                     #print "fitter",self.fitter
                     #print "fitting: model name",model.name
-                    self.fitter.set_model(model,model.model.name, self.id, pars) 
+                    self.fitter.set_model(Model(model),model.name, self.id, pars) 
                     self.fitter.set_data(data,self.id,qmin,qmax)
                 else:
@@ -455 +456 @@
             self.page_finder[current_pg].set_theory("Fitness")
             #print "on model",model.name
-            self.page_finder[current_pg].set_model(Model(model),M_name)
+            self.page_finder[current_pg].set_model(model,M_name)
             self.plot_helper(currpage= current_pg,qmin= None,qmax= None)
             sim_page.add_model(self.page_finder)
@@ -503 +504 @@
                 try:
                     tempx = qmin
-                    tempy = model.eval(qmin)
+                    tempy = model.run(qmin)
                     theory.x.append(tempx)
                     theory.y.append(tempy)
@@ -514 +515 @@
                         if data.x[i]> qmin and data.x[i]< qmax:
                             tempx = data.x[i]
-                            tempy = model.eval(tempx)
+                            tempy = model.run(tempx)
                             
                             theory.x.append(tempx) 
@@ -523 +524 @@
                 try:
                     tempx = qmax
-                    tempy = model.eval(qmax)
+                    tempy = model.run(qmax)
                     theory.x.append(tempx)
                     theory.y.append(tempy)
@@ -542 +543 @@
             Plot a theory from a model selected from the menu
         """
+        #name = evt.model.__class__.__name__
+        name="Model View"
+        self.fit_panel.add_model_page(evt.model,name)       
+        self.draw_model(evt.model)
+        
+    def draw_model(self,model):
         x = pylab.arange(0.001, 0.1, 0.001)
         xlen = len(x)
@@ -548 +555 @@
         
         for i in range(xlen):
-            y[i] = evt.model.run(x[i])
+            y[i] = model.run(x[i])
             dy[i] = math.sqrt(math.fabs(y[i]))
         try:
@@ -562 +569 @@
             print "SimView.complete1D: could not import sans.guicomm.events"
 
-
 if __name__ == "__main__":
     i = Plugin()

sansview/perspectives/fitting/simfitpage.py

@@ -1 @@
-
 
 import sys,re,string, wx   
@@ -55 +54 @@
         self.model_list=[]
         self.model_toFit=[]
+        self.page_finder={}
         iy +=1
         self.sizer2.Add((20,20),(iy, ix))
@@ -64 +64 @@
         
     def onFit(self,event):
-         """ signal for fitting"""
-         if len(self.model_toFit) >0 :
-             self.set_model()
-             self.manager._on_simul_fit()
-         else:
-             wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
+        """ signal for fitting"""
+        if len(self.model_toFit) >0 :
+            if len(self.params)>0:
+                self.set_model()
+            else:
+                for page in self.page_finder.iterkeys():
+                    page.set_model_parameter()
+            self.manager._on_simul_fit()
+        else:
+            wx.PostEvent(self.parent.GrandParent, StatusEvent(status=\
                             "Select at least on model to fit "))
     def set_manager(self, manager):
@@ -99 +103 @@
             @param page_finder: the dictionary containing models information
         """
+        import copy 
         self.model_list=[]
         self.model_toFit=[]
         self.sizer1.Clear(True)
+        self.page_finder=page_finder
         ix = 0
         iy = 1 
@@ -179 +185 @@
                 #print "simfitpage: list fitpanel2",list,list[0]
                 model=list[0]
-                param_list=model.model.getParamList()
+                param_list=model.getParamList()
                 #print "simfitpage: on set_model ",self.params
                 if self.params !=[]:
                     for element in self.params:
-                        if model.model.name == str(element[0]):
+                        if model.name == str(element[0]):
                             for item in param_list:
                                 if item==str(element[1]):
@@ -189 +195 @@
                                     #print "simfitpage: model name",element[0], model.name
                                     #print "simfitpage: param name ,param value",element[1],element[2]
-                                    self.manager.set_page_finder(model.model.name,element[1],\
+                                    self.manager.set_page_finder(model.name,element[1],\
                                                                  str(element[2]))
                             #print "simfitpage:on set_model page 2",model.params['A'],self.params[2]
-                
+    
                 
     def _onTextEnter(self,event):