Changeset 998ca90 in sasview for src/sas/sasgui/perspectives/fitting/simfitpage.py

Timestamp:

Oct 7, 2016 12:21:40 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:

ff3f5821

Parents:

cb823f0

Message:

#189 #12 Saving and loading project now fully saves and loads a simultaneous fits. Loading a project will reset Sasview state to its base state (with a warning). One error on load to fix before calling this finished.

File:

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

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

@@ -1050 +1050 @@
         """
 
-        # FIXME: Not tracking data set name on loading ==> NECESSARY!
         model_map = {}
         if fit.fit_panel.sim_page is None:
@@ -1069 +1068 @@
                     check = bool(saved_model.pop('checked'))
                     sim_page.model_list[i][0].SetValue(check)
-                    continue
+                    break
             i += 1
         sim_page.check_model_name(None)
@@ -1080 +1079 @@
         for index, item in enumerate(self.constraints_list):
             model_cbox = item.pop('model_cbox')
-            constraint_value = item.pop('constraint')
-            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)
-
-            sim_page.constraints_list[index][0].SetValue(model_cbox)
-            sim_page._on_select_model(None)
-            sim_page.constraints_list[index][1].SetValue(param)
-            sim_page.constraints_list[index][2].SetLabel(equality)
-            sim_page.constraints_list[index][3].SetValue(constraint_value)
-            sim_page._on_add_constraint(None)
+            if model_cbox != "":
+                constraint_value = item.pop('constraint')
+                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)
+
+                sim_page.constraints_list[index][0].SetValue(model_cbox)
+                sim_page._on_select_model(None)
+                sim_page.constraints_list[index][1].SetValue(param)
+                sim_page.constraints_list[index][2].SetLabel(equality)
+                sim_page.constraints_list[index][3].SetValue(constraint_value)
+                sim_page._on_add_constraint(None)
 
     def _format_id(self, original_id):