Changeset 65f3930 in sasview for src/sas/sascalc

Timestamp:

Jun 26, 2017 6:22:56 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

50fcb09

Parents:

98e3f24

Message:

move models.py to sascalc/fit

File:

• src/sas/sascalc/fit/models.py (moved) (moved from src/sas/sasgui/perspectives/fitting/models.py) (3 diffs)

src/sas/sascalc/fit/models.py

@@ -14 +14 @@
 import py_compile
 import shutil
+
+from sasmodels.sasview_model import load_custom_model, load_standard_models
+
 # 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.sascalc.fit.pluginmodel import Model1DPlugin
+from .pluginmodel import Model1DPlugin
+
 from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
-from sasmodels.sasview_model import load_custom_model, load_standard_models
 
 logger = logging.getLogger(__name__)
@@ -28 +31 @@
                           "plugins.log")
 PLUGIN_NAME_BASE = '[plug-in] '
-
-def get_model_python_path():
-    """
-    Returns the python path for a model
-    """
-    return os.path.dirname(__file__)
 
 
@@ -418 +415 @@
     implement model
     """
-    __modelmanager = ModelManagerBase()
-    cat_model_list = [__modelmanager.model_dictionary[model_name] for model_name \
-                      in __modelmanager.model_dictionary.keys() \
-                      if model_name not in __modelmanager.stored_plugins.keys()]
-
-    CategoryInstaller.check_install(model_list=cat_model_list)
+    base = None  # type: ModelManagerBase()
+
+    def __init__(self):
+        if ModelManager.base is None:
+            self.base = ModelManagerBase()
+
+    def cat_model_list(self):
+        models = self.base.model_dictionary
+        retval = [model for model_name, model in models.items()
+                  if model_name not in self.base.stored_plugins]
+        return retval
+
     def findModels(self):
-        return self.__modelmanager.findModels()
+        return self.base.findModels()
 
     def _getModelList(self):
-        return self.__modelmanager._getModelList()
+        return self.base._getModelList()
 
     def is_changed(self):
-        return self.__modelmanager.is_changed()
+        return self.base.is_changed()
 
     def update(self):
-        return self.__modelmanager.update()
+        return self.base.update()
 
     def plugins_reset(self):
-        return self.__modelmanager.plugins_reset()
-
-    def populate_menu(self, modelmenu, event_owner):
-        return self.__modelmanager.populate_menu(modelmenu, event_owner)
+        return self.base.plugins_reset()
+
+    #def populate_menu(self, modelmenu, event_owner):
+    #    return self.base.populate_menu(modelmenu, event_owner)
 
     def _on_model(self, evt):
-        return self.__modelmanager._on_model(evt)
+        return self.base._on_model(evt)
 
     def _get_multifunc_models(self):
-        return self.__modelmanager._get_multifunc_models()
+        return self.base._get_multifunc_models()
 
     def get_model_list(self):
-        return self.__modelmanager.get_model_list()
+        return self.base.get_model_list()
 
     def get_model_name_list(self):
-        return self.__modelmanager.get_model_name_list()
+        return self.base.get_model_name_list()
 
     def get_model_dictionary(self):
-        return self.__modelmanager.get_model_dictionary()
+        return self.base.get_model_dictionary()