Changeset 5582a9f1 in sasview

Timestamp:

Sep 17, 2009 3:00:24 PM (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:

d4bb639

Parents:

6ced1cc

Message:

savinf smear value state

Location:

sansview/perspectives/fitting

Files:

• basepage.py (modified) (7 diffs)
• fitpage.py (modified) (2 diffs)

sansview/perspectives/fitting/basepage.py

@@ -78 +78 @@
         self.num_points_def = 50
         ## Q range
-        self.qmin_x= self.qmin_def
-        self.qmax_x= self.qmax_def
-        self.num_points= self.num_points_def
+        self.qmin_x= 0.001
+        self.qmax_x= 0.13
+        self.num_points= 50
         
         ## Create memento to save the current state
@@ -647 +647 @@
         self.model= state.model
         self.data = state.data
-        self.smearer= state.smearer
+        if self.data !=None:
+            from DataLoader.qsmearing import smear_selection
+            self.smearer= smear_selection( self.data )
         self.enable2D= state.enable2D
         
@@ -698 +700 @@
 
             self._set_dipers_Param(event=None)
-            
-            #self.disp_cb_dict = {}
-            #for k,v in self.state.disp_cb_dict.iteritems():
-            #    self.disp_cb_dict = copy.deepcopy(state.disp_cb_dict) 
-            #    self.state.disp_cb_dict = copy.deepcopy(state.disp_cb_dict)
-
+       
             if name=="ArrayDispersion":
                 
@@ -733 +730 @@
                     self.disp_cb_dict = copy.deepcopy(state.disp_cb_dict) 
                     self.state.disp_cb_dict = copy.deepcopy(state.disp_cb_dict)
-                
-                #self._disp_obj_dict={}
-                #for k , v in self.state._disp_obj_dict.iteritems():
-                #    self._disp_obj_dict[k]=v
-                
+      
         ##plotting range restore    
         self._reset_plotting_range(state)
@@ -745 +738 @@
             self.enable_smearer.SetValue(state.enable_smearer)
             self.disable_smearer.SetValue(state.disable_smearer)
+            self.onSmear(event=None)
             self.tcChi.SetLabel(str( state.tcChi))
             self.sizer5.Layout()
             self.Layout()
             self.Refresh()
-            #self.compute_chisqr(smearer= self.smearer)  
-        #self._draw_model()   
+            
+       
         ## reset state of checkbox,textcrtl  and dispersity parameters value
         self._reset_parameters_state(self.fittable_param,state.fittable_param)
@@ -760 +754 @@
         ## reset context menu items
         self._reset_context_menu()
-        
-        #self._reset_dispersity()
-        #self._set_dipers_Param(event=None) #to bo removed //resets disper para value
-
-        #self.disp_cb_dict = {}
-        #for k,v in self.state.disp_cb_dict.iteritems():
-            #self.disp_cb_dict = copy.deepcopy(state.disp_cb_dict) 
-            #self.state.disp_cb_dict = copy.deepcopy(state.disp_cb_dict)
-
-
+    
         ## set the value of the current state to the state given as parameter
         self.state = state.clone() 
@@ -1685 +1670 @@
         
         
+        sizer.Add((5,5))
+        sizer.Add(wx.StaticText(self, -1, 'Min'))
+        sizer.Add(wx.StaticText(self, -1, 'Max'))
+        sizer.Add(wx.StaticText(self, -1, 'Q range'))
              
         sizer.Add(self.qmin)

sansview/perspectives/fitting/fitpage.py

@@ -922 +922 @@
         ##Calculate chi2
         self.compute_chisqr(smearer= temp_smearer)  
-        ## save the state enable smearing
-        self.state.smearer= temp_smearer
-        #self.save_current_state() 
-   
+        
+        self.state.enable_smearer=  self.enable_smearer.GetValue()
+        self.state.disable_smearer=self.disable_smearer.GetValue()
    
     def complete_chisqr(self, output, elapsed=None):  
@@ -941 +940 @@
             ## post state to fit panel
             self.state.tcChi =output
-            #event = PageInfoEvent(page = self)
-            #wx.PostEvent(self.parent, event)
+          
         except:
             pass