Changeset 32d802f in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Jan 22, 2009 4:44:45 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:

fcd8a80e

Parents:

fd57185

Message:

plotted the result from fit 2D on a separate plot

File:

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

sansview/perspectives/fitting/fitting.py

@@ -7 +7 @@
 from danse.common.plottools.PlotPanel import PlotPanel
 from sans.guicomm.events import NewPlotEvent, StatusEvent  
-from sans.guicomm.events import EVT_SLICER_PANEL
+from sans.guicomm.events import EVT_SLICER_PANEL,EVT_MODEL2D_PANEL
 
 from sans.fit.AbstractFitEngine import Model,Data,FitData1D,FitData2D
@@ -51 +51 @@
         # Log startup
         logging.info("Fitting plug-in started")   
+        # model 2D view
+        self.model2D_id=None
 
     def populate_menu(self, id, owner):
@@ -59 +61 @@
             @ return : list of information to populate the main menu
         """
+        self.parent.Bind(EVT_MODEL2D_PANEL, self._on_model2D_show)
         #Menu for fitting
         self.menu1 = wx.Menu()
@@ -131 +134 @@
         self.index_model = 0
         self.parent.Bind(EVT_SLICER_PANEL, self._on_slicer_event)
+        
         #create the fitting panel
         #return [self.fit_panel]
@@ -136 +140 @@
         self.mypanels.append(self.fit_panel)
         return self.mypanels
+    def _on_model2D_show(self, event ):
+        print "model2D get the id ", event.id
     def _on_slicer_event(self, event):
         print "fitting:slicer event ", event.panel
@@ -508 +514 @@
         model = evt.model
         name = evt.name
+        
         sim_page=self.fit_panel.get_page(0)
         current_pg = self.fit_panel.get_current_page() 
@@ -599 +606 @@
                 except:
                     wx.PostEvent(self.parent, StatusEvent(status="fitting \
-                        skipping point x %g %s" %(qmax, sys.exc_value)))
-                
+                        skipping point x %g %s" %(qmin, sys.exc_value)) )
+                wx.PostEvent(self.parent, NewPlotEvent(plot=theory,
+                                                title=str(data.name)))
             else:
                
@@ -644 +652 @@
                 theory.ymax= ymax
         
-        wx.PostEvent(self.parent, NewPlotEvent(plot=theory,
+                wx.PostEvent(self.parent, NewPlotEvent(plot=theory,
                                                 title=self.title +str(data.name)))
         
@@ -655 +663 @@
         if hasattr(evt.model, "name"):
             name = evt.model.name
+        print "on model menu", name
         model=evt.model()
         description=model.description
@@ -693 +702 @@
                 try:
                     new_plot = Theory1D(x, y)
+                    
                     new_plot.name = name
                     new_plot.xaxis("\\rm{Q}", 'A^{-1}')
@@ -699 +709 @@
                     new_plot.group_id ="Model"
                     wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Analytical model 1D"))
-                    
                 except:
-                    raise
+                    wx.PostEvent(self.parent, StatusEvent(status="Draw model 1D error: %s" % sys.exc_value))
+                    #raise
             else:
                 for i in range(xlen):
@@ -708 +718 @@
                 try:
                     new_plot = Theory1D(x, y)
+                    print "draw model 1D", name
                     new_plot.name = name
                     new_plot.xaxis("\\rm{Q}", 'A^{-1}')
@@ -720 +731 @@
                     
                 except:
-                    raise
+                    #raise
+                    wx.PostEvent(self.parent, StatusEvent(status="Draw model 1D error: %s" % sys.exc_value))
     def update(self, output,time):
         pass
@@ -757 +769 @@
         print "model draw comptele xmax",theory.xmax,model.name
         wx.PostEvent(self.parent, NewPlotEvent(plot=theory,
-                         title="Analytical model 2D " ))
+                         title="Analytical model 2D ", reset=True ))
          
         
@@ -790 +802 @@
             
     def show_panel2D(self, id=None ):
-        self.parent.show_panel(147)
+        self.parent.show_panel(self.model2D_id)