Changeset c9a4377 in sasview for sansview/perspectives/fitting

Timestamp:

Mar 30, 2009 2:26:12 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:

d16e396

Parents:

6355f4d

Message:

plotting range fixed

Location:

sansview/perspectives/fitting

Files:

• fitpage.py (modified) (1 diff)
• fitpanel.py (modified) (6 diffs)
• fitting.py (modified) (4 diffs)
• model_thread.py (modified) (1 diff)
• modelpage.py (modified) (1 diff)
• pageInfo.py (modified) (2 diffs)

sansview/perspectives/fitting/fitpage.py

@@ -371 +371 @@
             return the fitting range
         """
-        return self.qmin_x , self.qmax_x
+        return float(self.qmin_x) , float(self.qmax_x)
         
     def get_param_list(self):

sansview/perspectives/fitting/fitpanel.py

@@ -62 +62 @@
         """
         page_info=self.get_current_page().page_info.clone()
-        self.manager._add_page_onmenu("Model", page_info)
+        page_info.page_name= self.get_current_page().page_info.page_name
+       
+        self.manager._add_page_onmenu(page_info.page_name, page_info)
         
         selected_page = self.GetPage(self.GetSelection())
@@ -152 +154 @@
         
         if not name in self.fit_page_name :
+            
             from fitpage import FitPage
             panel = FitPage(parent= self, page_info=myinfo, name=name )
-            panel.name=name
+            panel.name = name
             panel.window_name= "fitpage"
             panel.set_manager(self.manager)
@@ -167 +170 @@
             return None 
         
-    def _help_add_model_page(self,model,description,page_title, qmin=0, qmax=0.1, npts=50):
+    def _help_add_model_page(self,model,page_title, qmin=0, qmax=0.1, npts=50):
         """
             #TODO: fill in description
@@ -205 +208 @@
      
         
-    def add_model_page(self,model,description,page_title, qmin=0, qmax=0.1, npts=50, topmenu=False):
+    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.
@@ -212 +215 @@
             @param model: the model for which paramters will be changed
             @param page_title: the name of the page
-            @param description: [Coder: fill your description!]
             @param page_title: [Coder: fill your description!]
             @param qmin: mimimum Q
@@ -220 +222 @@
         if topmenu==True:
             if  self.draw_model_name ==None:
-                self._help_add_model_page(model,description,page_title, qmin=qmin, qmax=qmax, npts=npts)
+                self._help_add_model_page(model,page_title, qmin=qmin, qmax=qmax, npts=npts)
             else:
                 self.model_page.select_model(model, page_title)

sansview/perspectives/fitting/fitting.py

@@ -383 +383 @@
         ## if simultaneous fit change automatically the engine to park
         if fitproblem_count >1:
+            self.menu1.FindItemByPosition(1).Check(True)
+            self.menu1.FindItemByPosition(0).Check(False)
             self._on_change_engine(engine='park')
+            
         from sans.fit.Fitting import Fit
         self.fitter= Fit(self._fit_engine)
         
         if self._fit_engine=="park":
-            engineType="Simutaneous Fit"
+            engineType="Simultaneous Fit"
         else:
             engineType="Single Fit"
@@ -459 +462 @@
             reopen a closed page
         """
-        print "reopen"
+        if event.GetId() in self.closed_page_dict.keys():
+            page_info= self.closed_page_dict[ event.GetId() ]
+            if page_info.page_name !="Model Page":
+                page = self.fit_panel.add_fit_page(page_info.data)
+            else:
+                model= page_info.model
+                self.fit_panel.add_model_page(model,model.name,topmenu=True)
         
     def _reset_schedule_problem(self, value=0):
@@ -740 +749 @@
             # save the name containing the data name with the appropriate model
             self.page_finder[current_pg].set_model(model)
+            qmin, qmax= current_pg.get_range()
+            self.page_finder[current_pg].set_range(qmin=qmin, qmax=qmax)
+           
             # save model name
-            self.draw_model( model=model, data= metadata)
+            self.draw_model( model=model, data= metadata, qmin=qmin, qmax=qmax)
             
             if self.sim_page!=None:
@@ -756 +768 @@
         if hasattr(evt.model, "name"):
             name = evt.model.name
-        model=evt.model
-        description=model.description
-        
+        model = evt.model
+     
         # 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)
+        self.fit_panel.add_model_page(model,name,topmenu=True)
     
    

sansview/perspectives/fitting/model_thread.py

@@ -109 +109 @@
         y = self.y
         output = numpy.zeros((len(x),len(y)))
-        
         if self.qmin==None:
             self.qmin = 0

sansview/perspectives/fitting/modelpage.py

@@ -30 +30 @@
         """
         self.name ="Model"
+        page_info.page_name= "Model Page"
         self._fill_model_sizer( self.sizer1)  
         self._fill_range_sizer() 

sansview/perspectives/fitting/pageInfo.py

@@ -30 +30 @@
         # Event_owner is the owner of model event
         self.event_owner = None
-      
+        ##page name
+        self.page_name=""
         # Contains link between  model ,all its parameters, and panel organization
         self.parameters=[]
@@ -54 +55 @@
         self.qmax=None
         self.npts=None
-        ##page name
-        self.page_name=""
+