Changeset be2775f in sasview

Timestamp:

Mar 21, 2016 4:37:11 PM (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:

70e5f97

Parents:

d85b0c7 (diff), a8787f9 (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

Files:

• docs/sphinx-docs/build_sphinx.py (modified) (4 diffs)
• docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_gui_help.bmp (modified) (previous)
• docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mag_vector.bmp (modified) (previous)
• docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mag_vector.bmp (modified) (previous)
• docs/sphinx-docs/source/user/sasgui/perspectives/fitting/new_model.bmp (modified) (previous)
• docs/sphinx-docs/source/user/sasgui/perspectives/fitting/plot_button.bmp (modified) (previous)
• docs/sphinx-docs/source/user/sasgui/perspectives/fitting/view_button.bmp (modified) (previous)
• docs/sphinx-docs/source/user/shape-sphere.rst (modified) (1 diff)
• docs/sphinx-docs/source/user/user.rst (modified) (1 diff)
• setup.py (modified) (1 diff)
• src/sas/sascalc/calculator/BaseComponent.py (modified) (2 diffs)
• src/sas/sasgui/guiframe/data_processor.py (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/models.py (modified) (1 diff)

docs/sphinx-docs/build_sphinx.py

@@ -38 +38 @@
 SASMODELS_SOURCE_MODELS = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc", "model")
 SASMODELS_SOURCE_IMG = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc", "model", "img")
+SASMODELS_SOURCE_AUTOIMG = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc", "_build", "html","_images")
 SASMODELS_DEST_PROLOG = os.path.join(CURRENT_SCRIPT_DIR, "source")
 SASMODELS_DEST_REF_MODELS = os.path.join(CURRENT_SCRIPT_DIR, "source", "user")
 SASMODELS_DEST_MODELS = os.path.join(CURRENT_SCRIPT_DIR, "source", "user", "models")
 SASMODELS_DEST_IMG = os.path.join(CURRENT_SCRIPT_DIR,  "source", "user", "model-imgs", "new-models")
+SASMODELS_DEST_BUILDIMG = os.path.join(CURRENT_SCRIPT_DIR,  "source", "user", "models", "img")
 
 #if os.path.exists(SASMODELS_SOURCE_PROLOG):
@@ -145 +147 @@
     print "=== And the Sasmodels Docs ===" 
     # Make sure we have the relevant images for the new sasmodels documentation
+    # First(!) we'll make a local reference copy for SasView (/new-models will be cleaned each build)
     if os.path.exists(SASMODELS_SOURCE_IMG):
         print "Found img  folder SASMODELS_SOURCE_IMG    at ", SASMODELS_SOURCE_IMG
@@ -155 +158 @@
                 shutil.copy(fromhere,tohere)
 
+    if os.path.exists(SASMODELS_SOURCE_AUTOIMG):
+        print "Found img  folder SASMODELS_SOURCE_AUTOIMG    at ", SASMODELS_SOURCE_AUTOIMG
+        if os.path.exists(SASMODELS_DEST_IMG):
+            print "Copying sasmodels model auto-generated image files..."
+            for files in os.listdir(SASMODELS_SOURCE_AUTOIMG):
+                fromhere=os.path.join(SASMODELS_SOURCE_AUTOIMG,files)
+                tohere=os.path.join(SASMODELS_DEST_IMG,files)
+                shutil.copy(fromhere,tohere)
+    
     # And the rst prolog with the unit substitutions
     if os.path.exists(SASMODELS_SOURCE_PROLOG):
@@ -203 +215 @@
                     tohere=os.path.join(SASMODELS_DEST_MODELS,files)
                     shutil.copy(fromhere,tohere)
+        else:
+            print "Missing docs folder SASMODELS_DEST_MODELS at ", SASMODELS_DEST_MODELS
+            os.makedirs(SASMODELS_DEST_MODELS)
+            if not os.path.exists(SASMODELS_DEST_BUILDIMG):
+                os.makedirs(SASMODELS_DEST_BUILDIMG)
+            print "Created docs folder SASMODELS_DEST_MODELS at ", SASMODELS_DEST_MODELS
+            print "Copying model files for build..."
+            for files in os.listdir(SASMODELS_SOURCE_MODELS):
+                if files.endswith(".rst"):
+                    fromhere=os.path.join(SASMODELS_SOURCE_MODELS,files)
+                    tohere=os.path.join(SASMODELS_DEST_MODELS,files)
+                    shutil.copy(fromhere,tohere)
+            # No choice but to do this because model files are all coded for images in /models/img
+            print "Copying image files for build..."
+            for files in os.listdir(SASMODELS_DEST_IMG):
+                fromhere=os.path.join(SASMODELS_DEST_IMG,files)
+                tohere=os.path.join(SASMODELS_DEST_BUILDIMG,files)
+                shutil.copy(fromhere,tohere)
 
 

docs/sphinx-docs/source/user/shape-sphere.rst

@@ -15 +15 @@
     models/fuzzy_sphere.rst
     models/linear_pearls.rst
-    models/multi_shell.rst
+    models/multilayer_vesicle.rst
     models/onion.rst
     models/polymer_micelle.rst

docs/sphinx-docs/source/user/user.rst

@@ -7 +7 @@
    :maxdepth: 1
 
-   SasView (4.x.x) Model Documentation <index>
+   SasView Model Documentation <index>
 
    Analysis <analysis>

setup.py

@@ -254 +254 @@
 packages.append("sas.sasgui.plottools")
 
-# Last of the sas.models
-package_dir["sas.models"] = os.path.join("src", "sas", "models")
-packages.append("sas.models")
+# # Last of the sas.models
+# package_dir["sas.models"] = os.path.join("src", "sas", "models")
+# packages.append("sas.models")
 
 IGNORED_FILES = [".svn"]

src/sas/sascalc/calculator/BaseComponent.py

@@ -106 +106 @@
 
               qx_prime = [ qx[0], qx[1], qx[2], ....]
+
           and ::
+
               qy_prime = [ qy[0], qy[1], qy[2], ....]
 
         Then get ::
+
             q = numpy.sqrt(qx_prime^2+qy_prime^2)
 
         that is a qr in 1D array; ::
+
             q = [q[0], q[1], q[2], ....]
 
@@ -123 +127 @@
 
             evalDistribution(q)
+
         where q is a numpy array.
 

src/sas/sasgui/guiframe/data_processor.py

@@ -12 +12 @@
 #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
-   :align:   center
+
+.. image:: ./guiframe/media/BatchGridClassLayout.png
+   :align: center
 
 """

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

@@ -151 +151 @@
     try:
         import compileall
-        compileall.compile_dir(dir=dir, ddir=dir, force=1,
+        compileall.compile_dir(dir=dir, ddir=dir, force=0,
                                quiet=report_problem)
     except: