Ignore:
Timestamp:
Oct 8, 2016 1:44:36 PM (8 years ago)
Author:
mathieu
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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
b61bd57, b4818d9
Parents:
d73998c
Message:

Allow structure factors for custom models. Fixes #664

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/fitting/basepage.py

    r2abe6bf re28f34d  
    514514    def initialize_combox(self): 
    515515        """ 
    516         put default value in the combobox 
    517         """ 
    518         ## fill combox box 
    519         if self.model_list_box is None: 
    520             return 
    521         if len(self.model_list_box) > 0: 
     516        put default value in the combo box 
     517        """ 
     518        if self.model_list_box is not None and len(self.model_list_box) > 0: 
    522519            self._populate_box(self.structurebox, 
    523520                               self.model_list_box["Structure Factors"]) 
     
    528525            self.structurebox.Disable() 
    529526            self.text2.Disable() 
    530  
    531             if self.model.__class__ in self.model_list_box["P(Q)*S(Q)"]: 
    532                 self.structurebox.Show() 
    533                 self.text2.Show() 
    534                 self.structurebox.Enable() 
    535                 self.text2.Enable() 
    536527 
    537528    def set_dispers_sizer(self): 
     
    19631954            form_factor = self.formfactorbox.GetClientData(f_id) 
    19641955 
    1965         if not form_factor in  self.model_list_box["multiplication"]: 
     1956        if form_factor is None or not form_factor.is_form_factor: 
    19661957            self.structurebox.Hide() 
    19671958            self.text2.Hide() 
Note: See TracChangeset for help on using the changeset viewer.