Changeset 632fda9 in sasview for src/sas/sasgui/perspectives/fitting/models.py

Timestamp:

Sep 15, 2017 6:52:44 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:

fca1f50

Parents:

2504b5a

Message:

Fix old style plugin models not causing sasview to run

File:

• src/sas/sasgui/perspectives/fitting/models.py (modified) (1 diff)

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

@@ -299 +299 @@
         for name, plug in self.stored_plugins.iteritems():
             self.model_dictionary[name] = plug
-            if plug.is_structure_factor:
+            # TODO: Remove 'hasattr' statements when old style plugin models
+            # are no longer supported. All sasmodels models will have
+            # the required attributes.
+            if hasattr(plug, 'is_structure_factor') and plug.is_structure_factor:
                 self.struct_list.append(plug)
                 self.plugins.remove(plug)
-            elif plug.is_form_factor:
+            elif hasattr(plug, 'is_form_factor') and plug.is_form_factor:
                 self.multiplication_factor.append(plug)
-            if plug.is_multiplicity_model:
+            if hasattr(plug, 'is_multiplicity_model') and plug.is_multiplicity_model:
                 self.multi_func_list.append(plug)