Changes in / [197260f:273a6d7] in sasview

Files:

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

docs/sphinx-docs/build_sphinx.py

@@ -150 +150 @@
     if os.path.exists(SASMODELS_SOURCE_IMG):
         print "Found img  folder SASMODELS_SOURCE_IMG    at ", SASMODELS_SOURCE_IMG
-        if os.path.exists(SASMODELS_DEST_IMG):
-            print "Found img  folder SASMODELS_DEST_IMG      at ", SASMODELS_DEST_IMG
-            print "Copying sasmodels model image files..."
-            for files in os.listdir(SASMODELS_SOURCE_IMG):
-                fromhere=os.path.join(SASMODELS_SOURCE_IMG,files)
-                tohere=os.path.join(SASMODELS_DEST_IMG,files)
-                shutil.copy(fromhere,tohere)
+        if not os.path.exists(SASMODELS_DEST_IMG):
+            print "Missing docs folder SASMODELS_DEST_IMG at ", SASMODELS_DEST_IMG
+            os.makedirs(SASMODELS_DEST_IMG)
+            print "created SASMODELS_DEST_BUILDIMG at ", SASMODELS_DEST_BUILDIMG
+        else: print "Found img  folder SASMODELS_DEST_IMG      at ", SASMODELS_DEST_IMG
+        print "Copying sasmodels model image files..."
+        for files in os.listdir(SASMODELS_SOURCE_IMG):
+            fromhere=os.path.join(SASMODELS_SOURCE_IMG,files)
+            tohere=os.path.join(SASMODELS_DEST_IMG,files)
+            shutil.copy(fromhere,tohere)
+    else: print "cannot find SASMODELS_SOURCE_IMG", SASMODELS_SOURCE_IMG
 
     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)
+        if not os.path.exists(SASMODELS_DEST_IMG):
+            print "Missing docs folder SASMODELS_DEST_IMG at ", ASMODELS_DEST_IMG
+            os.makedirs(SASMODELS_DEST_BUILDIMG)
+            print "created SASMODELS_DEST_BUILDIMG at ", SASMODELS_DEST_BUILDIMG
+        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)
+        else: print "no source directorty",SASMODELS_SOURCE_AUTOIMG ,"was found"
     
     # And the rst prolog with the unit substitutions

docs/sphinx-docs/source/user/sasgui/perspectives/fitting/optimizer.rst

@@ -404 +404 @@
 Like differential evolution, DREAM will evaluate $k$ points in parallel,
 where $k$ is the size of the population.
+
+.. _option-burn:
 
 Options

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

@@ -12 +12 @@
     models/adsorbed_layer.rst
     models/binary_hard_sphere.rst
+    models/core_multi_shell.rst
     models/core_shell_sphere.rst
     models/fuzzy_sphere.rst

src/sas/sascalc/calculator/BaseComponent.py

@@ -119 +119 @@
             q = [q[0], q[1], q[2], ....]
 
-        ..note::
-          Due to 2D speed issue, no anisotropic scattering
-          is supported for python models, thus C-models should have
-          their own evalDistribution methods.
+        .. note:: Due to 2D speed issue, no anisotropic scattering
+                  is supported for python models, thus C-models should have
+                  their own evalDistribution methods.
 
         The method is then called the following way: ::

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