Changeset 377c19a2 in sasview for src


Ignore:
Timestamp:
Nov 16, 2016 3:42:44 PM (8 years ago)
Author:
krzywon
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:
8898558b
Parents:
b4fc0f9
Message:

#795: Form factor and structure factor parameters are handled separately to avoid conflicts in sasmodels convert.py.

File:
1 edited

Legend:

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

    rb4fc0f9 r377c19a2  
    385385            p[name + ".lower"] = float(lower[1]) 
    386386            p[name + ".units"] = units 
    387         name, params = convert.convert_model(self.formfactorcombobox, p) 
     387 
     388        structurefactor, params = \ 
     389            convert.convert_model(self.structurecombobox, p) 
     390        formfactor, params = \ 
     391            convert.convert_model(self.formfactorcombobox, params) 
    388392 
    389393        # Only convert if old != new, otherwise all the same 
    390         if name != self.formfactorcombobox: 
    391             self.formfactorcombobox = name 
     394        if formfactor != self.formfactorcombobox or \ 
     395                        structurefactor != self.structurecombobox: 
     396            self.formfactorcombobox = formfactor 
     397            self.structurecombobox = structurefactor 
    392398            self.parameters = [] 
    393399            for name, info in params.iteritems(): 
Note: See TracChangeset for help on using the changeset viewer.