Changeset 3dc83be in sasview for sansview/perspectives/fitting/fitting.py

Timestamp:

Jan 18, 2009 12:20:09 PM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

a2c38de

Parents:

3f1af74

Message:

Fix model change bug. Models can now be selected from the top menu or the model page menu with the same result. The 2D plot, if enabled, will also be correctly updated.

File:

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

sansview/perspectives/fitting/fitting.py

@@ -642 +642 @@
             name = evt.model.name
         model=evt.model()
-        #name="Model View"
-        #print "mon menu",model.name
         description=model.description
-        #self.fit_panel.add_model_page(model,description,name)  
-    
-        self.draw_model(model=model,name=name)
+        
+        # Create a model page. If a new page is created, the model
+        # will be plotted automatically. If a page already exists,
+        # the content will be updated and the plot refreshed
+        self.fit_panel.add_model_page(model,description,name,topmenu=True)
         
     def draw_model(self,model,name ,description=None,enable1D=True, enable2D=False,
@@ -654 +654 @@
              draw model with default data value
         """
-        
-        self.fit_panel.add_model_page(model=model,description=model.description,page_title=name,
-                                      qmin=qmin, qmax=qmax, npts=qstep) 
         self._draw_model2D(model=model,
                            description=model.description,
@@ -702 +699 @@
                     new_plot.id ="Model"
                     new_plot.group_id ="Model"
+                    
+                    # Pass the reset flag to let the plotting event handler
+                    # know that we are replacing the whole plot
                     wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot,
-                                     title="Analytical model 1D " ))
+                                     title="Analytical model 1D ", reset=True ))
                     
                 except:
@@ -742 +742 @@
         print "model draw comptele xmax",theory.xmax
         wx.PostEvent(self.parent, NewPlotEvent(plot=theory,
-                         title="Analytical model 2D %s" %str(model.name)))
+                         title="Analytical model 2D %s" %str(model.name), reset=True))