Changeset 70e5f97 in sasview for src/sas/sasgui

Timestamp:

Apr 8, 2016 4:58:38 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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

6afc14b

Parents:

be2775f (diff), 1780d8b (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' of ​https://github.com/SasView/sasview

Location:

src/sas/sasgui

Files:

• guiframe/data_processor.py (modified) (2 diffs)
• perspectives/calculator/media/gen_gui_help.bmp (modified) (previous)
• perspectives/calculator/media/mag_vector.bmp (modified) (previous)
• perspectives/fitting/media/mag_help.rst (modified) (1 diff)
• perspectives/fitting/media/mag_vector.bmp (modified) (previous)
• perspectives/fitting/media/new_model.bmp (modified) (previous)
• perspectives/fitting/media/plot_button.bmp (modified) (previous)
• perspectives/fitting/media/view_button.bmp (modified) (previous)
• perspectives/fitting/models.py (modified) (12 diffs)

src/sas/sasgui/guiframe/data_processor.py

@@ -10 +10 @@
 The organization of the classes goes as:
 
-#Path to this is:           /sasview/src/sas/sasgui/guiframe/data_processor.py
-#Path to image is:          /sasview/src/sas/sasgui/guiframe/media/BatchGridClassLayout.png
-
-.. image:: ./guiframe/media/BatchGridClassLayout.png
+.. note:: Path to this is: /sasview/src/sas/sasgui/guiframe/data_processor.py
+
+.. note:: Path to image is: /sasview/src/sas/sasgui/guiframe/media/BatchGridClassLayout.png
+
+.. image:: ../../user/sasgui/guiframe/BatchGridClassLayout.png
    :align: center
 
@@ -156 +157 @@
         attribute.
 
-        NOTE: There is no need to override this if you don't need
-        to do something out of the ordinary.
+        .. note:: There is no need to override this if you don't need
+                  to do something out of the ordinary.
 
         :param dc: the wxDC object for the paint

src/sas/sasgui/perspectives/fitting/media/mag_help.rst

@@ -22 +22 @@
 Magnetic scattering is implemented in five (2D) models 
 
-*  *SphereModel*
-*  *CoreShellModel*
-*  *CoreMultiShellModel*
-*  *CylinderModel*
-*  *ParallelepipedModel*
+*  *sphere*
+*  *core_shell_sphere*
+*  *core_multi_shell*
+*  *cylinder*
+*  *parallelepiped*
 
 In general, the scattering length density (SLD, = |beta|) in each region where the

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

@@ -2 +2 @@
     Utilities to manage models
 """
-import wx
 import imp
 import os
 import sys
-import math
 import os.path
 # Time is needed by the log method
@@ -13 +11 @@
 import py_compile
 import shutil
-from sas.sasgui.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.sascalc.fit.pluginmodel import Model1DPlugin
-from sas.sascalc.calculator.BaseComponent import BaseComponent
 from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
-from sasmodels import sasview_model,core
+from sasmodels.sasview_model import load_custom_model, load_standard_models
 
 
@@ -27 +23 @@
 def get_model_python_path():
     """
-        Returns the python path for a model
+    Returns the python path for a model
     """
     return os.path.dirname(__file__)
@@ -34 +30 @@
 def log(message):
     """
-        Log a message in a file located in the user's home directory
+    Log a message in a file located in the user's home directory
     """
     dir = os.path.join(os.path.expanduser("~"), '.sasview', PLUGIN_DIR)
@@ -87 +83 @@
 def find_plugins_dir():
     """
-        Find path of the plugins directory.
-        The plugin directory is located in the user's home directory.
+    Find path of the plugins directory.
+    The plugin directory is located in the user's home directory.
     """
     dir = os.path.join(os.path.expanduser("~"), '.sasview', PLUGIN_DIR)
@@ -133 +129 @@
 class ReportProblem:
     """
-        Class to check for problems with specific values
+    Class to check for problems with specific values
     """
     def __nonzero__(self):
@@ -159 +155 @@
 
 def _findModels(dir):
-    """
-    """
     # List of plugin objects
     plugins = {}
@@ -198 +192 @@
                     else:
                         filename = os.path.join(dir, item)
-                        plugins[name] = sasview_model.make_class_from_file(filename) 
+                        plugins[name] = load_custom_model(filename)
 
                 except:
@@ -252 +246 @@
 class ModelManagerBase:
     """
-        Base class for the model manager
+    Base class for the model manager
     """
     ## external dict for models
@@ -273 +267 @@
 
     def __init__(self):
-        """
-        """
         self.model_dictionary = {}
         self.stored_plugins = {}
@@ -300 +292 @@
 
         # regular model names only
-        base_message = "Unable to load model {0}"
         self.model_name_list = []
 
         #Build list automagically from sasmodels package
-        for model in sasview_model.standard_models():
+        for model in load_standard_models():
             self.model_dictionary[model._model_info['name']] = model
             if model._model_info['structure_factor'] == True:
@@ -328 +319 @@
         """
         check the last time the plugin dir has changed and return true
-         is the directory was modified else return false
+        is the directory was modified else return false
         """
         is_modified = False