Changeset 9e2535e in sasview for src/sas/sasgui/perspectives/fitting

Timestamp:

May 18, 2017 1:21:33 PM (7 years ago)

Author:

krzywon

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

Children:

8de66b6

Parents:

e0ebd56 (diff), 7132e49 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into batch_slicer

Location:

src/sas/sasgui/perspectives/fitting

Files:

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

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

@@ -163 +163 @@
 
 
-def _findModels(dir):
+def _find_models():
     """
     Find custom models
     """
     # List of plugin objects
-    dir = find_plugins_dir()
+    directory = find_plugins_dir()
     # Go through files in plug-in directory
-    if not os.path.isdir(dir):
-        msg = "SasView couldn't locate Model plugin folder %r." % dir
+    if not os.path.isdir(directory):
+        msg = "SasView couldn't locate Model plugin folder %r." % directory
         logger.warning(msg)
         return {}
 
-    plugin_log("looking for models in: %s" % str(dir))
-    #compile_file(dir)  #always recompile the folder plugin
-    logger.info("plugin model dir: %s" % str(dir))
+    plugin_log("looking for models in: %s" % str(directory))
+    # compile_file(directory)  #always recompile the folder plugin
+    logger.info("plugin model dir: %s" % str(directory))
 
     plugins = {}
-    for filename in os.listdir(dir):
+    for filename in os.listdir(directory):
         name, ext = os.path.splitext(filename)
         if ext == '.py' and not name == '__init__':
-            path = os.path.abspath(os.path.join(dir, filename))
+            path = os.path.abspath(os.path.join(directory, filename))
             try:
                 model = load_custom_model(path)
@@ -193 +193 @@
                 plugin_log(msg)
                 logger.warning("Failed to load plugin %r. See %s for details"
-                                % (path, PLUGIN_LOG))
-            
+                               % (path, PLUGIN_LOG))
+
     return plugins
 
@@ -264 +264 @@
         temp = {}
         if self.is_changed():
-            return  _findModels(dir)
+            return  _find_models()
         logger.info("plugin model : %s" % str(temp))
         return temp
@@ -339 +339 @@
         """
         self.plugins = []
-        new_plugins = _findModels(dir)
+        new_plugins = _find_models()
         for name, plug in  new_plugins.iteritems():
             for stored_name, stored_plug in self.stored_plugins.iteritems():

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

@@ -254 +254 @@
         if not hasattr(self, "model_view"):
             return
-        toggle_mode_on = self.model_view.IsEnabled()
+        toggle_mode_on = self.model_view.IsEnabled() or self.data is None
         if toggle_mode_on:
             if self.enable2D and not check_data_validity(self.data):