Changeset 377c19a2 in sasview

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:

• src/sas/sasgui/perspectives/fitting/pagestate.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/pagestate.py

@@ -385 +385 @@
             p[name + ".lower"] = float(lower[1])
             p[name + ".units"] = units
-        name, params = convert.convert_model(self.formfactorcombobox, p)
+
+        structurefactor, params = \
+            convert.convert_model(self.structurecombobox, p)
+        formfactor, params = \
+            convert.convert_model(self.formfactorcombobox, params)
 
         # Only convert if old != new, otherwise all the same
-        if name != self.formfactorcombobox:
-            self.formfactorcombobox = name
+        if formfactor != self.formfactorcombobox or \
+                        structurefactor != self.structurecombobox:
+            self.formfactorcombobox = formfactor
+            self.structurecombobox = structurefactor
             self.parameters = []
             for name, info in params.iteritems():