Changeset d2d0cfdf in sasview for sansview


Ignore:
Timestamp:
Apr 21, 2009 3:34:06 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:
a7fe3e3
Parents:
7268dcc
Message:

save gaussian dispersity

Location:
sansview/perspectives/fitting
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sansview/perspectives/fitting/basepage.py

    r502de0a rd2d0cfdf  
    343343        self.state.model = self.model.clone() 
    344344        new_state = self.state.clone() 
     345        ## save checkbutton state and txtcrtl values 
     346        self._copy_parameters_state(self.orientation_params, 
     347                                     self.state.orientation_params) 
     348        self._copy_parameters_state(self.orientation_params_disp, 
     349                                     self.state.orientation_params_disp) 
     350        self._copy_parameters_state(self.parameters, self.state.parameters) 
     351        
     352        self._copy_parameters_state(self.fittable_param, self.state.fittable_param) 
     353        self._copy_parameters_state(self.fixed_param, self.state.fixed_param) 
    345354         
    346355        ##Add model state on context menu 
     
    459468            self.state.disp_box = self.disp_box.GetCurrentSelection() 
    460469        self._save_plotting_range() 
    461        
     470         
     471        self.state.orientation_params =[] 
     472        self.state.orientation_params_disp =[] 
     473        self.state.parameters =[] 
     474        self.state.fittable_param =[] 
     475        self.state.fixed_param =[] 
     476         
    462477        ## save checkbutton state and txtcrtl values 
    463         
    464         self._copy_parameters_state(self.parameters, self.state.parameters) 
    465         self._copy_parameters_state(self.fittable_param, self.state.fittable_param) 
    466         self._copy_parameters_state(self.fixed_param, self.state.fixed_param) 
    467478        self._copy_parameters_state(self.orientation_params, 
    468479                                     self.state.orientation_params) 
    469480        self._copy_parameters_state(self.orientation_params_disp, 
    470481                                     self.state.orientation_params_disp) 
    471          
     482        self._copy_parameters_state(self.parameters, self.state.parameters) 
     483        
     484        self._copy_parameters_state(self.fittable_param, self.state.fittable_param) 
     485        self._copy_parameters_state(self.fixed_param, self.state.fixed_param) 
    472486         
    473487        ## post state to fit panel 
     
    506520            self.compute_chisqr(smearer= self.smearer)   
    507521             
    508         ## reset context menu items 
    509         self._reset_context_menu() 
     522        
    510523        ## reset state of checkbox,textcrtl  and parameters value 
    511         self._reset_parameters_state(self.parameters,state.parameters) 
    512         self._reset_parameters_state(self.fittable_param,state.fittable_param) 
    513         self._reset_parameters_state(self.fixed_param,state.fixed_param) 
    514524        self._reset_parameters_state(self.orientation_params_disp, 
    515525                                     state.orientation_params_disp) 
    516526        self._reset_parameters_state(self.orientation_params, 
    517527                                     state.orientation_params) 
    518          
     528        self._reset_parameters_state(self.parameters,state.parameters) 
     529        self._reset_parameters_state(self.fittable_param,state.fittable_param) 
     530        self._reset_parameters_state(self.fixed_param,state.fixed_param) 
     531      
     532        ## reset context menu items 
     533        self._reset_context_menu() 
    519534        ## draw the model with previous parameters value 
    520535        self._draw_model() 
     
    591606            is_modified =self._check_value_enter( self.parameters ,is_modified)         
    592607            
    593              
    594608            self.Layout() 
    595609            # Here we should check whether the boundaries have been modified. 
     
    676690            @param statelist: list of state object to store the current state 
    677691        """ 
     692         
    678693        if len(listtocopy)==0: 
    679694            return 
  • sansview/perspectives/fitting/fitpage.py

    rdffa973 rd2d0cfdf  
    197197            radius_max = math.sqrt(x*x + y*y) 
    198198             
    199             #For qmin and qmax, do not use format_number.(If do, qmin and max could be different from what is in the data.) 
     199            #For qmin and qmax, do not use format_number 
     200            #.(If do, qmin and max could be different from what is in the data.) 
    200201            # Minimum value of data    
    201             #data_min = str(format_number(radius_min)) 
    202202            data_min = str((radius_min)) 
    203203            # Maximum value of data   
    204             #data_max = str(format_number(radius_max)) 
    205204            data_max = str((radius_max)) 
    206205            text4_3 = wx.StaticText(self, -1, "Total Q Range (1/A)", 
     
    436435                            self.orientation_params_disp.append([None,name3, Tctl 
    437436                                                     ,None,None, None, None,None]) 
    438         self._copy_parameters_state(self.orientation_params_disp, 
    439                                      self.state.orientation_params_disp)  
     437    
    440438                                   
    441439        wx.PostEvent(self.parent, StatusEvent(status=\ 
Note: See TracChangeset for help on using the changeset viewer.