Changeset fa487d93 in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

Dec 21, 2016 11:59:49 AM (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:

2d09bc2

Parents:

a6fccd7

Message:

Added versioning to pagestate and fit saves to ensure past changes are skipped but future changes are not.

File:

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

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

@@ -351 +351 @@
         obj.cb1 = copy.deepcopy(self.cb1)
         obj.smearer = copy.deepcopy(self.smearer)
+        obj.version = copy.deepcopy(self.version)
 
         for name, state in self.saved_states.iteritems():
@@ -479 +480 @@
                 self.str_parameters, True)
             formfactor, str_params = convert.convert_model(
-                self.formfactorcombobox, str_pars)
+                self.formfactorcombobox, str_pars, False, self.version)
             for key, value in str_params.iteritems():
                 params[key] = value
 
-        # Only convert if old != new, otherwise all the same
-        if formfactor != self.formfactorcombobox or \
-                        structurefactor != self.structurecombobox:
-            # Spherical SLD number of layers changed between 3.1.2 and 4.0
-            if self.formfactorcombobox == 'SphericalSLDModel':
-                self.multi_factor += 1
-            self.formfactorcombobox = formfactor
-            self.structurecombobox = structurefactor
-            self.parameters = []
-            self.parameters = self.param_remap_from_sasmodels_convert(params)
+        if self.formfactorcombobox == 'SphericalSLDModel':
+            self.multi_factor += 1
+        self.formfactorcombobox = formfactor
+        self.structurecombobox = structurefactor
+        self.parameters = []
+        self.parameters = self.param_remap_from_sasmodels_convert(params)
 
     def _repr_helper(self, list, rep):
@@ -1016 +1013 @@
 
         if node.get('version'):
-
+            # Get the version for model conversion purposes
             self.version = tuple(int(e) for e in
                                  str.split(node.get('version'), "."))
+            # The tuple must be at least 3 items long
+            while len(self.version) < 3:
+                ver_list = list(self.version)
+                ver_list.append(0)
+                self.version = tuple(ver_list)
+
             # Get file name
             entry = get_content('ns:filename', node)
@@ -1834 +1837 @@
                         name = original_fname
                     state.data.group_id = name
+                    state.version = fitstate.version
                     # store state in fitting
                     self.call_back(state=state,