Changeset 3a38a8b in sasview for src/sas/sasgui/perspectives


Ignore:
Timestamp:
Aug 9, 2016 4:47:44 AM (8 years ago)
Author:
lewis
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:
b7c21a7
Parents:
5451a78 (diff), 5213d22 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into file-converter

Location:
src/sas/sasgui/perspectives
Files:
9 added
1 edited

Legend:

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

    r6ed67db r5213d22  
    21462146                self.temp_multi_functional = True 
    21472147        elif form_factor != None: 
    2148             self.model = form_factor(self.multi_factor) 
     2148            if self.multi_factor is not None: 
     2149                self.model = form_factor(self.multi_factor) 
     2150            else: 
     2151                # old style plugin models do not accept a multiplicity argument 
     2152                self.model = form_factor() 
    21492153        else: 
    21502154            self.model = None 
Note: See TracChangeset for help on using the changeset viewer.