Changes in src/sas/perspectives/fitting/models.py [415fb82:f0d720b] in sasview

File:

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

src/sas/perspectives/fitting/models.py

@@ -6 +6 @@
 import os
 import sys
+import math
 import os.path
 # Time is needed by the log method
@@ -12 +13 @@
 import py_compile
 import shutil
+from sas.guiframe.events import StatusEvent
 # Explicitly import from the pluginmodel module so that py2exe
 # places it in the distribution. The Model1DPlugin class is used
 # as the base class of plug-in models.
 from sas.models.pluginmodel import Model1DPlugin
+from sas.models.BaseComponent import BaseComponent
 from sas.guiframe.CategoryInstaller import CategoryInstaller
 
+from sasmodels.sasview_model import make_class
+   
 PLUGIN_DIR = 'plugin_models'
 
@@ -314 +319 @@
 
         # regular model names only
-        base_message = "Unable to load model {0}"
-        try:
-            self.model_name_list = []
-            from sas.models.SphereModel import SphereModel
-            self.model_dictionary[SphereModel.__name__] = SphereModel
-            #        self.shape_list.append(SphereModel)
-            self.multiplication_factor.append(SphereModel)
-            self.model_name_list.append(SphereModel.__name__)
-        except:
-            logging.error(base_message.format(SphereModel.__name__))
+        self.model_name_list = []
+
+        #Build list automagically from sasmodels package
+        import pkgutil
+        from importlib import import_module
+        import sasmodels.models
+        for importer,modname,ispkg in pkgutil.iter_modules(sasmodels.models.__path__):
+            if not ispkg:
+                module = import_module('.'+modname,'sasmodels.models')
+                self.model_dictionary[module.oldname] = make_class(module, dtype='single',namestyle='oldname')
+                self.model_name_list.append(module.oldname)
+
+
+        ### NASTY HACK - Comment out most of these lines as models are added to sasmodels.
+        ### Still need the lines that put models into multiplication etc
+
+        try:
+        #     # from sas.models.SphereModel import SphereModel
+        #     from sasmodels.models import sphere
+        #     SphereModel = make_class(sphere, dtype='single',namestyle='oldname')
+        #     self.model_dictionary[SphereModel.__name__] = SphereModel
+        #     #        self.shape_list.append(SphereModel)
+             self.multiplication_factor.append(SphereModel)
+        #     self.model_name_list.append(SphereModel.__name__)
+        except:
+            pass
 
         try:
@@ -1068 +1089 @@
         new_plugins = _findModels(dir)
         for name, plug in  new_plugins.iteritems():
-            for stored_name, _ in self.stored_plugins.iteritems():
+            for stored_name, stored_plug in self.stored_plugins.iteritems():
                 if name == stored_name:
                     del self.stored_plugins[name]