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

Timestamp:

Dec 12, 2008 3:13:10 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:

3aae6b6

Parents:

2d107b8

Message:

scroll bars and model2d view added—bug?

File:

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

sansview/perspectives/fitting/fitting.py

@@ -58 +58 @@
         #menu for model
         menu2 = wx.Menu()
-        id4 = wx.NewId()
-        menu2.AppendCheckItem(id4, "model view 2D") 
-        wx.EVT_MENU(owner, id4, self.on_draw_model2D)
-        
+    
         self.menu_mng.populate_menu(menu2, owner)
         id2 = wx.NewId()
@@ -351 +348 @@
             result=self.fitter.fit()
             #self._single_fit_completed(result,pars,current_pg,qmin,qmax)
-            print "single_fit: result",result.fitness,result.pvec,result.stderr
+            #print "single_fit: result",result.fitness,result.pvec,result.stderr
             #self._single_fit_completed(result,pars,page,qmin,qmax)
             self._single_fit_completed(result,pars,page_fitted,qmin,qmax,ymin,ymax)
@@ -577 +574 @@
         
         model=evt.model()
-        name="Model View"
-        print "mon menu",model.name
+        #name="Model View"
+        #print "mon menu",model.name
         description=model.description
-        #self.fit_panel.add_model_page(model,description,model.name)   
-        self.fit_panel.add_model_page(model,description,name)          
+        #self.fit_panel.add_model_page(model,description,name)   
+            
         self.draw_model(model,self.enable_model2D)
         
-    def draw_model(self,model,enable2D=False):
+    def draw_model(self,model,description=None, enable2D=False,qmin=None, qmax=None):
         """
              draw model with default data value
         """
-        x = numpy.arange(0.001, 1.0, 0.001)
-        xlen = len(x)
-        y = numpy.zeros(xlen)
-        if not enable2D:
-            for i in range(xlen):
-                y[i] = model.run(x[i])
-    
-            try:
-                new_plot = Theory1D(x, y)
-                new_plot.name = model.name
-                #new_plot.name = "Model"
-                new_plot.xaxis("\\rm{Q}", 'A^{-1}')
-                new_plot.yaxis("\\rm{Intensity} ","cm^{-1}")
-                 
-                new_plot.group_id ="Fitness"
-                wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Analytical model 1D"))
-                
-            except:
-                raise
+        self.fit_panel.add_model_page(model,model.description,model.name) 
+        #x = numpy.arange(0.001, 1.0, 0.001)
+        #y = numpy.arange(0.001, 1.0, 0.001)
+        x = numpy.arange(-0.05, 0.05, 0.001)
+        y = numpy.arange(-0.05, 0.05, 0.001)
+        print "went here ",enable2D
+        if enable2D:
+            data=numpy.zeros([len(x),len(y)])
+            for i in range(len(y)):
+                for j in range(len(x)):
+                    data[i][j]=model.runXY([j,i])
+            theory = Theory2D(data)  
+            theory.group_id =str(model.name)+" 2D"
+            theory.xmin=-0.05
+            theory.xmax= 0.05
+            theory.ymin= -0.05
+            theory.ymax= 0.05
+            wx.PostEvent(self.parent, NewPlotEvent(plot=theory, title="Analytical model 2D"))
         else:
-            for i in range(xlen):
-                y[i] = model.run(x[i])
-    
-            try:
-                new_plot = Theory1D(x, y)
-                new_plot.name = model.name
-                #new_plot.name = "Model"
-                new_plot.xaxis("\\rm{Q}", 'A^{-1}')
-                new_plot.yaxis("\\rm{Intensity} ","cm^{-1}")
-                 
-                new_plot.group_id ="Fitness"
-                wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Analytical model 1D"))
-                
-            except:
-                raise
+            x = numpy.arange(0.001, 1.0, 0.001)        
+            xlen= len(x)
+            y = numpy.zeros(xlen)
+            if not enable2D:
+                for i in range(xlen):
+                    y[i] = model.run(x[i])
+        
+                try:
+                    new_plot = Theory1D(x, y)
+                    #new_plot.name = model.name
+                    new_plot.name = "Model"
+                    new_plot.xaxis("\\rm{Q}", 'A^{-1}')
+                    new_plot.yaxis("\\rm{Intensity} ","cm^{-1}")
+                     
+                    new_plot.group_id ="Fitness"
+                    wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Analytical model 1D"))
+                    
+                except:
+                    raise
+            else:
+                for i in range(xlen):
+                    y[i] = model.run(x[i])
+        
+                try:
+                    new_plot = Theory1D(x, y)
+                    new_plot.name = model.name
+                    #new_plot.name = "Model"
+                    new_plot.xaxis("\\rm{Q}", 'A^{-1}')
+                    new_plot.yaxis("\\rm{Intensity} ","cm^{-1}")
+                     
+                    new_plot.group_id ="Fitness"
+                    wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Analytical model 1D"))
+                    
+                except:
+                    raise
     def on_draw_model2D(self, event):
         """