Changeset 8960479 in sasview for sansview


Ignore:
Timestamp:
May 20, 2011 11:02:30 AM (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:
0286321
Parents:
a436b2e
Message:

fixes multiplication model with multifunctional

Location:
sansview/perspectives/fitting
Files:
2 edited

Legend:

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

    r55a3257 r8960479  
    124124        if self.model != None: 
    125125            self.disp_list = self.model.getDispParamList() 
    126          
     126        self.temp_multi_functional = False 
    127127        ##enable model 2D draw 
    128128        self.enable2D = False 
     
    18331833        self._disp_obj_dict = {} 
    18341834        self.disp_cb_dict ={} 
    1835          
     1835        self.temp_multi_functional = False 
    18361836        f_id = self.formfactorbox.GetCurrentSelection() 
    18371837        #For MAC 
     
    19021902            from sans.models.MultiplicationModel import MultiplicationModel 
    19031903            self.model= MultiplicationModel(form_factor,struct_factor()) 
    1904              
     1904            # multifunctional form factor 
     1905            if len(form_factor.non_fittable) > 0: 
     1906                self.temp_multi_functional = True 
    19051907        else: 
    19061908            if form_factor != None: 
  • sansview/perspectives/fitting/fitpage.py

    r6371c9c r8960479  
    14671467        """ 
    14681468        # Check if it is multi_functional model 
    1469         if self.model.__class__ not in self.model_list_box["Multi-Functions"]: 
     1469        if self.model.__class__ not in self.model_list_box["Multi-Functions"] \ 
     1470                and not self.temp_multi_functional: 
    14701471            return None 
    14711472        # Get the func name list 
     
    25692570                iy += 1 
    25702571                ix = 0 
    2571                 if self.model.__class__ in \ 
    2572                     self.model_list_box["Multi-Functions"] \ 
    2573                     and item in self.model.non_fittable: 
     2572                if (self.model.__class__ in \ 
     2573                    self.model_list_box["Multi-Functions"] or \ 
     2574                    self.temp_multi_functional)\ 
     2575                    and (item in self.model.non_fittable): 
    25742576                    non_fittable_name = wx.StaticText(self, -1, item ) 
    25752577                    sizer.Add(non_fittable_name,(iy, ix),(1,1),\ 
Note: See TracChangeset for help on using the changeset viewer.