Changes in / [44e8f48:a4a1ac9] in sasview


Ignore:
Files:
3 added
9 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    r1b605fb r153b75a  
    3434/docs/sphinx-docs/build 
    3535/docs/sphinx-docs/source-temp 
    36 /docs/sphinx-docs/source/dev/api 
    37 /docs/sphinx-docs/source/user/guiframe 
    38 /docs/sphinx-docs/source/user/models 
    39 /docs/sphinx-docs/source/user/sasview 
    40 /docs/sphinx-docs/source/user/perspectives 
    4136/docs/sphinx-docs/katex*.zip 
    4237/docs/sphinx-docs/node_modules 

  • docs/sphinx-docs/build_sphinx.py

    rdf72475 r153b75a  
    88from __future__ import print_function 
    99 
    10 import subprocess 
     10import sys 
    1111import os 
    1212from os.path import join as joinpath, abspath, dirname, isdir, exists, relpath 
    13 import sys 
    14 import fnmatch 
    1513import shutil 
     14import subprocess 
    1615import imp 
    17  
    1816from glob import glob 
    1917from distutils.dir_util import copy_tree 
    … …  
    2119from distutils.spawn import find_executable 
    2220 
    23 from shutil import copy 
    24 from os import listdir 
    25  
    26 platform = '.%s-%s'%(get_platform(),sys.version[:3]) 
     21PLATFORM = '.%s-%s'%(get_platform(), sys.version[:3]) 
    2722 
    2823# sphinx paths 
    … …  
    3530SASVIEW_ROOT = joinpath(SPHINX_ROOT, '..', '..') 
    3631SASVIEW_DOCS = joinpath(SPHINX_ROOT, "source") 
    37 SASVIEW_BUILD = abspath(joinpath(SASVIEW_ROOT, "build", "lib"+platform)) 
     32SASVIEW_BUILD = abspath(joinpath(SASVIEW_ROOT, "build", "lib"+PLATFORM)) 
    3833SASVIEW_MEDIA_SOURCE = joinpath(SASVIEW_ROOT, "src", "sas") 
    3934SASVIEW_DOC_TARGET = joinpath(SASVIEW_BUILD, "doc") 
    … …  
    6560 
    6661def inplace_change(filename, old_string, new_string): 
    67 # Thanks to http://stackoverflow.com/questions/4128144/replace-string-within-file-contents 
    68         s=open(filename).read() 
    69         if old_string in s: 
    70                 print('Changing "{old_string}" to "{new_string}"'.format(**locals())) 
    71                 s=s.replace(old_string, new_string) 
    72                 f=open(filename, 'w') 
    73                 f.write(s) 
    74                 f.flush() 
    75                 f.close() 
    76         else: 
    77                 print('No occurences of "{old_string}" found.'.format(**locals())) 
     62    # Thanks to http://stackoverflow.com/questions/4128144/replace-string-within-file-contents 
     63    s = open(filename).read() 
     64    if old_string in s: 
     65        print('Changing "{old_string}" to "{new_string}"'.format(**locals())) 
     66        s = s.replace(old_string, new_string) 
     67        with open(filename, 'w') as f: 
     68            f.write(s) 
     69    else: 
     70        print('No occurences of "{old_string}" found.'.format(**locals())) 
    7871 
    7972def _remove_dir(dir_path): 
    … …  
    241234        finally: 
    242235            fd_in.close() 
    243     with ZipFile(cache_path) as zip: 
    244         zip.extractall(destination) 
     236    with ZipFile(cache_path) as archive: 
     237        archive.extractall(destination) 
    245238 
    246239def convert_katex(): 

  • docs/sphinx-docs/source/conf.py

    ra8bbba2 rb229a3b  
    1111# All configuration values have a default; values that are commented out 
    1212# serve to show the default. 
     13from __future__ import print_function 
    1314 
    1415import sys, os, collections 
    … …  
    2223sys.path.insert(0, build_lib) 
    2324sys.path.insert(0, os.path.abspath('_extensions')) # for sphinx extensions 
    24 print "-- path --" 
    25 print "\n".join(sys.path) 
     25print("-- path --") 
     26print("\n".join(sys.path)) 
    2627 
    2728# -- General configuration ----------------------------------------------------- 
    … …  
    8081version = '4.2' 
    8182# The full version, including alpha/beta/rc tags. 
    82 release = '4.2.0-beta' 
     83release = '4.2.0' 
    8384 
    8485# The language for content autogenerated by Sphinx. Refer to documentation 

  • docs/sphinx-docs/source/rst_prolog

    r1659f54 r153b75a  
     1.. TODO: This file is ignored!  Prolog comes from sasmodels/doc/rst_prolog. 
     2 
    13.. Set up some substitutions to make life easier... 
    24 

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

    r3bd677b re873408  
    1010:download:`Getting Started with Sasview <sasview/getting_started_with_sasview.pdf>` 
    1111 
     12:download:`Basic 1D Fitting in Sasview <sasview/basic_1d_fitting_in_sasview_v3x_4x.pdf>` 
     13 
     14:download:`Simultaneous 1D Fitting in Sasview <sasview/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf>` 
     15 
    1216:download:`Old Tutorial <sasview/Tutorial.pdf>` 

  • src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst

    r643efb5 r346745a  
    1111----------- 
    1212 
    13 This tool enables X-ray users to calculate the slit size (FWHM/2) for smearing 
    14 based on their half beam profile data. 
     13This tool enables X-ray users to calculate the slit size (FWHM/2) for resolution  
     14smearing purposes based on their half beam profile data (as Q vs Intensity; any  
     15other data fields are ignored). 
    1516 
    16 *NOTE! Whilst it may have some more generic applicability, the calculator has 
    17 only been tested with beam profile data from Anton-Paar SAXSess\ :sup:`TM` software.* 
     17Method 
     18------ 
     19 
     20The tool works by sequentially summing 10 or more intensity values until a  
     21maximum value is attained. It then locates the Q values for the points just before,  
     22and just after, **half** of this maximum value and interpolates between them to get  
     23an accurate value for the Q value for the half maximum. 
     24 
     25NOTE! Whilst it may have some more generic applicability, the calculator has 
     26only been tested with beam profile data from Anton-Paar SAXSess\ :sup:`TM`\  software. 
     27The beam profile file does not carry any information about the units of the  
     28Q data. It is probably |nm^-1| but the resolution calculations assume the slit  
     29height/width has units of |Ang^-1|. If the beam profile data is not in these  
     30units then it, or the result, must be manually converted. 
    1831 
    1932.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
    … …  
    2740 
    2841   *NOTE! To see an example of the beam profile file format, visit the file 
    29    beam profile.DAT in your {installation_directory}/SasView/test folder.* 
     42   beam profile.DAT in your {installation_directory}/SasView/test_1d folder.* 
    3043 
    31443) Once a data is loaded, the slit size is automatically computed and displayed 
    3245   in the tool window. 
    3346 
    34 *NOTE! The beam profile file does not carry any information about the units of 
    35 the Q data. This calculator assumes the data has units of 1/\ |Ang|\ . If the 
    36 data is not in these units it must be manually converted beforehand.* 
    37  
    3847.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
    3948 
    40 .. note::  This help document was last changed by Steve King, 01May2015 
     49.. note::  This help document was last changed by Steve King, 09Sep2018 

  • src/sas/sasgui/perspectives/fitting/basepage.py

    rfa412df rb4398819  
    27782778        Function called when 'Help' button is pressed next to model 
    27792779        of interest.  This calls DocumentationWindow from 
    2780         documentation_window.py. It will load the top level of the model 
    2781         help documenation sphinx generated html if no model is presented. 
    2782         If a model IS present then if documention for that model exists 
    2783         it will load to that  point otherwise again it will go to the top. 
    2784         For Wx2.8 and below is used (i.e. non-released through installer) 
    2785         a browser is loaded and the top of the model documentation only is 
    2786         accessible because webbrowser module does not pass anything after 
    2787         the # to the browser. 
     2780        documentation_window.py. It will load the top level of the html model 
     2781        help documenation sphinx generated if either a plugin model (which 
     2782        normally does not have an html help help file) is selected or if no 
     2783        model is selected. Otherwise, if a regula model is selected, the 
     2784        documention for that model will be sent to a browser window. 
     2785 
     2786        :todo the quick fix for no documentation in plugins is the if statment. 
     2787        However, the right way to do this would be to check whether the hmtl 
     2788        file exists and load the model docs if it does and the general docs if 
     2789        it doesn't - this will become important if we ever figure out how to 
     2790        build docs for plugins on the fly.  Sep 9, 2018 -PDB 
    27882791 
    27892792        :param event: on Help Button pressed event 
    27902793        """ 
    27912794 
    2792         if self.model is not None: 
     2795        if (self.model is not None) and (self.categorybox.GetValue() 
     2796                                         != "Plugin Models"): 
    27932797            name = self.formfactorbox.GetValue() 
    27942798            _TreeLocation = 'user/models/%s.html' % name 

  • src/sas/sasview/__init__.py

    ra8bbba2 rb229a3b  
    1 __version__ = "4.2.0-beta" 
     1__version__ = "4.2.0" 
    22__build__ = "GIT_COMMIT" 

  • src/sas/sasview/local_config.py

    rb963b20 rb229a3b  
    4848'''This work benefited from the use of the SasView application, originally developed under NSF Award DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project Grant No 654000.''' 
    4949_acknowledgement_citation = \ 
    50 '''M. Doucet et al. SasView Version 4.1.2, Zenodo, 10.5281/zenodo.825675''' 
     50'''M. Doucet et al. SasView Version 4.2, Zenodo, 10.5281/zenodo.1412041''' 
    5151 
    5252_acknowledgement =  \ 
Note: See TracChangeset for help on using the changeset viewer.