Changeset e87f9fc in sasview for theoryview/perspectives/theory


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:
theoryview/perspectives/theory
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • theoryview/perspectives/theory/basepage.py

    ra706353b re87f9fc  
    14671467        if form_factor != None:     
    14681468            # set multifactor for Mutifunctional models     
    1469             if form_factor().name == 'CoreMultiShellModel': 
     1469            if form_factor().__class__ in self.model_list_box["Multi-Functions"]: 
    14701470                self._show_multfactor_combobox() 
    14711471                m_id = self.multifactorbox.GetCurrentSelection() 
  • theoryview/perspectives/theory/models.py

    r4523b68 re87f9fc  
    165165    ##list of model allowing multiplication 
    166166    multiplication_factor=[] 
     167    ##list of multifunctional shapes 
     168    multi_func_list =[] 
    167169    ## list of added models 
    168170    plugins=[] 
     
    182184        self.shape_list.append(SphereModel) 
    183185        self.multiplication_factor.append(SphereModel) 
     186         
     187        from sans.models.SphereExpShellModel import SphereExpShellModel 
     188        self.shape_list.append(SphereExpShellModel) 
     189        self.multiplication_factor.append(SphereExpShellModel) 
     190        self.multi_func_list.append(SphereExpShellModel) 
    184191         
    185192        from sans.models.FuzzySphereModel import FuzzySphereModel 
     
    194201        self.shape_list.append(CoreMultiShellModel) 
    195202        self.multiplication_factor.append(CoreMultiShellModel) 
     203        self.multi_func_list.append(CoreMultiShellModel) 
    196204 
    197205        from sans.models.VesicleModel import VesicleModel 
     
    337345        self.model_combobox.set_list("P(Q)*S(Q)", self.multiplication_factor) 
    338346        self.model_combobox.set_list("multiplication", self.multiplication_factor) 
     347        self.model_combobox.set_list("Multi-Functions", self.multi_func_list) 
    339348        return self.model_combobox 
    340349  
Note: See TracChangeset for help on using the changeset viewer.