Changes in / [390494d:afdb3b3] in sasview


Ignore:
Files:
2 deleted
10 edited

Legend:

Unmodified
Added
Removed

  • build_tools/conda_qt5_osx.yml

    r79d3025 ra1b49a7  
    5757 - kiwisolver=1.0.1=py36h2d50403_2 
    5858 - libffi=3.2.1=hfc679d8_5 
    59  - libgfortran=3.0.1 
     59 - libgfortran=3.0.0=1001 
    6060 - libiconv=1.15=h1de35cc_1004 
    6161 - libpng=1.6.36=ha441bb4_1000 

  • build_tools/conda_qt5_win_commercial.yml

    r34c1352 r13c552b  
    2222   - periodictable==1.5.0 
    2323   - xhtml2pdf==0.2.3 
    24    - ../../../PyQt5_commercial-5.12-5.12.1-cp35.cp36.cp37.cp38-none-win_amd64.whl 
     24   - ../../../PyQt5_commercial-5.11.3-5.11.2-cp35.cp36.cp37.cp38-none-win_amd64.whl 
    2525   - qt5reactor==0.5 
    2626   - qtconsole 

  • build_tools/jenkins_qt5_win.bat

    rd1b525b rda046c99  
    8181 
    8282:: READY FOR INNO 
    83 %PYTHON% installer_generator64.py 
     83%PYTHON% installer_generator.py 
    8484%INNO% installer.iss 
    8585cd Output 

  • build_tools/jenkins_qt5_win_commercial.bat

    r4e61e9a r17f7df4  
    8181 
    8282:: READY FOR INNO 
    83 %PYTHON% installer_generator64.py 
     83%PYTHON% installer_generator.py 
    8484%INNO% installer.iss 
    8585cd Output 

  • build_tools/jenkins_ubuntu_build.sh

    rec867f04 r8e76e49  
    6464tar czvf SasView.tar.gz SasView 
    6565 
    66 #Ymls storage 
    67 cd $WORKSPACE 
    68 conda env export >  env-build.yml 
    69 conda list --explicit > explicit.yml 
    70  
    71 a='/home/sasview/logs/' 
    72 b='_env_build.yml' 
    73 DEST_FILE=$a$BUILD_NUMBER$b 
    74 cp env-build.yml $DEST_FILE 

  • docs/sphinx-docs/source/index.rst

    r091eee64 r5a73356a  
    1010   :maxdepth: 1 
    1111 
    12    USER DOCUMENTATION <user/user> 
     12   User Documentation <user/user> 
    1313 
    14    DEVELOPER DOCUMENTATION <dev/dev> 
    15     
    16    Release Notes <user/RELEASE> 
    17     
     14   Developer Documentation <dev/dev> 

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

    r091eee64 r59dfb53  
    66plug-in fitting models for *SasView* for all to use. 
    77 
    8 .. note::  
    9     These plug-in models require SasView version 4.0 or later. However,  
    10     not *all* models may work with *every* version of SasView because  
    11     of changes to our API. 
     8.. note:: These plug-in models require SasView version 4.0 or later. 
    129 
    1310Contributed models should be written in Python (only version 2.7.x is 
    … …  
    1512combination of Python and C. You only need to upload the .py/.c source 
    1613code files to the Marketplace! 
    17  
    18 Please put a comment in your code to indicate which version of SasView you  
    19 wrote the model for. 
    2014 
    2115For guidance on how to write a plugin model see :ref:`Writing_a_Plugin` . It 

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

    r091eee64 r3bd677b  
    88.. note:: In Windows use [Alt]-[Cursor left] to return to the previous page 
    99 
    10 The following tutorial was written for Version 2.x but is still a useful overview of  
    11 much of the analysis capability in SasView (but disregard Appendix XIII if using  
    12 Version 4.2 or later) 
     10:download:`Getting Started with Sasview <sasview/getting_started_with_sasview.pdf>` 
    1311 
    1412:download:`Old Tutorial <sasview/Tutorial.pdf>` 
    15  
    16 The following tutorials have been written for Version 4.x 
    17  
    18 :download:`Getting Started with Sasview <sasview/getting_started_with_sasview.pdf>` 
    19  
    20 :download:`Basic 1D Fitting in Sasview <sasview/basic_1d_fitting_in_sasview_v3x_4x.pdf>` 
    21  
    22 :download:`Simultaneous 1D Fitting in Sasview <sasview/simultaneous_1d_fitting_in_sasview_v3x_4x.pdf>` 
    23  
    24 :download:`Correlation Function Analysis in SasView <sasview/correlation_function_analysis_in_sasview_v4x.pdf>` 

  • installers/license.txt

    r091eee64 r2f6d340  
    1919developed under NSF award DMR-0520547."* 
    2020 
    21 (C) 2009-2019 UTK, UMD, ESS, NIST, ORNL, ISIS, ILL, DLS, DUT 
     21(C) 2009-2015 UTK, UMD, ESS, NIST, ORNL, ISIS, ILL, DLS, DUT 

  • src/sas/qtgui/MainWindow/GuiManager.py

    r091eee64 r33c0561  
    10191019    def actionTutorial(self): 
    10201020        """ 
    1021         Open the page with tutorial PDF links 
    1022         """ 
    1023         helpfile = "/user/tutorial.html" 
    1024         self.showHelp(helpfile) 
     1021        Open the tutorial PDF file with default PDF renderer 
     1022        """ 
     1023        # Not terribly safe here. Shell injection warning. 
     1024        # isfile() helps but this probably needs a better solution. 
     1025        if os.path.isfile(self._tutorialLocation): 
     1026            result = subprocess.Popen([self._tutorialLocation], shell=True) 
    10251027 
    10261028    def actionAcknowledge(self): 
Note: See TracChangeset for help on using the changeset viewer.