Changeset eb06cbe in sasview for park_integration/test


Ignore:
Timestamp:
May 22, 2008 11:39:38 AM (17 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:
43c0a8e
Parents:
e94d1d3
Message:

uml changed

Location:
park_integration/test
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • park_integration/test/FittingModule.py

    re94d1d3 reb06cbe  
    2727             
    2828    def get_model(self): 
     29        """ Return the model""" 
    2930        return self.model    
    3031      
    … …  
    3334        return self.dList  
    3435       
    35     def delete_data(self,data): 
     36    def remove_data(self,data): 
    3637        """ 
    3738            Remove one element from the list 
    … …  
    5354        #list of models parameters 
    5455        self.parameters=[] 
    55         self.contraint =None 
    56         self.residuals=[] 
     56         
     57        self.constraint =None 
    5758        self.fitType =None 
    5859         

  • park_integration/test/Loader.py

    r4a0536a reb06cbe  
    1313        self.dx = dx 
    1414        self.dy = dy 
    15         self.filename=None 
     15        self.filename = None 
    1616         
    1717    def set_filename(self,path=None): 
    … …  
    2121            @param path: the path given by the user 
    2222        """ 
    23         if path == None: 
    24             dlg = wx.FileDialog(self, "Choose a file", os.getcwd(), "", "*.txt", wx.OPEN) 
    25             if dlg.ShowModal() == wx.ID_OK: 
    26                 path = dlg.GetPath() 
    27             dlg.Destroy() 
    2823        self.filename = path 
    29              
    30          
     24        
     25 
    3126    def get_filename(self): 
    3227        """ return the file's path""" 
    3328        return self.filename 
     29     
    3430    def set_values(self): 
    3531        """ Store the values loaded from file in local variables """ 
    … …  
    6359                raise ValueError, "y and dy have different length" 
    6460             
    65        
    6661             
    6762    def get_values(self): 
Note: See TracChangeset for help on using the changeset viewer.