Changeset 33dc18f in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

Sep 14, 2017 9:33:49 AM (7 years ago)

Author:

lewis

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:

252d959

Parents:

908f090

Message:

Update S(Q) combobox when plugins reloaded

Rather buggy. Seems related to ticket #865

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• fitting.py (modified) (1 diff)
• models.py (modified) (3 diffs)

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

@@ -1841 +1841 @@
             if models.name != "NoStructure":
                 mlist.append((models.name, models))
-
         # Sort the models
         mlist_sorted = sorted(mlist)

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

@@ -357 +357 @@
                             else:
                                 page.formfactorbox.SetLabel(current_val)
+                        if hasattr(page, 'structurebox'):
+                            page.structurebox.Clear()
+                            page._populate_box(page.structurebox,
+                                page.model_list_box["Structure Factors"])
         except:
             logger.error("update_custom_combo: %s", sys.exc_value)

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

@@ -14 +14 @@
 import py_compile
 import shutil
+from copy import copy
 # Explicitly import from the pluginmodel module so that py2exe
 # places it in the distribution. The Model1DPlugin class is used
@@ -347 +348 @@
         """
         self.plugins = []
-        new_plugins = _find_models()
-        stored_names = self.stored_plugins.keys()
+        self.stored_plugins = _find_models()
         structure_names = [model.name for model in self.struct_list]
         form_names = [model.name for model in self.multiplication_factor]
-        for name, plug in  new_plugins.iteritems():
-            if name in stored_names:
-                # Delete references to the olf model
-                del self.stored_plugins[name]
-                del self.model_dictionary[name]
+
+        # Remove all plugin structure factors and form factors
+        for name in copy(structure_names):
+            if '[plug-in]' in name:
+                i = structure_names.index(name)
+                del self.struct_list[i]
+                structure_names.remove(name)
+        for name in copy(form_names):
+            if '[plug-in]' in name:
+                i = form_names.index(name)
+                del self.multiplication_factor[i]
+                form_names.remove(name)
+
+        # Add new plugin structure factors and form factors
+        for name, plug in self.stored_plugins.iteritems():
             if plug.is_structure_factor:
                 if name in structure_names:
@@ -379 +389 @@
 
         self.model_combobox.reset_list("Plugin Models", self.plugins)
-        # TODO: Also update structure factor box (if it exists)
+        self.model_combobox.reset_list("Structure Factors", self.struct_list)
+        self.model_combobox.reset_list("P(Q)*S(Q)", self.multiplication_factor)
+
         return self.model_combobox.get_list()