Changeset dd2c2ea3 in sasview

Timestamp:

Oct 18, 2009 12:56:41 AM (15 years ago)

Author:

Jae Cho <jhjcho@…>

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:

1ea3488

Parents:

8d143e8

Message:

This fixes one of Fit problem on MAC.

File:

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

sansview/perspectives/fitting/fitting.py

@@ -373 +373 @@
             @param smearer: smear object to allow smearing data
         """   
-        current_pg=self.fit_panel.get_current_page()
-        self.page_finder[current_pg].set_smearer(smearer)
+        self.current_pg=self.fit_panel.get_current_page()
+        self.page_finder[self.current_pg].set_smearer(smearer)
         ## draw model 1D with smeared data
-        data =  self.page_finder[current_pg].get_plotted_data()
-        model = self.page_finder[current_pg].get_model()
+        data =  self.page_finder[self.current_pg].get_plotted_data()
+        model = self.page_finder[self.current_pg].get_model()
         ## if user has already selected a model to plot
         ## redraw the model with data smeared
         
-        smear =self.page_finder[current_pg].get_smearer()
+        smear =self.page_finder[self.current_pg].get_smearer()
         if model!= None:
             self.draw_model( model=model, data= data, smearer= smear,
@@ -440 +440 @@
             
         fproblemId = 0
-        current_pg=None
+        self.current_pg=None
         for page, value in self.page_finder.iteritems():
             try:
@@ -452 +452 @@
                         pars.append(name)
                     #Set Engine  (model , data) related to the page on 
-                    self._fit_helper( current_pg=page, value=value,pars=pars,
+                    self._fit_helper( value=value,pars=pars,
                                       id=fproblemId, title= engineType ) 
                     fproblemId += 1 
-                    current_pg= page
+                    self.current_pg= page
             except:
                 msg= "%s error: %s" % (engineType,sys.exc_value)
@@ -472 +472 @@
             ## perform single fit
             if self._fit_engine=="scipy":
-                qmin, qmax= current_pg.get_range()
+                qmin, qmax= self.current_pg.get_range()
                 self.calc_fit=FitThread(parent =self.parent,
                                         fn= self.fitter,
-                                       cpage=current_pg,
+                                       cpage=self.current_pg,
                                        pars= pars,
                                        completefn= self._single_fit_completed,
@@ -575 +575 @@
             fitproblem.schedule_tofit(value)
             
-    def _fit_helper(self,current_pg,pars,value, id, title="Single Fit " ):
+    def _fit_helper(self,pars,value, id, title="Single Fit " ):
         """
             helper for fitting
@@ -921 +921 @@
             return
         model.origin_name = model.name
-        current_pg = self.fit_panel.get_current_page() 
+        self.current_pg = self.fit_panel.get_current_page() 
         ## make sure nothing is done on self.sim_page
         ## example trying to call set_panel on self.sim_page
-        if current_pg != self.sim_page :
+        if self.current_pg != self.sim_page :
            
-            if self.page_finder[current_pg].get_model()== None :
+            if self.page_finder[self.current_pg].get_model()== None :
                 
                 model.name="M"+str(self.index_model)
                 self.index_model += 1  
             else:
-                model.name= self.page_finder[current_pg].get_model().name
-                
-            metadata = self.page_finder[current_pg].get_plotted_data()
+                model.name= self.page_finder[self.current_pg].get_model().name
+                
+            metadata = self.page_finder[self.current_pg].get_plotted_data()
             
             # 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)
-            smearer=  self.page_finder[current_pg].get_smearer()
+            self.page_finder[self.current_pg].set_model(model)
+            qmin, qmax= self.current_pg.get_range()
+            self.page_finder[self.current_pg].set_range(qmin=qmin, qmax=qmax)
+            smearer=  self.page_finder[self.current_pg].get_smearer()
             # save model name
             self.draw_model( model=model,smearer=smearer,