Changeset 3b3b40b in sasview for src/sas/qtgui/Perspectives/Fitting/ModelUtilities.py

Timestamp:

Mar 21, 2018 2:17:04 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

8b480d27

Parents:

e4c475b7

git-author:

Piotr Rozyczko <rozyczko@…> (02/08/18 02:19:04)

git-committer:

Piotr Rozyczko <rozyczko@…> (03/21/18 02:17:04)

Message:

Merging feature branches

File:

• src/sas/qtgui/Perspectives/Fitting/ModelUtilities.py (modified) (3 diffs, 1 prop)

src/sas/qtgui/Perspectives/Fitting/ModelUtilities.py

@@ -179 +179 @@
     plugins = {}
     for filename in os.listdir(directory):
+
         name, ext = os.path.splitext(filename)
         if ext == '.py' and not name == '__init__':
@@ -184 +185 @@
             try:
                 model = load_custom_model(path)
-                model.name = PLUGIN_NAME_BASE + model.name
+                #model.name = PLUGIN_NAME_BASE + model.name
                 plugins[model.name] = model
             except Exception:
@@ -415 +416 @@
     implement model
     """
-    __modelmanager = ModelManagerBase()
-    cat_model_list = [__modelmanager.model_dictionary[model_name] for model_name \
-                      in list(__modelmanager.model_dictionary.keys()) \
-                      if model_name not in list(__modelmanager.stored_plugins.keys())]
-
-    CategoryInstaller.check_install(model_list=cat_model_list)
+    def __init__(self):
+        self.__modelmanager = ModelManagerBase()
+        self.cat_model_list = [self.__modelmanager.model_dictionary[model_name] for model_name \
+                          in list(self.__modelmanager.model_dictionary.keys()) \
+                          if model_name not in list(self.__modelmanager.stored_plugins.keys())]
+
+        CategoryInstaller.check_install(model_list=self.cat_model_list)
+
     def findModels(self):
         return self.__modelmanager.findModels()