Changeset bb18ef1 in sasview for sansview/perspectives/fitting/fitpanel.py

Timestamp:

Mar 18, 2009 11:41: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:

35eeea8

Parents:

8cfdd5e

Message:

some changes of sansview review

File:

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

sansview/perspectives/fitting/fitpanel.py

@@ -33 +33 @@
         #Creating the default page --welcomed page
         self.about_page=None
-        from welcome_panel import PanelAbout
+        from sans.guiframe.welcome_panel import PanelAbout
         self.about_page = PanelAbout(self, -1)
         self.AddPage(self.about_page,"welcome!")
@@ -40 +40 @@
         #dictionary of miodel {model class name, model class}
         self.model_list_box={}
+        ## list of structure factor
+        self.struct_list_box=[]
         # save the title of the last page tab added
         self.fit_page_name=[]
@@ -101 +103 @@
             @param owner: the class responsible of plotting
         """
-        self.event_owner = owner
+        self.event_owner=owner
         
     def add_sim_page(self):
@@ -126 +128 @@
         if not name in self.fit_page_name :
             from fitpage1D import FitPage1D
-            panel = FitPage1D(parent=self,data=data, id=-1)
+            panel = FitPage1D(self,data, -1)
             panel.name=name
             
@@ -149 +151 @@
         """
         from modelpage import ModelPage
-        
+        #print "fitpanel model", model
         panel = ModelPage(self,model,page_title, -1)
         panel.set_manager(self.manager)
@@ -169 +171 @@
         self.manager.draw_model(model, page_title)
         
+    def new_help_add_model_page(self,model,description,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
+        """
+        ## storing page info
+        from pageInfo import  PageInfo
+        myinfo = PageInfo( self, model )
+        myinfo.model_list_box = self.model_list_box
+        from modelpage import ModelPage
+        
+        panel = ModelPage(self,myinfo,page_title)
+        panel.set_manager(self.manager)
+        panel.set_owner(self.event_owner)
+        
+        
+        self.AddPage(page=panel,caption="Model",select=True)
+        panel.populate_box( self.model_list_box)
+        panel.name = page_title
+        self.draw_model_name=page_title
+        self.model_page_number=self.GetSelection()
+        self.model_page=self.GetPage(self.GetSelection())
+        
+        
+        # Set the range used to plot models
+        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, page_title)
+     
         
     def add_model_page(self,model,description,page_title, qmin=0, qmax=0.1, npts=50, topmenu=False):
@@ -193 +230 @@
             @return the current page selected
         """
+        #return self.nb.GetCurrentPage()
         return self.GetPage(self.GetSelection() )
   
-   
+    
+     
     def set_model_list(self,dict):
          """