Changeset 89032bf in sasview

Timestamp:

Jan 22, 2009 2:32:50 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:

fd57185

Parents:

50cbace

Message:

fitting model2D plot on the separate new panel

Location:

sansview/perspectives/fitting

Files:

• fitpage1D.py (modified) (4 diffs)
• fitting.py (modified) (13 diffs)
• modelpage.py (modified) (2 diffs)
• testfitpage1D.py (deleted)

sansview/perspectives/fitting/fitpage1D.py

@@ -379 +379 @@
         self.text2_4.Hide()
         print "keys", keys
+        print "disp_list", disp_list
+        print "fix_list",fixed
         for item in keys:
             if not item in disp_list:
@@ -444 +446 @@
                     im += 1
             #save data
+            
             self.parameters.append([cb,ctl1,text2,ctl2])
                 
@@ -577 +580 @@
             if item[0].GetValue()==True:
                 list= [item[0],item[1],item[2],item[3]]
-                self.param_toFit.append(list )  
+                if not (list  in self.param_toFit):
+                    self.param_toFit.append(list )  
             else:
                 if item in self.param_toFit:
@@ -592 +596 @@
             self.xmin.Enable()
             self.xmax.Enable()
-  
+       
    
        

sansview/perspectives/fitting/fitting.py

@@ -261 +261 @@
           
         """
+        #print "single fit ", pars,result.pvec,result.stderr,result.fitness
         #self.done = True
         #wx.PostEvent(self.parent, StatusEvent(status="Fitting Completed: %g" % elapsed))
@@ -271 +272 @@
                     break
             i = 0
-#            print "fitting: single fit pars ", pars
+            #print "fitting: single fit pars ", pars
             for name in pars:
                 if result.pvec.__class__==numpy.float64:
@@ -284 +285 @@
             
             cpage.onsetValues(result.fitness, result.pvec,result.stderr)
-            self.plot_helper(currpage=cpage,qmin=qmin,qmax=qmax,ymin=ymin, ymax=ymax)
+            self.plot_helper(currpage=cpage,qmin=qmin,qmax=qmax,ymin=ymin, ymax=ymax, title="Fitted model 2D ")
         except:
-            raise
+            #raise
             wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
             
@@ -361 +362 @@
                         pars.append(str(element[0].GetLabelText()))
                     pars.sort()
+                    #print "single fit start pars:", pars
                     #Do the single fit
                     self.fitter.set_model(Model(model), self.id, pars) 
@@ -370 +372 @@
                     self.schedule_for_fit( 0,value) 
                 except:
+                    #raise 
                     wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
                     return
@@ -397 +400 @@
            
         except:
-            raise
+            #raise
             wx.PostEvent(self.parent, StatusEvent(status="Single Fit error: %s" % sys.exc_value))
             return
@@ -455 +458 @@
                     self.id += 1 
             except:
+                #raise
                 wx.PostEvent(self.parent, StatusEvent(status="Fitting error: %s" % sys.exc_value))
                 return 
@@ -475 +479 @@
             
         except:
+            #raise
             wx.PostEvent(self.parent, StatusEvent(status="Simultaneous Fitting error: %s" % sys.exc_value))
             return
@@ -539 +544 @@
         self.plot_helper(currpage=page,qmin= qmin,qmax= qmax)
         
-    def plot_helper(self,currpage, fitModel=None, qmin=None,qmax=None,ymin=None,ymax=None):
+    def plot_helper(self,currpage, fitModel=None, qmin=None,qmax=None,
+                    ymin=None,ymax=None, title=None ):
         """
             Plot a theory given a model and data
@@ -596 +602 @@
                 
             else:
+               
                 theory=Data2D(data.data, data.err_data)
                 theory.name= model.name
-                theory.id= "Model"
-                theory.group_id= "Model"+data.name
+                if title !=None:
+                    self.title = title
+                    theory.id= self.title
+                    theory.group_id= self.title+data.name
+                else:
+                    self.title= "Analytical model 2D "
+                    theory.id= "Model"
+                    theory.group_id= "Model"+data.name
                 theory.x_bins= data.x_bins
                 theory.y_bins= data.y_bins
@@ -632 +645 @@
         
         wx.PostEvent(self.parent, NewPlotEvent(plot=theory,
-                                                title="Analytical model %s"%str(data.name)))
+                                                title=self.title +str(data.name)))
         
         
@@ -742 +755 @@
         theory.ymax= qmax
         
-        print "model draw comptele xmax",theory.xmax
+        print "model draw comptele xmax",theory.xmax,model.name
         wx.PostEvent(self.parent, NewPlotEvent(plot=theory,
-                         title="Analytical model 2D %s" %str(model.name), reset=True))
+                         title="Analytical model 2D " ))
          
         
@@ -775 +788 @@
             self.calc_thread.queue()
             self.calc_thread.ready(2.5)
+            
+    def show_panel2D(self, id=None ):
+        self.parent.show_panel(147)
            
    

sansview/perspectives/fitting/modelpage.py

@@ -208 +208 @@
             self.enable2D=True
             self._draw_model()
+            
         else:
-            self.manager.menu1.Append(event_id, new_panel.window_caption, 
-                         "Show %s plot panel" % new_panel.window_caption)
+            print "enable is true:",self.enable2D
+            #self.manager.parent. show_panel(147)
+            self.manager.show_panel2D( id=None )
+            #self.manager.menu1.Append(event_id, new_panel.window_caption, 
+            #             "Show %s plot panel" % new_panel.window_caption)
             
     def populate_box(self, dict):
@@ -263 +267 @@
                 self.name= name
                 #self.manager.draw_model(model, name)
+                self.enable2D=False
                 self._draw_model()