Changeset 9853ad0 in sasview for sansview/perspectives/fitting/fitpanel.py

Timestamp:

Mar 31, 2009 11:50:18 AM (15 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:

59a7f2d

Parents:

a68efd1

Message:

setting default model value on combobox

File:

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

sansview/perspectives/fitting/fitpanel.py

@@ -61 +61 @@
              close page and remove all references to the closed page
         """
-        page_info=self.get_current_page().page_info.clone()
-        page_info.page_name= self.get_current_page().page_info.page_name
-       
-        self.manager._add_page_onmenu(page_info.page_name, page_info)
+        page_info = self.get_current_page().page_info.clone()
+        page_info.page_name = self.get_current_page().page_info.page_name
+        page_finder = self.manager.get_page_finder() 
+        fitproblem = None
+        
+        if self.get_current_page() in page_finder:
+            fitproblem= page_finder[self.get_current_page()]
+            
+        self.manager._add_page_onmenu(page_info.page_name, page_info, fitproblem)
         
         selected_page = self.GetPage(self.GetSelection())
         page_number = self.GetSelection()
+        
         if self.sim_page != selected_page and selected_page!=self.about_page:
-            #remove that page from page_finder of fitting module
-            page_finder=self.manager.get_page_finder() 
-            for page, value in page_finder.iteritems():
-                if page==selected_page:
-                    del page_finder[page]
-                    break
             # remove the check box link to the model name of this page (selected_page)
             if self.sim_page !=None :
@@ -86 +86 @@
                 self.draw_model_name=None
                 self.model_page=None
+                
             if  page_number == 1:
                 self.model_page=None
@@ -170 +171 @@
             return None 
         
-    def _help_add_model_page(self,model,page_title, qmin=0, qmax=0.1, npts=50):
-        """
-            #TODO: fill in description
-            
+   
+    def add_model_page(self,model,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.
+            when this page is closed than the user will be able to open a new one
+            
+            @param model: the model for which paramters will be changed
+            @param page_title: the name of the page
+            @param page_title: [Coder: fill your description!]
             @param qmin: mimimum Q
             @param qmax: maximum Q
             @param npts: number of Q points
         """
+        if topmenu==True:
+            if  self.draw_model_name ==None:
+                self._help_add_model_page(model,page_title, qmin=qmin, qmax=qmax, npts=npts)
+            else:
+                self.model_page.select_model(model, page_title)
+        else:
+            self._create_model_page(model,page_title, qmin=qmin, qmax=qmax, npts=npts)
+          
+    def _help_add_model_page(self,model,page_title, qmin=0, qmax=0.1, npts=50):
+        """
+            #TODO: fill in description
+            
+            @param qmin: mimimum Q
+            @param qmax: maximum Q
+            @param npts: number of Q points
+        """
+        self._create_model_page(model,page_title,qmin=qmin, qmax=qmax, npts=npts)
+        # We just created a model page, we are ready to plot the model
+        #self.manager.draw_model(model, model.name)
+        #FOR PLUGIN  for some reason model.name is = BASEcomponent
+        self.manager.draw_model(model)
+    
+    def _create_model_page(self,model,page_title, qmin, qmax, npts):
+        """
+        adding model page occurs here
+        """
+       
         ## storing page info
         from pageInfo import  PageInfo
@@ -201 +234 @@
         self.model_page.set_range(qmin, qmax, npts)
         
-        # We just created a model page, we are ready to plot the model
-        #self.manager.draw_model(model, model.name)
-        #FOR PLUGIN  for some reason model.name is = BASEcomponent
-        self.manager.draw_model(model)
-        
-     
-        
-    def add_model_page(self,model,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.
-            when this page is closed than the user will be able to open a new one
-            
-            @param model: the model for which paramters will be changed
-            @param page_title: the name of the page
-            @param page_title: [Coder: fill your description!]
-            @param qmin: mimimum Q
-            @param qmax: maximum Q
-            @param npts: number of Q points
-        """
-        if topmenu==True:
-            if  self.draw_model_name ==None:
-                self._help_add_model_page(model,page_title, qmin=qmin, qmax=qmax, npts=npts)
-            else:
-                self.model_page.select_model(model, page_title)
-          
-   
+