Changeset 348bc8b in sasview for docs


Ignore:
Timestamp:
Aug 17, 2016 6:08:39 AM (8 years ago)
Author:
lewis
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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
254f088
Parents:
4699761 (diff), e4c897b (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' into file-converter

Location:
docs/sphinx-docs
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified docs/sphinx-docs/build_sphinx.py

    reff1a8fc r8096b446  
    3535#/sasview-local-trunk/docs/sphinx-docs/build_sphinx.py 
    3636SASMODELS_SOURCE_PROLOG = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc") 
     37SASMODELS_SOURCE_MAGNETISM = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc", "ref", "magnetism") 
     38SASMODELS_SOURCE_MAGIMG = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc", "ref", "magnetism", "mag_img") 
    3739SASMODELS_SOURCE_REF_MODELS = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc", "ref", "models") 
    3840SASMODELS_SOURCE_MODELS = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc", "model") 
     
    4345SASMODELS_DEST_MODELS = os.path.join(CURRENT_SCRIPT_DIR, "source", "user", "models") 
    4446SASMODELS_DEST_IMG = os.path.join(CURRENT_SCRIPT_DIR,  "source", "user", "model-imgs", "new-models") 
     47SASMODELS_DEST_MAGIMG = os.path.join(CURRENT_SCRIPT_DIR,  "source", "user", "mag_img") 
    4548SASMODELS_DEST_BUILDIMG = os.path.join(CURRENT_SCRIPT_DIR,  "source", "user", "models", "img") 
    4649 
     
    136139 
    137140            copy_tree(docs, dest_dir) 
    138              
     141 
    139142    # Now pickup testdata_help.rst 
    140143#    print os.path.abspath(SASVIEW_TEST) 
     
    143146    if os.path.exists(SASVIEW_TEST): 
    144147       print "Found docs folder at ", SASVIEW_TEST 
    145        shutil.copytree(SASVIEW_TEST, SPHINX_SOURCE_TEST)        
    146  
    147     print "=== And the Sasmodels Docs ==="  
     148       shutil.copytree(SASVIEW_TEST, SPHINX_SOURCE_TEST) 
     149 
     150    print "=== And the Sasmodels Docs ===" 
    148151    # Make sure we have the relevant images for the new sasmodels documentation 
    149152    # First(!) we'll make a local reference copy for SasView (/new-models will be cleaned each build) 
     
    174177            shutil.copy(fromhere,tohere) 
    175178        else: print "no source directorty",SASMODELS_SOURCE_AUTOIMG ,"was found" 
    176      
     179 
    177180    # And the rst prolog with the unit substitutions 
    178181    if os.path.exists(SASMODELS_SOURCE_PROLOG): 
     
    186189                    tohere=os.path.join(SASMODELS_DEST_PROLOG,files) 
    187190                    shutil.copy(fromhere,tohere) 
     191 
     192    if os.path.exists(SASMODELS_SOURCE_MAGNETISM): 
     193        print "Found docs folder SASMODELS_SOURCE_MAGNETISM at ", SASMODELS_SOURCE_MAGNETISM 
     194        if os.path.exists(SASMODELS_DEST_REF_MODELS): 
     195            print "Found docs folder SASMODELS_DEST_REF_MODELS   at ", SASMODELS_DEST_REF_MODELS 
     196            print "Copying sasmodels model toctree files..." 
     197            for files in os.listdir(SASMODELS_SOURCE_MAGNETISM): 
     198                if files.endswith(".rst"): 
     199                    fromhere=os.path.join(SASMODELS_SOURCE_MAGNETISM,files) 
     200                    tohere=os.path.join(SASMODELS_DEST_REF_MODELS,files) 
     201                    shutil.copy(fromhere,tohere) 
     202 
     203    if os.path.exists(SASMODELS_SOURCE_MAGIMG): 
     204        print "Found img  folder SASMODELS_SOURCE_MAGIMG    at ", SASMODELS_SOURCE_MAGIMG 
     205        if not os.path.exists(SASMODELS_DEST_MAGIMG): 
     206            print "Missing docs folder SASMODELS_DEST_MAGIMG at ", SASMODELS_DEST_MAGIMG 
     207            os.makedirs(SASMODELS_DEST_MAGIMG) 
     208            print "created SASMODELS_DEST_MAGIMG at ", SASMODELS_DEST_MAGIMG 
     209        print "Copying sasmodels model auto-generated image files..." 
     210        for files in os.listdir(SASMODELS_SOURCE_MAGIMG): 
     211            fromhere=os.path.join(SASMODELS_SOURCE_MAGIMG,files) 
     212            tohere=os.path.join(SASMODELS_DEST_MAGIMG,files) 
     213            shutil.copy(fromhere,tohere) 
     214        else: print "no source directorty",SASMODELS_SOURCE_MAGIMG ,"was found" 
    188215 
    189216    if os.path.exists(SASMODELS_SOURCE_REF_MODELS): 
  • TabularUnified docs/sphinx-docs/source/user/tools.rst

    r8f46df7 reb8da5f  
    88 
    99   Data Operations Utility <sasgui/perspectives/calculator/data_operator_help> 
    10        
     10 
    1111   Density/Volume Calculator <sasgui/perspectives/calculator/density_calculator_help> 
    12     
     12 
    1313   Generic SANS Calculator <sasgui/perspectives/calculator/sas_calculator_help> 
    14     
     14 
    1515   Image Viewer <sasgui/perspectives/calculator/image_viewer_help> 
    16     
     16 
    1717   Kiessig Thickness Calculator <sasgui/perspectives/calculator/kiessig_calculator_help> 
    18     
     18 
    1919   SLD Calculator <sasgui/perspectives/calculator/sld_calculator_help> 
    20     
     20 
    2121   Slit Size Calculator <sasgui/perspectives/calculator/slit_calculator_help> 
    22     
     22 
    2323   Q Resolution Estimator <sasgui/perspectives/calculator/resolution_calculator_help> 
    24     
     24 
    2525   Python Shell <sasgui/perspectives/calculator/python_shell_help> 
    26     
     26 
     27   File Converter <sasgui/perspectives/file_converter/file_converter_help> 
Note: See TracChangeset for help on using the changeset viewer.