Changeset b2c3225 in sasview

Timestamp:

Dec 11, 2008 4:02:55 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:

2d107b8

Parents:

768656e

Message:

fix small bugs

Location:

sansview

Files:

• docs/miniview2_create_page.vsd (modified) (previous)
• docs/miniview2_simultaneous_fit.vsd (modified) (previous)
• docs/miniview2_single_fit.vsd (modified) (previous)
• docs/packages.vsd (added)
• docs/plotting package.vsd (added)
• docs/sansview-plot.vsd (added)
• docs/sansviewfit.vsd (added)
• perspectives/fitting/fitpanel.py (modified) (1 diff)
• perspectives/fitting/fitting.py (modified) (3 diffs)
• perspectives/fitting/modelpage.py (modified) (1 diff)

sansview/perspectives/fitting/fitpanel.py

@@ -104 +104 @@
         """
         if  page_title !=self.draw_model_name or self.draw_model_name ==None: 
+            self.onClose()
             from modelpage import ModelPage
             panel = ModelPage(self.nb,model, -1)

sansview/perspectives/fitting/fitting.py

@@ -36 +36 @@
         ## Fit engine
         self._fit_engine = 'scipy'
+        self.enable_model2D=False
         # Log startup
         logging.info("Fitting plug-in started")   
@@ -57 +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()
@@ -570 +575 @@
             Plot a theory from a model selected from the menu
         """
+        
+        model=evt.model()
         name="Model View"
-        model=evt.model()
-        
+        print "mon menu",model.name
         description=model.description
-        self.fit_panel.add_model_page(model,description,name)       
-        self.draw_model(model)
-        
-    def draw_model(self,model):
+        #self.fit_panel.add_model_page(model,description,model.name)   
+        self.fit_panel.add_model_page(model,description,name)          
+        self.draw_model(model,self.enable_model2D)
+        
+    def draw_model(self,model,enable2D=False):
         """
              draw model with default data value
         """
-        x = numpy.arange(0.001, 0.1, 0.001)
+        x = numpy.arange(0.001, 1.0, 0.001)
         xlen = len(x)
         y = numpy.zeros(xlen)
-        
-        for i in range(xlen):
-            y[i] = model.run(x[i])
-
-        try:
-            new_plot = Theory1D(x, y)
-            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"))
-        except:
-            raise
+        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):
+        """
+             plot view model 2D
+        """
+        
+        if self.enable_model2D== True:
+            self.enable_model2D=False
+        else:
+            self.enable_model2D=True
+        print "self.enable_model2D",self.enable_model2D
 if __name__ == "__main__":
     i = Plugin()

sansview/perspectives/fitting/modelpage.py

@@ -171 +171 @@
                 model=items
                 print "fitpage: _on_select_model model name",name ,event.GetString()
+                self.model= model
                 self.manager.draw_model(model)
                 self.set_panel(model)