Changeset a321c52 in sasview for src/sas/sasgui/perspectives/fitting/pagestate.py

Timestamp:

Dec 6, 2016 10:52:56 AM (7 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:

9eb8fae

Parents:

77910cf

Message:

Force all models to go through _convert_to_sasmodels routine to ensure all sasmodels version changes are applied.

File:

• src/sas/sasgui/perspectives/fitting/pagestate.py (modified) (3 diffs)

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

@@ -357 +357 @@
         return obj
 
-    def _is_sasmodels(self):
+    def _old_first_model(self):
         """
         A check to see if the loaded save state was saved in SasView v4_0+
@@ -391 +391 @@
             elif self.categorycombobox == 'Structure Factor':
                 self.formfactorcombobox = 'hardsphere'
-        newname = convert._conversion_target(self.formfactorcombobox)
-        if newname == None:
-            return True
-        else:
-            return False
 
     def param_remap_to_sasmodels_convert(self, params):
@@ -466 +461 @@
         """
         # Create conversion dictionary to send to sasmodels
+        self._old_first_model()
         p = self.param_remap_to_sasmodels_convert(self.parameters)
         structurefactor, params = \