Changeset ab3ed7e in sasview

Timestamp:

Mar 20, 2016 5:56:49 AM (9 years ago)

Author:

gonzalezm

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, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

105ef92

Parents:

76d905f

Message:

Discover and use python and python+C models added to the user plugin_models folder

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• models.py (modified) (5 diffs)

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

@@ -1895 +1895 @@
             if mod_cat == custom_model:
                 for model in self.model_list_box[mod_cat]:
-                    str_m = str(model).split(".")[0]
+                    if 'sasmodels.sasview_model.' in str(model):
+                        str_m = model._model_info['id']
+                    else:
+                        str_m = str(model).split(".")[0]
                     #self.model_box.Append(str_m)
                     m_list.append(self.model_dict[str_m])

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

@@ -181 +181 @@
             if toks[1] == '.py' and not toks[0] == '__init__':
                 name = toks[0]
-
                 path = [os.path.abspath(dir)]
                 file = None
@@ -197 +196 @@
                                                          sys.exc_info()[1])
                             log(msg)
+                    else:
+                        filename = os.path.join(dir, item)
+                        plugins[name] = sasview_model.make_class_from_file(filename) 
+
                 except:
                     msg = "Error accessing Model"
@@ -211 +214 @@
         msg = "Could not import model plugin: %s" % sys.exc_info()[1]
         log(msg)
+
     return plugins
 
@@ -311 +315 @@
                 self.multiplication_factor.append(model)
 
-
         #Looking for plugins
         self.stored_plugins = self.findModels()
@@ -317 +320 @@
         for name, plug in self.stored_plugins.iteritems():
             self.model_dictionary[name] = plug
-
+        
         self._get_multifunc_models()