Changeset 3370922 in sasview

Timestamp:

Apr 16, 2009 11:11:03 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:

54c21f50

Parents:

847091f

Message:

restore smearer info state

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (5 diffs)
• fitpage.py (modified) (3 diffs)
• fitting.py (modified) (2 diffs)
• pagestate.py (modified) (2 diffs)

sansview/perspectives/fitting/basepage.py

@@ -4 +4 @@
 import numpy
 import time
-
+import copy 
 from sans.guiframe.utils import format_number,check_float
 from sans.guicomm.events import StatusEvent   
@@ -443 +443 @@
         if hasattr(self,"enable_disp"):
             self.state.enable_disp= self.enable_disp.GetValue()
-            
+        
+        self.state.smearer = copy.deepcopy(self.smearer)
         if hasattr(self,"enable_smearer"):
-            self.state.enable_smearer = self.enable_smearer.GetValue()   
+            self.state.enable_smearer = copy.deepcopy(self.enable_smearer.GetValue())
             
         if hasattr(self,"disp_box"):
@@ -472 +473 @@
         self.model= self.state.model
         self.data = self.state.data
+        self.smearer= self.state.smearer
+        self.state.enable_smearer=state.enable_smearer
        
         ##model parameter values restore
@@ -483 +486 @@
             self.disp_box.SetSelection(self.state.disp_box)  
         self._set_dipers_Param(event=None)
-       
+        ##plotting range restore    
+        self._reset_plotting_range()
         ## smearing info  restore
         if hasattr(self,"enable_smearer"):
+            ## set smearing value whether or not the data contain the smearing info
             self.enable_smearer.SetValue(state.enable_smearer)
-         ## reset state of checkbox,textcrtl  and parameters value
-       
-        ##plotting range restore    
-        self._reset_plotting_range()
+            self.compute_chisqr(smearer= self.smearer)  
+            
         ## reset context menu items
         self._reset_context_menu()
-       
+        ## reset state of checkbox,textcrtl  and parameters value
         self._reset_parameters_state(self.parameters,state.parameters)
         self._reset_parameters_state(self.fittable_param,state.fittable_param)
@@ -803 +806 @@
         """
         if self.model !=None:
+            
             self.manager.draw_model(self.model, data=self.data,
+                                    smearer= self.smearer,
                                     qmin=float(self.qmin_x), qmax=float(self.qmax_x),
                                     qstep= float(self.num_points),

sansview/perspectives/fitting/fitpage.py

@@ -610 +610 @@
             are compute when fitting
         """
-        
+        temp_smearer = None
         if self.enable_smearer.GetValue():
             msg=""
@@ -624 +624 @@
                 wx.PostEvent(self.manager.parent, StatusEvent(status=\
                             "Data contains smearing information %s"%msg))
-        else:
-            temp_smearer = None
+       
         ## set smearing value whether or not the data contain the smearing info
-        self.manager.set_smearer(temp_smearer, qmin= float(self.qmin_x),
+        self.manager.set_smearer(smearer=temp_smearer, qmin= float(self.qmin_x),
                                       qmax= float(self.qmax_x)) 
         ##Calculate chi2
@@ -633 +632 @@
         ## save the state enable smearing
         self.save_current_state()
+       
          
    

sansview/perspectives/fitting/fitting.py

@@ -359 +359 @@
         ## redraw the model with data smeared
         
-        smearer =self.page_finder[current_pg].get_smearer()
-        self.draw_model( model=model, data= data, smearer= smearer,
+        smear =self.page_finder[current_pg].get_smearer()
+        self.draw_model( model=model, data= data, smearer= smear,
                 qmin= qmin, qmax= qmax)
 
@@ -1070 +1070 @@
                 qmin = min(data.x)
             if qmax == DEFAULT_QMAX:
-                qmax = max(data.x)
+                qmax = max(data.x) 
+           
         
         if not enable1D:

sansview/perspectives/fitting/pagestate.py

@@ -42 +42 @@
         ## orientation parameters
         self.orientation_params=[]
+        ## smearer info
+        self.smearer=None
         #list of dispersion paramaters
         self.disp_list =[]
@@ -96 +98 @@
         obj.npts = copy.deepcopy(self.npts )
         obj.cb1 = copy.deepcopy(self.cb1)
+        obj.smearer = copy.deepcopy(self.smearer)
+        
         for name, state in self.saved_states.iteritems():
             copy_name = copy.deepcopy(name)