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

Timestamp:

Jun 12, 2017 12:47:50 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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

9804394

Parents:

8cec26b

Message:

Properly restore constraint mappings when loading constrained fit projects.

File:

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

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

@@ -1050 +1050 @@
         """
 
-        model_map = {}
+        init_map = {}
+        final_map = {}
         if fit.fit_panel.sim_page is None:
             fit.fit_panel.add_sim_page()
@@ -1064 +1065 @@
                 save_id = self._format_id(save_id)
                 if save_id == model_id:
-                    model_map[saved_model.pop('fit_page_source')] = \
-                        model[3].name
+                    inter_id = str(i) + str(i) + str(i) + str(i) + str(i)
+                    init_map[saved_model.pop('fit_page_source')] = inter_id
+                    final_map[inter_id] = model[3].name
                     check = bool(saved_model.pop('checked'))
                     sim_page.model_list[i][0].SetValue(check)
@@ -1083 +1085 @@
                 param = item.pop('param_cbox')
                 equality = item.pop('egal_txt')
-                for key, value in model_map.iteritems():
-                    model_cbox.replace(key, value)
-                    constraint_value.replace(key, value)
+                for key, value in init_map.items():
+                    model_cbox = model_cbox.replace(key, value)
+                    constraint_value = constraint_value.replace(key, value)
+                for key, value in final_map.items():
+                    model_cbox = model_cbox.replace(key, value)
+                    constraint_value = constraint_value.replace(key, value)
 
                 sim_page.constraints_list[index][0].SetValue(model_cbox)