Changeset 3dc83be in sasview for sansview/perspectives/fitting/fitpanel.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/fitpanel.py (modified) (3 diffs)

sansview/perspectives/fitting/fitpanel.py

@@ -115 +115 @@
         panel.set_manager(self.manager)
         panel.set_owner(self.event_owner)
-        self.nb.AddPage(page=panel,text=page_title,select=True)
+        #self.nb.AddPage(page=panel,text=page_title,select=True)
+        self.nb.AddPage(page=panel,text="Model",select=True)
         panel.populate_box( self.model_list_box)
         self.draw_model_name=page_title
@@ -125 +126 @@
         self.model_page.set_range(qmin, qmax, npts)
         
-        
-    def add_model_page(self,model,description,page_title, qmin=0, qmax=0.1, npts=50):
+        # We just created a model page, we are ready to plot the model
+        self.manager.draw_model(model, model.name)
+        
+        
+    def add_model_page(self,model,description,page_title, qmin=0, qmax=0.1, npts=50, topmenu=False):
         """
             Add a model page only one  to display any model selected from the menu or the page combo box.
@@ -141 +145 @@
         if  self.draw_model_name ==None:
             self._help_add_model_page(model,description,page_title, qmin=qmin, qmax=qmax, npts=npts)
-        else:
-            if  self.draw_model_name !=page_title: 
-                self.onClose(self.model_page, self.model_page_number)
-                self._help_add_model_page(model,description,page_title, qmin=qmin, qmax=qmax, npts=npts)
-      
+        elif topmenu==True:
+            self.model_page.select_model(model)
            
     def get_notebook(self):