Changeset e87f9fc in sasview for sansview


Ignore:
Timestamp:
Sep 17, 2010 3:13:37 PM (14 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:
5d57267
Parents:
e096270
Message:

added a new model

Location:
sansview/perspectives/fitting
Files:
2 edited

Legend:

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

    rcf6a192 re87f9fc  
    18411841        if form_factor != None:     
    18421842            # set multifactor for Mutifunctional models     
    1843             if form_factor().name == 'CoreMultiShellModel': 
     1843            if form_factor().__class__ in self.model_list_box["Multi-Functions"]: 
    18441844                self._show_multfactor_combobox() 
    18451845                m_id = self.multifactorbox.GetCurrentSelection() 
  • sansview/perspectives/fitting/models.py

    r4523b68 re87f9fc  
    157157    ##list of model allowing multiplication 
    158158    multiplication_factor=[] 
     159    ##list of multifunctional shapes 
     160    multi_func_list =[] 
    159161    ## list of added models 
    160162    plugins=[] 
     
    174176        self.shape_list.append(SphereModel) 
    175177        self.multiplication_factor.append(SphereModel) 
     178         
     179        from sans.models.SphereExpShellModel import SphereExpShellModel 
     180        self.shape_list.append(SphereExpShellModel) 
     181        self.multiplication_factor.append(SphereExpShellModel) 
     182        self.multi_func_list.append(SphereExpShellModel) 
    176183         
    177184        from sans.models.FuzzySphereModel import FuzzySphereModel 
     
    464471        """ 
    465472        self.model_combobox.set_list("multiplication", self.multiplication_factor) 
     473        self.model_combobox.set_list("Multi-Functions", self.multi_func_list) 
    466474        return self.model_combobox 
    467475     
Note: See TracChangeset for help on using the changeset viewer.