Changeset 2ece3851 in sasview

Timestamp:

Feb 13, 2015 11:52:12 AM (10 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:

3e2ebbb

Parents:

64c8fc1 (diff), f620870 (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

Files:

• build_tools/conda/bumps/bld.bat (added)
• build_tools/conda/bumps/build.sh (added)
• build_tools/conda/bumps/meta.yaml (added)
• build_tools/conda/periodictable/bld.bat (added)
• build_tools/conda/periodictable/build.sh (added)
• build_tools/conda/periodictable/meta.yaml (added)
• build_tools/conda/unittest-xml-reporting/bld.bat (added)
• build_tools/conda/unittest-xml-reporting/build.sh (added)
• build_tools/conda/unittest-xml-reporting/meta.yaml (added)
• docs/sphinx-docs/build_sphinx.py (modified) (1 diff)
• docs/sphinx-docs/source/user/user.rst (modified) (2 diffs)
• src/sas/calculator/media/density_calculator_help.rst (modified) (1 diff)
• src/sas/calculator/media/kiessig_calculator_help.rst (modified) (1 diff)
• src/sas/calculator/media/resolution_calculator_help.rst (modified) (1 diff)
• src/sas/calculator/media/sas_calculator_help.rst (modified) (1 diff)
• src/sas/calculator/media/sld_calculator.rst (deleted)
• src/sas/calculator/media/sld_calculator_help.rst (added)
• src/sas/calculator/media/slit_calculator_help.rst (modified) (1 diff)
• src/sas/data_util/media/data_operator_help.rst (modified) (1 diff)
• src/sas/fit/media/fitting_help.rst (modified) (1 diff)
• src/sas/guiframe/media/data_explorer_help.rst (modified) (1 diff)
• src/sas/guiframe/media/graph_help.rst (modified) (1 diff)
• src/sas/invariant/media/invariant_help.rst (modified) (1 diff)
• src/sas/invariant/media/pr_help.rst (modified) (1 diff)
• src/sas/perspectives/calculator/media/image_viewer_help.rst (added)
• src/sas/perspectives/calculator/media/python_shell_help.rst (added)

docs/sphinx-docs/build_sphinx.py

@@ -65 +65 @@
             print "Found docs folder at \"%s\"." % docs
 
-            dest_dir_name = os.path.basename(os.path.dirname(docs))
-            dest_dir = os.path.join(SPHINX_SOURCE, "user", dest_dir_name)
+            dest_dir_part = os.path.dirname(os.path.relpath(docs, SASVIEW_SRC))
+            if os.sep in dest_dir_part:
+                dest_dir_part = dest_dir_part[dest_dir_part.index(os.sep) + 1:]
+            dest_dir = os.path.join(SPHINX_SOURCE, "user", dest_dir_part)
 
             copy_tree(docs, dest_dir)

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>

src/sas/calculator/media/density_calculator_help.rst

@@ -1 +1 @@
 ..density_calculator_help.rst
 
+Density/Volume Calculator Tool
+==============================
+
 Placeholder for density calculator help

src/sas/calculator/media/kiessig_calculator_help.rst

@@ -1 +1 @@
 ..kiessig_calculator_help.rst
 
+Kiessig Thickness Calculator Tool
+=================================
+
 Placeholder for Kiessig calculator help

src/sas/calculator/media/resolution_calculator_help.rst

@@ -1 +1 @@
 ..resolution_calculator_help.rst
 
+Resolution Calculator
+=====================
+
 Placeholder for resolution calculator help

src/sas/calculator/media/sas_calculator_help.rst

@@ -1 +1 @@
 ..sas_calculator_help.rst
 
+Generic Scattering Calculator Tool
+==================================
+
 Placeholder for generic SAS calculator help

src/sas/calculator/media/slit_calculator_help.rst

@@ -1 +1 @@
 ..slit_calculator_help.rst
 
+Slit Size Calculator Tool
+=========================
+
 Placeholder for slit calculator help

src/sas/data_util/media/data_operator_help.rst

@@ -1 +1 @@
 ..data_operator_help.rst
 
+Data Operations Tool
+====================
+
 Placeholder for data operator help

src/sas/fit/media/fitting_help.rst

@@ -1 +1 @@
 ..fitting_help.rst
 
+Fitting Perspective
+===================
+
 Placeholder for fitting help

src/sas/guiframe/media/data_explorer_help.rst

@@ -1 +1 @@
 ..data_explorer_help.rst
 
+Loading Data
+============
+
 Placeholder for data explorer help

src/sas/guiframe/media/graph_help.rst

@@ -1 +1 @@
 ..graph_help.rst
 
+Plotting Data/Models
+====================
+
 Placeholder for graph help

src/sas/invariant/media/invariant_help.rst

@@ -1 +1 @@
 ..invariant_help.rst
 
+Invariant Calculation Perspective
+=================================
+
 Placeholder for invariant help

src/sas/invariant/media/pr_help.rst

@@ -1 +1 @@
 ..pr_help.rst
 
+P(r) Inversion Perspective
+==========================
+
 Placeholder for P(r) help