Changeset 48153283 in sasview for docs

Timestamp:

Feb 17, 2015 3:46:30 AM (9 years ago)

Author:

smk78

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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

36c5910

Parents:

920928f (diff), 5dfdfa7 (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.git

Location:

docs/sphinx-docs

Files:

• build_sphinx.py (modified) (3 diffs)
• source/user/user.rst (modified) (2 diffs)

docs/sphinx-docs/build_sphinx.py

@@ -10 +10 @@
 import fnmatch
 import shutil
+import imp
 
 from distutils.dir_util import copy_tree
@@ -17 +18 @@
 
 CURRENT_SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+
+run = imp.load_source('run', os.path.join(CURRENT_SCRIPT_DIR, '..', '..', 'run.py'))
+run.prepare()
 
 SASVIEW_SRC = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "src")
@@ -108 +112 @@
     build()
         
-print "=== Done ==="
+    print "=== Done ==="

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

@@ -12 +12 @@
    Plotting Data/Models <guiframe/graph_help>
    
-   Fitting Perspective <fitting/fitting_help>
+   Fitting Perspective <fit/fitting_help>
    
    P(r) Inversion Perspective <invariant/pr_help>
@@ -33 +33 @@
    Generic Scattering Calculator Tool <calculator/sas_calculator_help>
    
-   Python Shell Tool
+   Python Shell Tool <perspectives/calculator/python_shell_help>
    
-   Image Viewer Tool
+   Image Viewer Tool <perspectives/calculator/image_viewer_help>