# # ChangeLog for src/sas/sasgui in sasview # # Generated by Trac 1.0.1 # Dec 23, 2024 10:17:57 PM Thu, 21 Sep 2017 20:14:06 GMT Paul Kienzle [12d3e0e] * src/sas/sasgui/perspectives/fitting/__init__.py (modified) reinstate empty plugin models directory Thu, 21 Sep 2017 19:12:37 GMT Paul Kienzle [724af06] * .gitignore (modified) * build_tools/jenkins_linux_build.sh (modified) * docs/sphinx-docs/Makefile (modified) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/convertKaTex.js (added) * docs/sphinx-docs/convertMathJax.js (added) * docs/sphinx-docs/source/_extensions/mathjax.py (added) * docs/sphinx-docs/source/_static/rendermath.js (added) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/rst_prolog (modified) * installers/README.txt (modified) * installers/sasview.spec (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/corfunc/transform_thread.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/realspace/__init__.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/images/utlogo.png (added) * src/sas/sasgui/guiframe/media/M_angles_pic.bmp (deleted) * src/sas/sasgui/guiframe/media/M_angles_pic.png (added) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/media/.DS_Store (added) * src/sas/sasgui/perspectives/calculator/media/density_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/density_tutor.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/density_tutor.png (added) * src/sas/sasgui/perspectives/calculator/media/dm_eq.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/dm_eq.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_i.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_i.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (modified) * src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/load_image.png (added) * src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/mag_vector.png (added) * src/sas/sasgui/perspectives/calculator/media/mqx.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mqx.png (added) * src/sas/sasgui/perspectives/calculator/media/mqy.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mqy.png (added) * src/sas/sasgui/perspectives/calculator/media/mxp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mxp.png (added) * src/sas/sasgui/perspectives/calculator/media/myp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/myp.png (added) * src/sas/sasgui/perspectives/calculator/media/mzp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mzp.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added) * src/sas/sasgui/perspectives/calculator/media/q.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/q.png (added) * src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/resolution_tutor.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/resolution_tutor.png (added) * src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/sigma_q.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sigma_q.png (added) * src/sas/sasgui/perspectives/calculator/media/sigma_table.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sigma_table.png (added) * src/sas/sasgui/perspectives/calculator/media/sld1.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sld1.png (added) * src/sas/sasgui/perspectives/calculator/media/sld2.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sld2.png (added) * src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/v_j.gif (deleted) * src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/corfunc/media/fig1.gif (deleted) * src/sas/sasgui/perspectives/corfunc/media/fig1.png (added) * src/sas/sasgui/perspectives/corfunc/media/fig2.gif (deleted) * src/sas/sasgui/perspectives/corfunc/media/fig2.png (added) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/M_angles_pic.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/M_angles_pic.png (added) * src/sas/sasgui/perspectives/fitting/media/batch_button_area.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/batch_button_area.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig0.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig0.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig1.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig1.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig2.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig2.png (added) * src/sas/sasgui/perspectives/fitting/media/dm_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/dm_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/edit_menu.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/edit_menu.png (added) * src/sas/sasgui/perspectives/fitting/media/file_menu.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/file_menu.png (added) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/m0x_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0x_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/m0y_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0y_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/m0z_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0z_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/mag_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/mag_vector.png (added) * src/sas/sasgui/perspectives/fitting/media/mqx.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mqx.png (added) * src/sas/sasgui/perspectives/fitting/media/mqy.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mqy.png (added) * src/sas/sasgui/perspectives/fitting/media/mxp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mxp.png (added) * src/sas/sasgui/perspectives/fitting/media/myp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/myp.png (added) * src/sas/sasgui/perspectives/fitting/media/mzp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mzp.png (added) * src/sas/sasgui/perspectives/fitting/media/new_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/new_model.png (added) * src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/plot_button.png (added) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/restore_batch_window.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/restore_batch_window.png (added) * src/sas/sasgui/perspectives/fitting/media/sld1.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sld1.png (added) * src/sas/sasgui/perspectives/fitting/media/sld2.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sld2.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/sm_image002.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image002.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image003.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image003.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image004.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image004.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image005.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image005.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image006.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image006.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image007.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image007.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image008.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image008.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image009.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image009.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image010.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image010.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image011.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image011.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image012.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image012.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image013.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image013.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image016.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image016.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image017.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image017.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image018.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image018.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image019.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image019.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image020.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image020.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image021.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image021.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image022.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image022.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image023.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image023.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image024.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image024.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image025.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image025.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image026.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image026.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image027.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image027.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image028.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image028.png (added) * src/sas/sasgui/perspectives/fitting/media/sum_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/sum_model.png (added) * src/sas/sasgui/perspectives/fitting/media/view_button.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/view_button.png (added) * src/sas/sasgui/perspectives/fitting/media/view_data_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/view_data_model.png (added) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/invariant/media/image001.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image002.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image003.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image004.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image005.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image005.png (added) * src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified) * src/sas/sasview/__init__.py (modified) * src/sas/sasview/local_config.py (modified) * src/sas/sasview/test/2d_data/SANS2D_100254_merged_ISIS2D.txt (added) * src/sas/sasview/test/2d_data/YBCO_12685__ISIS2D.txt (added) * test/corfunc/test/gamma1_out.txt (added) * test/corfunc/test/gamma3_out.txt (added) * test/corfunc/test/idf_out.txt (added) * test/corfunc/test/utest_corfunc.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/utest_sasview.py (modified) * build_tools/deploy.bat (modified) * build_tools/jenkins_osx_build.sh (modified) * build_tools/jenkins_win64_build.bat (modified) * build_tools/jenkins_win_build.bat (modified) * build_tools/travis_build.sh (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * installers/MANIFEST.IN (moved) * installers/README-next-release.txt (moved) * installers/installer_generator.py (moved) * installers/license.txt (moved) * installers/macholib_patch.py (added) * installers/sasview_console.py (added) * installers/sasview_gui.py (added) * installers/setup.cfg (moved) * installers/setup_exe.py (moved) * installers/setup_mac.py (added) * installers/version.txt (moved) * run.py (modified) * sasview/sasview.py (deleted) * sasview/setup_mac.py (deleted) * setup.py (modified) * src/sas/logger_config.py (moved) * src/sas/logging.ini (moved) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sasgui/__init__.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/__init__.py (modified) * src/sas/sasgui/guiframe/acknowledgebox.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/perspectives/calculator/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/invariant/__init__.py (modified) * src/sas/sasgui/plottools/__init__.py (modified) * src/sas/sasgui/plottools/config.py (modified) * src/sas/sasview/custom_config.py (moved) * src/sas/sasview/images/SVwelcome.png (moved) * src/sas/sasview/images/SVwelcome_mini.png (moved) * src/sas/sasview/images/angles.png (moved) * src/sas/sasview/images/angles_flat.png (moved) * src/sas/sasview/images/ansto_logo.png (moved) * src/sas/sasview/images/ball.icns (moved) * src/sas/sasview/images/ball.ico (moved) * src/sas/sasview/images/danse_logo.png (moved) * src/sas/sasview/images/dls_logo.png (moved) * src/sas/sasview/images/ess_logo.png (moved) * src/sas/sasview/images/ill_logo.png (moved) * src/sas/sasview/images/isis_logo.png (moved) * src/sas/sasview/images/nist_logo.png (moved) * src/sas/sasview/images/nsf_logo.png (moved) * src/sas/sasview/images/ornl_logo.png (moved) * src/sas/sasview/images/sns_logo.png (moved) * src/sas/sasview/images/tudelft_logo.png (moved) * src/sas/sasview/images/umd_logo.png (moved) * src/sas/sasview/images/utlogo.gif (moved) * src/sas/sasview/media/README.txt (moved) * src/sas/sasview/media/Tutorial.pdf (moved) * src/sas/sasview/media/getting_started_with_sasview.pdf (moved) * src/sas/sasview/sasview.py (added) * src/sas/sasview/test/1d_data/ testdata_line1.txt (moved) * src/sas/sasview/test/1d_data/1000A_sphere_dsm.xml (moved) * src/sas/sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml (moved) * src/sas/sasview/test/1d_data/APS_DND-CAT.TXT (moved) * src/sas/sasview/test/1d_data/Anton-Paar.pdh (moved) * src/sas/sasview/test/1d_data/CoreXY_ShellZ.txt (moved) * src/sas/sasview/test/1d_data/ISIS_83404.TXT (moved) * src/sas/sasview/test/1d_data/ISIS_98929.TXT (moved) * src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_10_percent.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_30_percent.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_40_percent.xml (moved) * src/sas/sasview/test/1d_data/PolySpheres.txt (moved) * src/sas/sasview/test/1d_data/beam profile.DAT (moved) * src/sas/sasview/test/1d_data/circular_test.txt (moved) * src/sas/sasview/test/1d_data/cyl_400_20.txt (moved) * src/sas/sasview/test/1d_data/cyl_400_40.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata1.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata2.txt (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (moved) * src/sas/sasview/test/1d_data/latex_smeared.xml (moved) * src/sas/sasview/test/1d_data/rpa_igor.txt (moved) * src/sas/sasview/test/1d_data/saxess_example.pdh (moved) * src/sas/sasview/test/1d_data/sphere_60_q0_2.txt (moved) * src/sas/sasview/test/1d_data/sphere_80.txt (moved) * src/sas/sasview/test/1d_data/testdata_line.txt (moved) * src/sas/sasview/test/1d_data/testdata_line3.txt (moved) * src/sas/sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/2d_data/2P_New.sans (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/2d_data/Dec07031.ASC (added) * src/sas/sasview/test/2d_data/HiResSAN14.ASC (added) * src/sas/sasview/test/2d_data/MAR07262.ASC (added) * src/sas/sasview/test/2d_data/P123_D2O_10_percent.dat (moved) * src/sas/sasview/test/2d_data/P123_D2O_30_percent.dat (moved) * src/sas/sasview/test/2d_data/P123_D2O_40_percent.dat (moved) * src/sas/sasview/test/2d_data/P_New.sans (moved) * src/sas/sasview/test/2d_data/SILIC009.ASC (added) * src/sas/sasview/test/2d_data/SILIC010.DAT (moved) * src/sas/sasview/test/2d_data/SILIC010_noheader.DAT (moved) * src/sas/sasview/test/2d_data/SILIC010_noheader_3col.DAT (moved) * src/sas/sasview/test/2d_data/exp18_14_igor_2dqxqy.dat (moved) * src/sas/sasview/test/README.txt (moved) * src/sas/sasview/test/convertible_files/APS_X.TXT (moved) * src/sas/sasview/test/convertible_files/APS_Y.TXT (moved) * src/sas/sasview/test/convertible_files/FIT2D_I.TXT (moved) * src/sas/sasview/test/convertible_files/FIT2D_Q.TXT (moved) * src/sas/sasview/test/convertible_files/Z83000.I1D (moved) * src/sas/sasview/test/convertible_files/Z83000.QAX (moved) * src/sas/sasview/test/convertible_files/Z83001.I1D (moved) * src/sas/sasview/test/convertible_files/Z83001.QAX (moved) * src/sas/sasview/test/convertible_files/Z83002.I1D (moved) * src/sas/sasview/test/convertible_files/Z98000.I1D (moved) * src/sas/sasview/test/convertible_files/Z98000.QAX (moved) * src/sas/sasview/test/convertible_files/Z98001.I1D (moved) * src/sas/sasview/test/convertible_files/Z98001.QAX (moved) * src/sas/sasview/test/convertible_files/Z98002.I1D (moved) * src/sas/sasview/test/coordinate_data/A_Raw_Example-1.omf (moved) * src/sas/sasview/test/coordinate_data/diamond.pdb (moved) * src/sas/sasview/test/coordinate_data/dna.pdb (moved) * src/sas/sasview/test/coordinate_data/sld_file.sld (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_gif.gif (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_png.png (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_tif.tif (moved) * src/sas/sasview/test/media/testdata_help.rst (moved) * src/sas/sasview/test/nr_data/NR_Ni_down_state.txt (moved) * src/sas/sasview/test/nr_data/NR_Ni_up_state.txt (moved) * src/sas/sasview/test/other_files/dist _THETA_weights.txt (moved) * src/sas/sasview/test/other_files/phi_weights.txt (moved) * src/sas/sasview/test/other_files/radius_dist.txt (moved) * src/sas/sasview/test/other_files/theta_weights.txt (moved) * src/sas/sasview/test/save_states/constrained_fit_project.svs (moved) * src/sas/sasview/test/save_states/fit_pr_and_invariant_project.svs (moved) * src/sas/sasview/test/save_states/fitstate.fitv (moved) * src/sas/sasview/test/save_states/project_multiplicative_constraint.svs (moved) * src/sas/sasview/test/save_states/prstate.prv (moved) * src/sas/sasview/test/save_states/test.inv (moved) * src/sas/sasview/test/save_states/test002.inv (moved) * src/sas/sasview/test/sesans_data/sphere2micron.ses (moved) * src/sas/sasview/test/sesans_data/sphere_isis.ses (moved) * src/sas/sasview/test/upcoming_formats/1000A_sphere_sm.xml (moved) * src/sas/sasview/welcome_panel.py (moved) * src/sas/sasview/wxcruft.py (moved) Merge branch 'master' into ticket-887-reorg Wed, 20 Sep 2017 23:26:17 GMT Paul Kienzle [5a405bd] * src/sas/sasgui/guiframe/__init__.py (modified) * src/sas/sasgui/perspectives/calculator/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/invariant/__init__.py (modified) bundle resource files by directory Wed, 20 Sep 2017 23:24:29 GMT Paul Kienzle [6e50a8d] * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) remove unused methods from CategoryInstaller Wed, 20 Sep 2017 16:21:41 GMT Paul Kienzle [f80b416e] * docs/sphinx-docs/source/conf.py (modified) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/local_config.py (modified) * sasview/sasview.spec (modified) * sasview/setup_exe.py (modified) * sasview/test/2d_data/SANS2D_100254_merged_ISIS2D.txt (added) * sasview/test/2d_data/YBCO_12685__ISIS2D.txt (added) * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/corfunc/transform_thread.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * test/corfunc/test/gamma1_out.txt (added) * test/corfunc/test/gamma3_out.txt (added) * test/corfunc/test/idf_out.txt (added) * test/corfunc/test/utest_corfunc.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/utest_sasview.py (modified) * .gitignore (modified) * build_tools/jenkins_linux_build.sh (modified) * docs/sphinx-docs/Makefile (modified) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/convertKaTex.js (added) * docs/sphinx-docs/convertMathJax.js (added) * docs/sphinx-docs/source/_extensions/mathjax.py (added) * docs/sphinx-docs/source/_static/rendermath.js (added) * docs/sphinx-docs/source/rst_prolog (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/realspace/__init__.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/images/utlogo.png (added) * src/sas/sasgui/guiframe/media/M_angles_pic.bmp (deleted) * src/sas/sasgui/guiframe/media/M_angles_pic.png (added) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/.DS_Store (added) * src/sas/sasgui/perspectives/calculator/media/density_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/density_tutor.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/density_tutor.png (added) * src/sas/sasgui/perspectives/calculator/media/dm_eq.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/dm_eq.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_i.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_i.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (modified) * src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/mag_vector.png (added) * src/sas/sasgui/perspectives/calculator/media/mqx.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mqx.png (added) * src/sas/sasgui/perspectives/calculator/media/mqy.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mqy.png (added) * src/sas/sasgui/perspectives/calculator/media/mxp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mxp.png (added) * src/sas/sasgui/perspectives/calculator/media/myp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/myp.png (added) * src/sas/sasgui/perspectives/calculator/media/mzp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mzp.png (added) * src/sas/sasgui/perspectives/calculator/media/q.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/q.png (added) * src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/resolution_tutor.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/resolution_tutor.png (added) * src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/sigma_q.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sigma_q.png (added) * src/sas/sasgui/perspectives/calculator/media/sigma_table.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sigma_table.png (added) * src/sas/sasgui/perspectives/calculator/media/sld1.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sld1.png (added) * src/sas/sasgui/perspectives/calculator/media/sld2.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sld2.png (added) * src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/v_j.gif (deleted) * src/sas/sasgui/perspectives/corfunc/media/fig1.gif (deleted) * src/sas/sasgui/perspectives/corfunc/media/fig1.png (added) * src/sas/sasgui/perspectives/corfunc/media/fig2.gif (deleted) * src/sas/sasgui/perspectives/corfunc/media/fig2.png (added) * src/sas/sasgui/perspectives/fitting/media/M_angles_pic.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/M_angles_pic.png (added) * src/sas/sasgui/perspectives/fitting/media/batch_button_area.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/batch_button_area.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig0.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig0.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig1.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig1.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig2.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig2.png (added) * src/sas/sasgui/perspectives/fitting/media/dm_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/dm_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/edit_menu.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/edit_menu.png (added) * src/sas/sasgui/perspectives/fitting/media/file_menu.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/file_menu.png (added) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/m0x_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0x_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/m0y_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0y_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/m0z_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0z_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/mag_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/mag_vector.png (added) * src/sas/sasgui/perspectives/fitting/media/mqx.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mqx.png (added) * src/sas/sasgui/perspectives/fitting/media/mqy.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mqy.png (added) * src/sas/sasgui/perspectives/fitting/media/mxp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mxp.png (added) * src/sas/sasgui/perspectives/fitting/media/myp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/myp.png (added) * src/sas/sasgui/perspectives/fitting/media/mzp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mzp.png (added) * src/sas/sasgui/perspectives/fitting/media/new_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/new_model.png (added) * src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/plot_button.png (added) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/restore_batch_window.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/restore_batch_window.png (added) * src/sas/sasgui/perspectives/fitting/media/sld1.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sld1.png (added) * src/sas/sasgui/perspectives/fitting/media/sld2.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sld2.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/sm_image002.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image002.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image003.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image003.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image004.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image004.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image005.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image005.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image006.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image006.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image007.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image007.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image008.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image008.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image009.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image009.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image010.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image010.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image011.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image011.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image012.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image012.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image013.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image013.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image016.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image016.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image017.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image017.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image018.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image018.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image019.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image019.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image020.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image020.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image021.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image021.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image022.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image022.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image023.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image023.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image024.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image024.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image025.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image025.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image026.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image026.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image027.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image027.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image028.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image028.png (added) * src/sas/sasgui/perspectives/fitting/media/sum_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/sum_model.png (added) * src/sas/sasgui/perspectives/fitting/media/view_button.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/view_button.png (added) * src/sas/sasgui/perspectives/fitting/media/view_data_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/view_data_model.png (added) * src/sas/sasgui/perspectives/invariant/media/image001.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image002.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image003.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image004.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image005.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image005.png (added) * src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified) Merge branch 'master' into ticket-639-katex Wed, 20 Sep 2017 11:55:53 GMT Paul Kienzle [13374be] * sasview/test/2d_data/SANS2D_100254_merged_ISIS2D.txt (added) * sasview/test/2d_data/YBCO_12685__ISIS2D.txt (added) * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/corfunc/transform_thread.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/load_image.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added) * src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * test/corfunc/test/gamma1_out.txt (added) * test/corfunc/test/gamma3_out.txt (added) * test/corfunc/test/idf_out.txt (added) * test/corfunc/test/utest_corfunc.py (modified) * test/utest_sasview.py (modified) * docs/sphinx-docs/source/conf.py (modified) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/local_config.py (modified) * sasview/sasview.spec (modified) * sasview/setup_exe.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) Merge branch 'master' into 4_1_issues Wed, 20 Sep 2017 10:01:02 GMT smk78 [2a399ca] * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) Corrected parameter labels in Corfunc perspective The Corfunc panel was ... Tue, 19 Sep 2017 18:07:00 GMT Paul Kienzle [932519a] * sasview/test/2d_data/SANS2D_100254_merged_ISIS2D.txt (added) * sasview/test/2d_data/YBCO_12685__ISIS2D.txt (added) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/load_image.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * test/corfunc/test/utest_corfunc.py (modified) * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/corfunc/transform_thread.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified) * test/corfunc/test/gamma1_out.txt (added) * test/corfunc/test/gamma3_out.txt (added) * test/corfunc/test/idf_out.txt (added) * test/utest_sasview.py (modified) Merge branch 'master' into corfunc3d Tue, 19 Sep 2017 13:28:58 GMT GitHub [66acafe] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * sasview/images/dls_logo.png (moved) * sasview/sasview.py (modified) * src/sas/sasgui/guiframe/images/angles.png (deleted) * src/sas/sasgui/guiframe/images/angles_flat.png (deleted) * src/sas/sasgui/guiframe/images/ansto_logo.png (deleted) * src/sas/sasgui/guiframe/images/danse_logo.png (deleted) * src/sas/sasgui/guiframe/images/ess_logo.png (deleted) * src/sas/sasgui/guiframe/images/ill_logo.png (deleted) * src/sas/sasgui/guiframe/images/isis_logo.png (deleted) * src/sas/sasgui/guiframe/images/nist_logo.png (deleted) * src/sas/sasgui/guiframe/images/nsf_logo.png (deleted) * src/sas/sasgui/guiframe/images/ornl_logo.png (deleted) * src/sas/sasgui/guiframe/images/sns_logo.png (deleted) * src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted) * src/sas/sasgui/guiframe/images/umd_logo.png (deleted) * src/sas/sasgui/guiframe/images/utlogo.gif (deleted) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/load_image.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * test/corfunc/test/utest_corfunc.py (modified) Merge pull request #104 from lewisodriscoll/ticket-861 Ticket 861 Tue, 19 Sep 2017 12:48:03 GMT Paul Kienzle [2746eab] * src/sas/sasgui/guiframe/documentation_window.py (modified) don't use wx html renderer on windows since it doesn't render mathjax Tue, 19 Sep 2017 11:38:25 GMT Paul Kienzle [dfc9604] * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/media/load_image.png (modified) * src/sas/sasgui/perspectives/calculator/media/pic_convert.png (modified) * src/sas/sasgui/perspectives/calculator/media/pic_plot.png (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * test/corfunc/test/utest_corfunc.py (modified) * .gitignore (modified) * build_tools/jenkins_linux_build.sh (modified) * docs/sphinx-docs/Makefile (modified) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/convertKaTex.js (added) * docs/sphinx-docs/convertMathJax.js (added) * docs/sphinx-docs/source/_extensions/mathjax.py (added) * docs/sphinx-docs/source/_static/rendermath.js (added) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/rst_prolog (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/realspace/__init__.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/images/utlogo.png (added) * src/sas/sasgui/guiframe/media/M_angles_pic.bmp (deleted) * src/sas/sasgui/guiframe/media/M_angles_pic.png (added) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/.DS_Store (added) * src/sas/sasgui/perspectives/calculator/media/density_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/density_tutor.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/density_tutor.png (added) * src/sas/sasgui/perspectives/calculator/media/dm_eq.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/dm_eq.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_i.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_i.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (modified) * src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/mag_vector.png (added) * src/sas/sasgui/perspectives/calculator/media/mqx.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mqx.png (added) * src/sas/sasgui/perspectives/calculator/media/mqy.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mqy.png (added) * src/sas/sasgui/perspectives/calculator/media/mxp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mxp.png (added) * src/sas/sasgui/perspectives/calculator/media/myp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/myp.png (added) * src/sas/sasgui/perspectives/calculator/media/mzp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mzp.png (added) * src/sas/sasgui/perspectives/calculator/media/q.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/q.png (added) * src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/resolution_tutor.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/resolution_tutor.png (added) * src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/sigma_q.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sigma_q.png (added) * src/sas/sasgui/perspectives/calculator/media/sigma_table.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sigma_table.png (added) * src/sas/sasgui/perspectives/calculator/media/sld1.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sld1.png (added) * src/sas/sasgui/perspectives/calculator/media/sld2.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sld2.png (added) * src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/v_j.gif (deleted) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/corfunc/media/fig1.gif (deleted) * src/sas/sasgui/perspectives/corfunc/media/fig1.png (added) * src/sas/sasgui/perspectives/corfunc/media/fig2.gif (deleted) * src/sas/sasgui/perspectives/corfunc/media/fig2.png (added) * src/sas/sasgui/perspectives/fitting/media/M_angles_pic.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/M_angles_pic.png (added) * src/sas/sasgui/perspectives/fitting/media/batch_button_area.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/batch_button_area.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig0.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig0.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig1.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig1.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig2.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig2.png (added) * src/sas/sasgui/perspectives/fitting/media/dm_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/dm_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/edit_menu.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/edit_menu.png (added) * src/sas/sasgui/perspectives/fitting/media/file_menu.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/file_menu.png (added) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/m0x_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0x_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/m0y_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0y_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/m0z_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0z_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/mag_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/mag_vector.png (added) * src/sas/sasgui/perspectives/fitting/media/mqx.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mqx.png (added) * src/sas/sasgui/perspectives/fitting/media/mqy.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mqy.png (added) * src/sas/sasgui/perspectives/fitting/media/mxp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mxp.png (added) * src/sas/sasgui/perspectives/fitting/media/myp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/myp.png (added) * src/sas/sasgui/perspectives/fitting/media/mzp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mzp.png (added) * src/sas/sasgui/perspectives/fitting/media/new_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/new_model.png (added) * src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/plot_button.png (added) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/restore_batch_window.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/restore_batch_window.png (added) * src/sas/sasgui/perspectives/fitting/media/sld1.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sld1.png (added) * src/sas/sasgui/perspectives/fitting/media/sld2.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sld2.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/sm_image002.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image002.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image003.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image003.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image004.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image004.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image005.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image005.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image006.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image006.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image007.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image007.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image008.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image008.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image009.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image009.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image010.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image010.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image011.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image011.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image012.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image012.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image013.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image013.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image016.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image016.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image017.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image017.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image018.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image018.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image019.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image019.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image020.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image020.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image021.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image021.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image022.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image022.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image023.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image023.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image024.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image024.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image025.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image025.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image026.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image026.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image027.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image027.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image028.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image028.png (added) * src/sas/sasgui/perspectives/fitting/media/sum_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/sum_model.png (added) * src/sas/sasgui/perspectives/fitting/media/view_button.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/view_button.png (added) * src/sas/sasgui/perspectives/fitting/media/view_data_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/view_data_model.png (added) * src/sas/sasgui/perspectives/invariant/media/image001.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image002.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image003.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image004.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image005.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image005.png (added) * src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified) Merge branch 'master' into ticket-639-katex Tue, 19 Sep 2017 02:07:49 GMT GitHub [8c945ec] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * test/corfunc/test/utest_corfunc.py (modified) * sasview/images/dls_logo.png (moved) * sasview/sasview.py (modified) * src/sas/sasgui/guiframe/images/angles.png (deleted) * src/sas/sasgui/guiframe/images/angles_flat.png (deleted) * src/sas/sasgui/guiframe/images/ansto_logo.png (deleted) * src/sas/sasgui/guiframe/images/danse_logo.png (deleted) * src/sas/sasgui/guiframe/images/ess_logo.png (deleted) * src/sas/sasgui/guiframe/images/ill_logo.png (deleted) * src/sas/sasgui/guiframe/images/isis_logo.png (deleted) * src/sas/sasgui/guiframe/images/nist_logo.png (deleted) * src/sas/sasgui/guiframe/images/nsf_logo.png (deleted) * src/sas/sasgui/guiframe/images/ornl_logo.png (deleted) * src/sas/sasgui/guiframe/images/sns_logo.png (deleted) * src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted) * src/sas/sasgui/guiframe/images/umd_logo.png (deleted) * src/sas/sasgui/guiframe/images/utlogo.gif (deleted) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/load_image.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) Merge pull request #101 from lewisodriscoll/4.2.0-fixes 4.2.0 fixes Mon, 18 Sep 2017 18:19:13 GMT Paul Kienzle [c5cfb20] * .pydevproject (modified) * sasview/images/dls_logo.png (moved) * sasview/sasview.py (modified) * sasview/test/2d_data/Dec07031.ASC (deleted) * sasview/test/2d_data/HiResSAN14.ASC (deleted) * sasview/test/2d_data/MAR07262.ASC (deleted) * sasview/test/2d_data/SILIC009.ASC (deleted) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sasgui/guiframe/images/angles.png (deleted) * src/sas/sasgui/guiframe/images/angles_flat.png (deleted) * src/sas/sasgui/guiframe/images/ansto_logo.png (deleted) * src/sas/sasgui/guiframe/images/danse_logo.png (deleted) * src/sas/sasgui/guiframe/images/ess_logo.png (deleted) * src/sas/sasgui/guiframe/images/ill_logo.png (deleted) * src/sas/sasgui/guiframe/images/isis_logo.png (deleted) * src/sas/sasgui/guiframe/images/nist_logo.png (deleted) * src/sas/sasgui/guiframe/images/nsf_logo.png (deleted) * src/sas/sasgui/guiframe/images/ornl_logo.png (deleted) * src/sas/sasgui/guiframe/images/sns_logo.png (deleted) * src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted) * src/sas/sasgui/guiframe/images/umd_logo.png (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * test/sasdataloader/test/AR07232_rest.ASC (deleted) * test/sasdataloader/test/testLoad.py (deleted) * test/sasdataloader/test/testplugings.py (deleted) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) * test/utest_sasview.py (modified) * .gitignore (modified) * build_tools/jenkins_linux_build.sh (modified) * docs/sphinx-docs/Makefile (modified) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/convertKaTex.js (added) * docs/sphinx-docs/convertMathJax.js (added) * docs/sphinx-docs/source/_extensions/mathjax.py (added) * docs/sphinx-docs/source/_static/rendermath.js (added) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/rst_prolog (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/realspace/__init__.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/images/utlogo.png (added) * src/sas/sasgui/guiframe/media/M_angles_pic.bmp (deleted) * src/sas/sasgui/guiframe/media/M_angles_pic.png (added) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/.DS_Store (added) * src/sas/sasgui/perspectives/calculator/media/density_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/density_tutor.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/density_tutor.png (added) * src/sas/sasgui/perspectives/calculator/media/dm_eq.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/dm_eq.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_i.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_i.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (modified) * src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/load_image.png (added) * src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/mag_vector.png (added) * src/sas/sasgui/perspectives/calculator/media/mqx.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mqx.png (added) * src/sas/sasgui/perspectives/calculator/media/mqy.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mqy.png (added) * src/sas/sasgui/perspectives/calculator/media/mxp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mxp.png (added) * src/sas/sasgui/perspectives/calculator/media/myp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/myp.png (added) * src/sas/sasgui/perspectives/calculator/media/mzp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mzp.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added) * src/sas/sasgui/perspectives/calculator/media/q.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/q.png (added) * src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/resolution_tutor.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/resolution_tutor.png (added) * src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/sigma_q.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sigma_q.png (added) * src/sas/sasgui/perspectives/calculator/media/sigma_table.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sigma_table.png (added) * src/sas/sasgui/perspectives/calculator/media/sld1.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sld1.png (added) * src/sas/sasgui/perspectives/calculator/media/sld2.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sld2.png (added) * src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/v_j.gif (deleted) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/corfunc/media/fig1.gif (deleted) * src/sas/sasgui/perspectives/corfunc/media/fig1.png (added) * src/sas/sasgui/perspectives/corfunc/media/fig2.gif (deleted) * src/sas/sasgui/perspectives/corfunc/media/fig2.png (added) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/media/M_angles_pic.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/M_angles_pic.png (added) * src/sas/sasgui/perspectives/fitting/media/batch_button_area.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/batch_button_area.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig0.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig0.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig1.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig1.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig2.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig2.png (added) * src/sas/sasgui/perspectives/fitting/media/dm_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/dm_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/edit_menu.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/edit_menu.png (added) * src/sas/sasgui/perspectives/fitting/media/file_menu.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/file_menu.png (added) * src/sas/sasgui/perspectives/fitting/media/m0x_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0x_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/m0y_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0y_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/m0z_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0z_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/mag_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/mag_vector.png (added) * src/sas/sasgui/perspectives/fitting/media/mqx.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mqx.png (added) * src/sas/sasgui/perspectives/fitting/media/mqy.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mqy.png (added) * src/sas/sasgui/perspectives/fitting/media/mxp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mxp.png (added) * src/sas/sasgui/perspectives/fitting/media/myp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/myp.png (added) * src/sas/sasgui/perspectives/fitting/media/mzp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mzp.png (added) * src/sas/sasgui/perspectives/fitting/media/new_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/new_model.png (added) * src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/plot_button.png (added) * src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/restore_batch_window.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/restore_batch_window.png (added) * src/sas/sasgui/perspectives/fitting/media/sld1.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sld1.png (added) * src/sas/sasgui/perspectives/fitting/media/sld2.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sld2.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/sm_image002.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image002.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image003.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image003.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image004.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image004.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image005.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image005.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image006.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image006.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image007.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image007.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image008.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image008.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image009.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image009.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image010.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image010.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image011.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image011.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image012.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image012.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image013.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image013.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image016.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image016.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image017.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image017.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image018.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image018.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image019.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image019.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image020.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image020.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image021.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image021.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image022.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image022.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image023.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image023.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image024.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image024.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image025.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image025.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image026.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image026.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image027.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image027.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image028.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image028.png (added) * src/sas/sasgui/perspectives/fitting/media/sum_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/sum_model.png (added) * src/sas/sasgui/perspectives/fitting/media/view_button.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/view_button.png (added) * src/sas/sasgui/perspectives/fitting/media/view_data_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/view_data_model.png (added) * src/sas/sasgui/perspectives/invariant/media/image001.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image002.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image003.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image004.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image005.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image005.png (added) * src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified) Merge branch 'master' into ticket-639-katex Mon, 18 Sep 2017 14:20:29 GMT Paul Kienzle [706bb4e] * .pydevproject (modified) * README.md (modified) * sasview/images/dls_logo.png (moved) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sasgui/guiframe/images/angles.png (deleted) * src/sas/sasgui/guiframe/images/angles_flat.png (deleted) * src/sas/sasgui/guiframe/images/ansto_logo.png (deleted) * src/sas/sasgui/guiframe/images/danse_logo.png (deleted) * src/sas/sasgui/guiframe/images/ess_logo.png (deleted) * src/sas/sasgui/guiframe/images/ill_logo.png (deleted) * src/sas/sasgui/guiframe/images/isis_logo.png (deleted) * src/sas/sasgui/guiframe/images/nist_logo.png (deleted) * src/sas/sasgui/guiframe/images/nsf_logo.png (deleted) * src/sas/sasgui/guiframe/images/ornl_logo.png (deleted) * src/sas/sasgui/guiframe/images/sns_logo.png (deleted) * src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted) * src/sas/sasgui/guiframe/images/umd_logo.png (deleted) * src/sas/sasgui/guiframe/images/utlogo.gif (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasview/sasview.py (modified) * test/sasdataloader/test/AR07232_rest.ASC (deleted) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) * .gitignore (modified) * build_tools/deploy.bat (modified) * build_tools/jenkins_linux_build.sh (modified) * build_tools/jenkins_osx_build.sh (modified) * build_tools/jenkins_win64_build.bat (modified) * build_tools/jenkins_win_build.bat (modified) * build_tools/travis_build.sh (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * installers/MANIFEST.IN (moved) * installers/README-next-release.txt (moved) * installers/README.txt (moved) * installers/installer_generator.py (moved) * installers/license.txt (moved) * installers/macholib_patch.py (added) * installers/sasview.spec (moved) * installers/sasview_console.py (added) * installers/sasview_gui.py (added) * installers/setup.cfg (moved) * installers/setup_exe.py (moved) * installers/setup_mac.py (added) * installers/version.txt (moved) * run.py (modified) * sasview/__init__.py (deleted) * sasview/setup_mac.py (deleted) * setup.py (modified) * src/sas/logger_config.py (moved) * src/sas/logging.ini (moved) * src/sas/sasgui/__init__.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/acknowledgebox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/plottools/__init__.py (modified) * src/sas/sasgui/plottools/config.py (modified) * src/sas/sasview/__init__.py (added) * src/sas/sasview/custom_config.py (moved) * src/sas/sasview/images/SVwelcome.png (moved) * src/sas/sasview/images/SVwelcome_mini.png (moved) * src/sas/sasview/images/angles.png (moved) * src/sas/sasview/images/angles_flat.png (moved) * src/sas/sasview/images/ansto_logo.png (moved) * src/sas/sasview/images/ball.icns (moved) * src/sas/sasview/images/ball.ico (moved) * src/sas/sasview/images/danse_logo.png (moved) * src/sas/sasview/images/ess_logo.png (moved) * src/sas/sasview/images/ill_logo.png (moved) * src/sas/sasview/images/isis_logo.png (moved) * src/sas/sasview/images/nist_logo.png (moved) * src/sas/sasview/images/nsf_logo.png (moved) * src/sas/sasview/images/ornl_logo.png (moved) * src/sas/sasview/images/sns_logo.png (moved) * src/sas/sasview/images/tudelft_logo.png (moved) * src/sas/sasview/images/umd_logo.png (moved) * src/sas/sasview/images/utlogo.gif (moved) * src/sas/sasview/local_config.py (moved) * src/sas/sasview/media/README.txt (moved) * src/sas/sasview/media/Tutorial.pdf (moved) * src/sas/sasview/media/getting_started_with_sasview.pdf (moved) * src/sas/sasview/test/1d_data/ testdata_line1.txt (moved) * src/sas/sasview/test/1d_data/1000A_sphere_dsm.xml (moved) * src/sas/sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml (moved) * src/sas/sasview/test/1d_data/APS_DND-CAT.TXT (moved) * src/sas/sasview/test/1d_data/Anton-Paar.pdh (moved) * src/sas/sasview/test/1d_data/CoreXY_ShellZ.txt (moved) * src/sas/sasview/test/1d_data/ISIS_83404.TXT (moved) * src/sas/sasview/test/1d_data/ISIS_98929.TXT (moved) * src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_10_percent.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_30_percent.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_40_percent.xml (moved) * src/sas/sasview/test/1d_data/PolySpheres.txt (moved) * src/sas/sasview/test/1d_data/beam profile.DAT (moved) * src/sas/sasview/test/1d_data/circular_test.txt (moved) * src/sas/sasview/test/1d_data/cyl_400_20.txt (moved) * src/sas/sasview/test/1d_data/cyl_400_40.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata1.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata2.txt (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (moved) * src/sas/sasview/test/1d_data/latex_smeared.xml (moved) * src/sas/sasview/test/1d_data/rpa_igor.txt (moved) * src/sas/sasview/test/1d_data/saxess_example.pdh (moved) * src/sas/sasview/test/1d_data/sphere_60_q0_2.txt (moved) * src/sas/sasview/test/1d_data/sphere_80.txt (moved) * src/sas/sasview/test/1d_data/testdata_line.txt (moved) * src/sas/sasview/test/1d_data/testdata_line3.txt (moved) * src/sas/sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/2d_data/2P_New.sans (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/2d_data/Dec07031.ASC (added) * src/sas/sasview/test/2d_data/HiResSAN14.ASC (added) * src/sas/sasview/test/2d_data/MAR07262.ASC (added) * src/sas/sasview/test/2d_data/P123_D2O_10_percent.dat (moved) * src/sas/sasview/test/2d_data/P123_D2O_30_percent.dat (moved) * src/sas/sasview/test/2d_data/P123_D2O_40_percent.dat (moved) * src/sas/sasview/test/2d_data/P_New.sans (moved) * src/sas/sasview/test/2d_data/SILIC009.ASC (added) * src/sas/sasview/test/2d_data/SILIC010.DAT (moved) * src/sas/sasview/test/2d_data/SILIC010_noheader.DAT (moved) * src/sas/sasview/test/2d_data/SILIC010_noheader_3col.DAT (moved) * src/sas/sasview/test/2d_data/exp18_14_igor_2dqxqy.dat (moved) * src/sas/sasview/test/README.txt (moved) * src/sas/sasview/test/convertible_files/APS_X.TXT (moved) * src/sas/sasview/test/convertible_files/APS_Y.TXT (moved) * src/sas/sasview/test/convertible_files/FIT2D_I.TXT (moved) * src/sas/sasview/test/convertible_files/FIT2D_Q.TXT (moved) * src/sas/sasview/test/convertible_files/Z83000.I1D (moved) * src/sas/sasview/test/convertible_files/Z83000.QAX (moved) * src/sas/sasview/test/convertible_files/Z83001.I1D (moved) * src/sas/sasview/test/convertible_files/Z83001.QAX (moved) * src/sas/sasview/test/convertible_files/Z83002.I1D (moved) * src/sas/sasview/test/convertible_files/Z98000.I1D (moved) * src/sas/sasview/test/convertible_files/Z98000.QAX (moved) * src/sas/sasview/test/convertible_files/Z98001.I1D (moved) * src/sas/sasview/test/convertible_files/Z98001.QAX (moved) * src/sas/sasview/test/convertible_files/Z98002.I1D (moved) * src/sas/sasview/test/coordinate_data/A_Raw_Example-1.omf (moved) * src/sas/sasview/test/coordinate_data/diamond.pdb (moved) * src/sas/sasview/test/coordinate_data/dna.pdb (moved) * src/sas/sasview/test/coordinate_data/sld_file.sld (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_gif.gif (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_png.png (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_tif.tif (moved) * src/sas/sasview/test/media/testdata_help.rst (moved) * src/sas/sasview/test/nr_data/NR_Ni_down_state.txt (moved) * src/sas/sasview/test/nr_data/NR_Ni_up_state.txt (moved) * src/sas/sasview/test/other_files/dist _THETA_weights.txt (moved) * src/sas/sasview/test/other_files/phi_weights.txt (moved) * src/sas/sasview/test/other_files/radius_dist.txt (moved) * src/sas/sasview/test/other_files/theta_weights.txt (moved) * src/sas/sasview/test/save_states/constrained_fit_project.svs (moved) * src/sas/sasview/test/save_states/fit_pr_and_invariant_project.svs (moved) * src/sas/sasview/test/save_states/fitstate.fitv (moved) * src/sas/sasview/test/save_states/project_multiplicative_constraint.svs (moved) * src/sas/sasview/test/save_states/prstate.prv (moved) * src/sas/sasview/test/save_states/test.inv (moved) * src/sas/sasview/test/save_states/test002.inv (moved) * src/sas/sasview/test/sesans_data/sphere2micron.ses (moved) * src/sas/sasview/test/sesans_data/sphere_isis.ses (moved) * src/sas/sasview/test/upcoming_formats/1000A_sphere_sm.xml (moved) * src/sas/sasview/welcome_panel.py (moved) * src/sas/sasview/wxcruft.py (moved) Merge branch 'master' into ticket-887-reorg Mon, 18 Sep 2017 13:43:24 GMT Paul Kienzle [f12d96e] * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/corfunc/transform_thread.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified) * .pydevproject (modified) * sasview/images/dls_logo.png (moved) * sasview/sasview.py (modified) * src/sas/sasgui/guiframe/images/angles.png (deleted) * src/sas/sasgui/guiframe/images/angles_flat.png (deleted) * src/sas/sasgui/guiframe/images/ansto_logo.png (deleted) * src/sas/sasgui/guiframe/images/danse_logo.png (deleted) * src/sas/sasgui/guiframe/images/ess_logo.png (deleted) * src/sas/sasgui/guiframe/images/ill_logo.png (deleted) * src/sas/sasgui/guiframe/images/isis_logo.png (deleted) * src/sas/sasgui/guiframe/images/nist_logo.png (deleted) * src/sas/sasgui/guiframe/images/nsf_logo.png (deleted) * src/sas/sasgui/guiframe/images/ornl_logo.png (deleted) * src/sas/sasgui/guiframe/images/sns_logo.png (deleted) * src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted) * src/sas/sasgui/guiframe/images/umd_logo.png (deleted) * src/sas/sasgui/guiframe/images/utlogo.gif (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) Merge remote-tracking branch 'repo-lewis/corfunc3d' into corfunc3d Mon, 18 Sep 2017 03:52:57 GMT butler [6d62b7f] * sasview/images/dls_logo.png (moved) * sasview/sasview.py (modified) * src/sas/sasgui/guiframe/images/angles.png (deleted) * src/sas/sasgui/guiframe/images/angles_flat.png (deleted) * src/sas/sasgui/guiframe/images/ansto_logo.png (deleted) * src/sas/sasgui/guiframe/images/danse_logo.png (deleted) * src/sas/sasgui/guiframe/images/ess_logo.png (deleted) * src/sas/sasgui/guiframe/images/ill_logo.png (deleted) * src/sas/sasgui/guiframe/images/isis_logo.png (deleted) * src/sas/sasgui/guiframe/images/nist_logo.png (deleted) * src/sas/sasgui/guiframe/images/nsf_logo.png (deleted) * src/sas/sasgui/guiframe/images/ornl_logo.png (deleted) * src/sas/sasgui/guiframe/images/sns_logo.png (deleted) * src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted) * src/sas/sasgui/guiframe/images/umd_logo.png (deleted) * src/sas/sasgui/guiframe/images/utlogo.gif (deleted) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * docs/sphinx-docs/source/conf.py (modified) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/local_config.py (modified) * sasview/sasview.spec (modified) * sasview/setup_exe.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) Merge remote-tracking branch 'origin/master' into 4_1_issues Mon, 18 Sep 2017 03:46:04 GMT butler [412e9e8b] * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/load_image.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added) Fix viewer documentation Replaced the three images for the ... Sun, 17 Sep 2017 18:55:16 GMT butler [6479f3a] * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) Add file choice Add file choice of all allowed image files (as opposed ... Sun, 17 Sep 2017 16:12:44 GMT butler [35d518f] * .pydevproject (modified) * README.md (modified) * docs/sphinx-docs/build_sphinx.py (modified) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/2d_data/Dec07031.ASC (deleted) * sasview/test/2d_data/HiResSAN14.ASC (deleted) * sasview/test/2d_data/MAR07262.ASC (deleted) * sasview/test/2d_data/SILIC009.ASC (deleted) * setup.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/IgorReader.py (deleted) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/defaults.json (deleted) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted) * src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/ascii2d_loader.py (added) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * test/fileconverter/test/cansas1d.xml (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/AR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.h5 (added) * test/sasdataloader/test/testLoad.py (deleted) * test/sasdataloader/test/testplugings.py (deleted) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_extension_registry.py (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) * test/sasdataloader/test/valid_cansas_xml.xml (added) * test/sasinvariant/test/utest_use_cases.py (modified) * test/utest_sasview.py (modified) * sasview/images/dls_logo.png (moved) * src/sas/sasgui/guiframe/images/angles.png (deleted) * src/sas/sasgui/guiframe/images/angles_flat.png (deleted) * src/sas/sasgui/guiframe/images/ansto_logo.png (deleted) * src/sas/sasgui/guiframe/images/danse_logo.png (deleted) * src/sas/sasgui/guiframe/images/ess_logo.png (deleted) * src/sas/sasgui/guiframe/images/ill_logo.png (deleted) * src/sas/sasgui/guiframe/images/isis_logo.png (deleted) * src/sas/sasgui/guiframe/images/nist_logo.png (deleted) * src/sas/sasgui/guiframe/images/nsf_logo.png (deleted) * src/sas/sasgui/guiframe/images/ornl_logo.png (deleted) * src/sas/sasgui/guiframe/images/sns_logo.png (deleted) * src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted) * src/sas/sasgui/guiframe/images/umd_logo.png (deleted) * src/sas/sasgui/guiframe/images/utlogo.gif (deleted) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) Merge remote-tracking branch 'origin/master' into ... Sun, 17 Sep 2017 00:26:13 GMT butler [b01ac8f] * .pydevproject (modified) * README.md (modified) * docs/sphinx-docs/build_sphinx.py (modified) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/2d_data/Dec07031.ASC (deleted) * sasview/test/2d_data/HiResSAN14.ASC (deleted) * sasview/test/2d_data/MAR07262.ASC (deleted) * sasview/test/2d_data/SILIC009.ASC (deleted) * setup.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/IgorReader.py (deleted) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/defaults.json (deleted) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted) * src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/ascii2d_loader.py (added) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * test/fileconverter/test/cansas1d.xml (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/AR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.h5 (added) * test/sasdataloader/test/testLoad.py (deleted) * test/sasdataloader/test/testplugings.py (deleted) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_extension_registry.py (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) * test/sasdataloader/test/valid_cansas_xml.xml (added) * test/sasinvariant/test/utest_use_cases.py (modified) * test/utest_sasview.py (modified) * sasview/images/dls_logo.png (moved) * src/sas/sasgui/guiframe/images/angles.png (deleted) * src/sas/sasgui/guiframe/images/angles_flat.png (deleted) * src/sas/sasgui/guiframe/images/ansto_logo.png (deleted) * src/sas/sasgui/guiframe/images/danse_logo.png (deleted) * src/sas/sasgui/guiframe/images/ess_logo.png (deleted) * src/sas/sasgui/guiframe/images/ill_logo.png (deleted) * src/sas/sasgui/guiframe/images/isis_logo.png (deleted) * src/sas/sasgui/guiframe/images/nist_logo.png (deleted) * src/sas/sasgui/guiframe/images/nsf_logo.png (deleted) * src/sas/sasgui/guiframe/images/ornl_logo.png (deleted) * src/sas/sasgui/guiframe/images/sns_logo.png (deleted) * src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted) * src/sas/sasgui/guiframe/images/umd_logo.png (deleted) * src/sas/sasgui/guiframe/images/utlogo.gif (deleted) Merge remote-tracking branch 'origin/master' into 969_about_box_logo Fri, 15 Sep 2017 16:30:40 GMT smk78 [ca383a0] * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) Two small corrections to new plugin help Fri, 15 Sep 2017 16:10:18 GMT krzywon [da9b239] * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Ignore blank lines when reporting results. refs #984 Fri, 15 Sep 2017 15:40:46 GMT smk78 [e081946] * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) Minor rst formatting fixes Fri, 15 Sep 2017 15:11:09 GMT smk78 [c56d9d74] * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) Revised some text. Fri, 15 Sep 2017 15:06:03 GMT smk78 [203669a] * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) Fix rst rendering Fri, 15 Sep 2017 14:45:36 GMT smk78 [f485ba0] * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) Updated fitting_help.rst amd plugin.rst in light of work on #767 & #861 Fri, 15 Sep 2017 10:52:44 GMT lewis [632fda9] * src/sas/sasgui/perspectives/fitting/models.py (modified) Fix old style plugin models not causing sasview to run Fri, 15 Sep 2017 09:58:04 GMT lewis [23359ccb] * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) Fix Sum/Multi model template Thu, 14 Sep 2017 18:28:11 GMT krzywon [e56f335] * .pydevproject (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * docs/sphinx-docs/source/conf.py (modified) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/local_config.py (modified) * sasview/sasview.spec (modified) * sasview/setup_exe.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) Merge branch 'master' into 4_1_issues Thu, 14 Sep 2017 14:38:26 GMT lewis [2504b5a] * src/sas/sasgui/perspectives/fitting/fitting.py (modified) Simplify S(Q) combobox updating code Thu, 14 Sep 2017 14:34:16 GMT lewis [79e6a33] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Display better error message if S(Q) is invalid Thu, 14 Sep 2017 14:13:13 GMT lewis [252d959] * src/sas/sasgui/perspectives/fitting/fitting.py (modified) Improve S(Q) combobox behaviour when plugins reloaded Thu, 14 Sep 2017 13:33:49 GMT lewis [33dc18f] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) Update S(Q) combobox when plugins reloaded Rather buggy. Seems related ... Thu, 14 Sep 2017 11:07:37 GMT lewis [908f090] * src/sas/sasgui/perspectives/fitting/models.py (modified) Add S(Q) plugin models to correct drop down Wed, 13 Sep 2017 14:27:29 GMT lewis [5c1c486] * .pydevproject (modified) * README.md (modified) * sasview/test/2d_data/Dec07031.ASC (deleted) * sasview/test/2d_data/HiResSAN14.ASC (deleted) * sasview/test/2d_data/MAR07262.ASC (deleted) * sasview/test/2d_data/SILIC009.ASC (deleted) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * test/sasdataloader/test/AR07232_rest.ASC (deleted) * test/sasdataloader/test/testLoad.py (deleted) * test/sasdataloader/test/testplugings.py (deleted) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) * test/utest_sasview.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * test/corfunc/test/utest_corfunc.py (modified) Merge branch 'master' into 4.2.0-fixes Wed, 13 Sep 2017 14:18:48 GMT lewis [2f5c49d] * .pydevproject (modified) * sasview/test/2d_data/Dec07031.ASC (deleted) * sasview/test/2d_data/HiResSAN14.ASC (deleted) * sasview/test/2d_data/MAR07262.ASC (deleted) * sasview/test/2d_data/SILIC009.ASC (deleted) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * test/sasdataloader/test/AR07232_rest.ASC (deleted) * test/sasdataloader/test/testLoad.py (deleted) * test/sasdataloader/test/testplugings.py (deleted) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) * test/utest_sasview.py (modified) * sasview/sasview.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) Merge branch 'master' into ticket-767 Wed, 13 Sep 2017 14:15:24 GMT GitHub [7b3f154] * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * .pydevproject (modified) * src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) Merge pull request #102 from SasView/FixingTicket741 Closes ticket #741 Mon, 11 Sep 2017 14:12:16 GMT krzywon [cd57c7d4] * README.md (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/2d_data/Dec07031.ASC (deleted) * sasview/test/2d_data/HiResSAN14.ASC (deleted) * sasview/test/2d_data/MAR07262.ASC (deleted) * sasview/test/2d_data/SILIC009.ASC (deleted) * setup.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/IgorReader.py (deleted) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/defaults.json (deleted) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted) * src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/ascii2d_loader.py (added) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) * test/fileconverter/test/cansas1d.xml (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/AR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.h5 (added) * test/sasdataloader/test/testLoad.py (deleted) * test/sasdataloader/test/testplugings.py (deleted) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_extension_registry.py (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) * test/sasdataloader/test/valid_cansas_xml.xml (added) * test/sasinvariant/test/utest_use_cases.py (modified) * test/utest_sasview.py (modified) * docs/sphinx-docs/source/conf.py (modified) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/local_config.py (modified) * sasview/sasview.spec (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) Merge branch 'master' into 4_1_issues # Conflicts: # ... Mon, 11 Sep 2017 13:13:56 GMT butler [05b0bf6] * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) Fix typos and improve last sentence. Mon, 11 Sep 2017 10:55:51 GMT lewis [729198e] * README.md (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/2d_data/Dec07031.ASC (deleted) * sasview/test/2d_data/HiResSAN14.ASC (deleted) * sasview/test/2d_data/MAR07262.ASC (deleted) * sasview/test/2d_data/SILIC009.ASC (deleted) * setup.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/IgorReader.py (deleted) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/defaults.json (deleted) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted) * src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/ascii2d_loader.py (added) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) * test/fileconverter/test/cansas1d.xml (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/AR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.h5 (added) * test/sasdataloader/test/testLoad.py (deleted) * test/sasdataloader/test/testplugings.py (deleted) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_extension_registry.py (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) * test/sasdataloader/test/valid_cansas_xml.xml (added) * test/sasinvariant/test/utest_use_cases.py (modified) * test/utest_sasview.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) Merge branch 'master' into FixingTicket741 Mon, 11 Sep 2017 10:08:09 GMT lewis [ccf58fb] * README.md (modified) * docs/sphinx-docs/build_sphinx.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * setup.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/IgorReader.py (deleted) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/defaults.json (deleted) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted) * src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/ascii2d_loader.py (added) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * test/fileconverter/test/cansas1d.xml (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/MAR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.h5 (added) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_extension_registry.py (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/valid_cansas_xml.xml (added) * test/sasinvariant/test/utest_use_cases.py (modified) * src/sas/sascalc/corfunc/corfunc_calculator.py (modified) * src/sas/sascalc/corfunc/transform_thread.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified) Merge branch 'master' into corfunc3d Mon, 11 Sep 2017 03:08:08 GMT butler [e6c74e8] * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) Rewrite Combine Batch Fit help based on feedback in ticket. Start with ... Sun, 10 Sep 2017 23:20:53 GMT butler [e32c98a] * README.md (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * setup.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/IgorReader.py (deleted) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/defaults.json (deleted) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted) * src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/ascii2d_loader.py (added) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) * test/fileconverter/test/cansas1d.xml (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/MAR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.h5 (added) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_extension_registry.py (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/valid_cansas_xml.xml (added) * test/sasinvariant/test/utest_use_cases.py (modified) * .pydevproject (modified) * src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) Merge remote-tracking branch 'origin/master' into ticket-597 Fri, 08 Sep 2017 15:22:46 GMT krzywon [c9ecd1b] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) Comment NXcanSAS reader and remove unused variable from fitpanel. Tue, 05 Sep 2017 19:43:19 GMT Paul Kienzle [96f00a0] * docs/sphinx-docs/source/conf.py (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) remove underscores from \text{} environment Tue, 05 Sep 2017 18:53:09 GMT Paul Kienzle [5cb0c87] * README.md (modified) * docs/sphinx-docs/build_sphinx.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * setup.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/IgorReader.py (deleted) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/defaults.json (deleted) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted) * src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/ascii2d_loader.py (added) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * test/fileconverter/test/cansas1d.xml (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/MAR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.h5 (added) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_extension_registry.py (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/valid_cansas_xml.xml (added) * test/sasinvariant/test/utest_use_cases.py (modified) * .gitignore (modified) * build_tools/jenkins_linux_build.sh (modified) * docs/sphinx-docs/Makefile (modified) * docs/sphinx-docs/convertKaTex.js (added) * docs/sphinx-docs/convertMathJax.js (added) * docs/sphinx-docs/source/_extensions/mathjax.py (added) * docs/sphinx-docs/source/_static/rendermath.js (added) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/rst_prolog (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/realspace/__init__.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/images/utlogo.gif (deleted) * src/sas/sasgui/guiframe/images/utlogo.png (added) * src/sas/sasgui/guiframe/media/M_angles_pic.bmp (deleted) * src/sas/sasgui/guiframe/media/M_angles_pic.png (added) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/.DS_Store (added) * src/sas/sasgui/perspectives/calculator/media/density_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/density_tutor.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/density_tutor.png (added) * src/sas/sasgui/perspectives/calculator/media/dm_eq.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/dm_eq.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_i.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_i.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.png (added) * src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (modified) * src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/load_image.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/load_image.png (added) * src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/mag_vector.png (added) * src/sas/sasgui/perspectives/calculator/media/mqx.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mqx.png (added) * src/sas/sasgui/perspectives/calculator/media/mqy.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mqy.png (added) * src/sas/sasgui/perspectives/calculator/media/mxp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mxp.png (added) * src/sas/sasgui/perspectives/calculator/media/myp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/myp.png (added) * src/sas/sasgui/perspectives/calculator/media/mzp.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/mzp.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_convert.png (added) * src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/pic_plot.png (added) * src/sas/sasgui/perspectives/calculator/media/q.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/q.png (added) * src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/resolution_tutor.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/resolution_tutor.png (added) * src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/sigma_q.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sigma_q.png (added) * src/sas/sasgui/perspectives/calculator/media/sigma_table.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sigma_table.png (added) * src/sas/sasgui/perspectives/calculator/media/sld1.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sld1.png (added) * src/sas/sasgui/perspectives/calculator/media/sld2.gif (deleted) * src/sas/sasgui/perspectives/calculator/media/sld2.png (added) * src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (modified) * src/sas/sasgui/perspectives/calculator/media/v_j.gif (deleted) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) * src/sas/sasgui/perspectives/corfunc/media/fig1.gif (deleted) * src/sas/sasgui/perspectives/corfunc/media/fig1.png (added) * src/sas/sasgui/perspectives/corfunc/media/fig2.gif (deleted) * src/sas/sasgui/perspectives/corfunc/media/fig2.png (added) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/media/M_angles_pic.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/M_angles_pic.png (added) * src/sas/sasgui/perspectives/fitting/media/batch_button_area.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/batch_button_area.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig0.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig0.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig1.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig1.png (added) * src/sas/sasgui/perspectives/fitting/media/cat_fig2.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/cat_fig2.png (added) * src/sas/sasgui/perspectives/fitting/media/dm_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/dm_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/edit_menu.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/edit_menu.png (added) * src/sas/sasgui/perspectives/fitting/media/file_menu.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/file_menu.png (added) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/m0x_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0x_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/m0y_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0y_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/m0z_eq.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/m0z_eq.png (added) * src/sas/sasgui/perspectives/fitting/media/mag_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/mag_vector.png (added) * src/sas/sasgui/perspectives/fitting/media/mqx.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mqx.png (added) * src/sas/sasgui/perspectives/fitting/media/mqy.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mqy.png (added) * src/sas/sasgui/perspectives/fitting/media/mxp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mxp.png (added) * src/sas/sasgui/perspectives/fitting/media/myp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/myp.png (added) * src/sas/sasgui/perspectives/fitting/media/mzp.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/mzp.png (added) * src/sas/sasgui/perspectives/fitting/media/new_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/new_model.png (added) * src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/plot_button.png (added) * src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/restore_batch_window.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/restore_batch_window.png (added) * src/sas/sasgui/perspectives/fitting/media/sld1.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sld1.png (added) * src/sas/sasgui/perspectives/fitting/media/sld2.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sld2.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/sm_image002.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image002.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image003.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image003.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image004.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image004.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image005.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image005.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image006.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image006.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image007.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image007.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image008.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image008.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image009.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image009.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image010.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image010.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image011.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image011.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image012.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image012.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image013.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image013.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image016.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image016.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image017.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image017.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image018.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image018.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image019.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image019.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image020.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image020.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image021.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image021.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image022.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image022.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image023.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image023.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image024.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image024.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image025.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image025.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image026.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image026.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image027.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image027.png (added) * src/sas/sasgui/perspectives/fitting/media/sm_image028.gif (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_image028.png (added) * src/sas/sasgui/perspectives/fitting/media/sum_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/sum_model.png (added) * src/sas/sasgui/perspectives/fitting/media/view_button.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/view_button.png (added) * src/sas/sasgui/perspectives/fitting/media/view_data_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/view_data_model.png (added) * src/sas/sasgui/perspectives/invariant/media/image001.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image002.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image003.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image004.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image005.gif (deleted) * src/sas/sasgui/perspectives/invariant/media/image005.png (added) * src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified) Merge branch 'master' into ticket-639-katex Mon, 04 Sep 2017 11:28:41 GMT lewis [b76e65a] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) Refactor 'Copy to Excel/LaTeX' logic The error on fitted polydispersity ... Fri, 01 Sep 2017 14:14:27 GMT lewis [6f9abd3] * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) Don't send data to fit panel if it has an active theory and is in bg ... Fri, 01 Sep 2017 09:20:06 GMT lewis [c351bf1] * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) Update sum/multi models to use sasmodels MixtureModel Fri, 01 Sep 2017 08:49:29 GMT lewis [57b48ab] * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) Revert "Update Sum/Multi model to use better string formatting" This ... Fri, 01 Sep 2017 08:48:55 GMT lewis [f1495ff] * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) Revert "Ensure sum/multiplication models behave correctly" This reverts ... Fri, 01 Sep 2017 08:42:57 GMT lewis [9d80623] * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) Ensure sum/multiplication models behave correctly Thu, 31 Aug 2017 18:25:38 GMT Paul Kienzle [a2a1c20] * build_tools/jenkins_win64_build.bat (modified) * installers/setup_exe.py (modified) * src/sas/logger_config.py (modified) * src/sas/sasgui/plottools/config.py (modified) make pkg_resources optional Wed, 30 Aug 2017 14:32:35 GMT lewis [14fbdba] * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) Ensure sum/multiplication models behave correctly Wed, 30 Aug 2017 13:45:58 GMT lewis [9f703d0] * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) Update Sum/Multi model to use better string formatting Wed, 30 Aug 2017 09:55:36 GMT lewis [2d9526d] * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) Refactor P(Q)*S(Q) plot updating logic, and ensure unsmeared theory is ... Wed, 30 Aug 2017 08:53:27 GMT lewis [0f9ea1c] * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) Make suggested stylistic changes Tue, 29 Aug 2017 21:30:45 GMT Paul Kienzle [759a8ab] * installers/setup_exe.py (modified) * setup.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/IgorReader.py (deleted) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/defaults.json (deleted) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted) * src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/ascii2d_loader.py (added) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) * test/fileconverter/test/cansas1d.xml (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/MAR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.h5 (added) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_extension_registry.py (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/valid_cansas_xml.xml (added) * test/sasinvariant/test/utest_use_cases.py (modified) * build_tools/deploy.bat (modified) * build_tools/jenkins_linux_build.sh (modified) * build_tools/jenkins_osx_build.sh (modified) * build_tools/jenkins_win64_build.bat (modified) * build_tools/jenkins_win_build.bat (modified) * build_tools/travis_build.sh (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * installers/MANIFEST.IN (moved) * installers/README-next-release.txt (moved) * installers/README.txt (moved) * installers/installer_generator.py (moved) * installers/license.txt (moved) * installers/macholib_patch.py (added) * installers/sasview.spec (moved) * installers/sasview_console.py (added) * installers/sasview_gui.py (added) * installers/setup.cfg (moved) * installers/setup_mac.py (added) * installers/version.txt (moved) * run.py (modified) * sasview/__init__.py (deleted) * sasview/setup_mac.py (deleted) * src/sas/logger_config.py (moved) * src/sas/logging.ini (moved) * src/sas/sasgui/__init__.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/acknowledgebox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/plottools/__init__.py (modified) * src/sas/sasview/__init__.py (added) * src/sas/sasview/custom_config.py (moved) * src/sas/sasview/images/SVwelcome.png (moved) * src/sas/sasview/images/SVwelcome_mini.png (moved) * src/sas/sasview/images/angles.png (moved) * src/sas/sasview/images/angles_flat.png (moved) * src/sas/sasview/images/ansto_logo.png (moved) * src/sas/sasview/images/ball.icns (moved) * src/sas/sasview/images/ball.ico (moved) * src/sas/sasview/images/danse_logo.png (moved) * src/sas/sasview/images/ess_logo.png (moved) * src/sas/sasview/images/ill_logo.png (moved) * src/sas/sasview/images/isis_logo.png (moved) * src/sas/sasview/images/nist_logo.png (moved) * src/sas/sasview/images/nsf_logo.png (moved) * src/sas/sasview/images/ornl_logo.png (moved) * src/sas/sasview/images/sns_logo.png (moved) * src/sas/sasview/images/tudelft_logo.png (moved) * src/sas/sasview/images/umd_logo.png (moved) * src/sas/sasview/images/utlogo.gif (moved) * src/sas/sasview/local_config.py (moved) * src/sas/sasview/media/README.txt (moved) * src/sas/sasview/media/Tutorial.pdf (moved) * src/sas/sasview/media/getting_started_with_sasview.pdf (moved) * src/sas/sasview/sasview.py (moved) * src/sas/sasview/test/1d_data/ testdata_line1.txt (moved) * src/sas/sasview/test/1d_data/1000A_sphere_dsm.xml (moved) * src/sas/sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml (moved) * src/sas/sasview/test/1d_data/APS_DND-CAT.TXT (moved) * src/sas/sasview/test/1d_data/Anton-Paar.pdh (moved) * src/sas/sasview/test/1d_data/CoreXY_ShellZ.txt (moved) * src/sas/sasview/test/1d_data/ISIS_83404.TXT (moved) * src/sas/sasview/test/1d_data/ISIS_98929.TXT (moved) * src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_10_percent.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_30_percent.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_40_percent.xml (moved) * src/sas/sasview/test/1d_data/PolySpheres.txt (moved) * src/sas/sasview/test/1d_data/beam profile.DAT (moved) * src/sas/sasview/test/1d_data/circular_test.txt (moved) * src/sas/sasview/test/1d_data/cyl_400_20.txt (moved) * src/sas/sasview/test/1d_data/cyl_400_40.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata1.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata2.txt (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (moved) * src/sas/sasview/test/1d_data/latex_smeared.xml (moved) * src/sas/sasview/test/1d_data/rpa_igor.txt (moved) * src/sas/sasview/test/1d_data/saxess_example.pdh (moved) * src/sas/sasview/test/1d_data/sphere_60_q0_2.txt (moved) * src/sas/sasview/test/1d_data/sphere_80.txt (moved) * src/sas/sasview/test/1d_data/testdata_line.txt (moved) * src/sas/sasview/test/1d_data/testdata_line3.txt (moved) * src/sas/sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/2d_data/2P_New.sans (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/2d_data/Dec07031.ASC (moved) * src/sas/sasview/test/2d_data/HiResSAN14.ASC (moved) * src/sas/sasview/test/2d_data/MAR07262.ASC (moved) * src/sas/sasview/test/2d_data/P123_D2O_10_percent.dat (moved) * src/sas/sasview/test/2d_data/P123_D2O_30_percent.dat (moved) * src/sas/sasview/test/2d_data/P123_D2O_40_percent.dat (moved) * src/sas/sasview/test/2d_data/P_New.sans (moved) * src/sas/sasview/test/2d_data/SILIC009.ASC (moved) * src/sas/sasview/test/2d_data/SILIC010.DAT (moved) * src/sas/sasview/test/2d_data/SILIC010_noheader.DAT (moved) * src/sas/sasview/test/2d_data/SILIC010_noheader_3col.DAT (moved) * src/sas/sasview/test/2d_data/exp18_14_igor_2dqxqy.dat (moved) * src/sas/sasview/test/README.txt (moved) * src/sas/sasview/test/convertible_files/APS_X.TXT (moved) * src/sas/sasview/test/convertible_files/APS_Y.TXT (moved) * src/sas/sasview/test/convertible_files/FIT2D_I.TXT (moved) * src/sas/sasview/test/convertible_files/FIT2D_Q.TXT (moved) * src/sas/sasview/test/convertible_files/Z83000.I1D (moved) * src/sas/sasview/test/convertible_files/Z83000.QAX (moved) * src/sas/sasview/test/convertible_files/Z83001.I1D (moved) * src/sas/sasview/test/convertible_files/Z83001.QAX (moved) * src/sas/sasview/test/convertible_files/Z83002.I1D (moved) * src/sas/sasview/test/convertible_files/Z98000.I1D (moved) * src/sas/sasview/test/convertible_files/Z98000.QAX (moved) * src/sas/sasview/test/convertible_files/Z98001.I1D (moved) * src/sas/sasview/test/convertible_files/Z98001.QAX (moved) * src/sas/sasview/test/convertible_files/Z98002.I1D (moved) * src/sas/sasview/test/coordinate_data/A_Raw_Example-1.omf (moved) * src/sas/sasview/test/coordinate_data/diamond.pdb (moved) * src/sas/sasview/test/coordinate_data/dna.pdb (moved) * src/sas/sasview/test/coordinate_data/sld_file.sld (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_gif.gif (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_png.png (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_tif.tif (moved) * src/sas/sasview/test/media/testdata_help.rst (moved) * src/sas/sasview/test/nr_data/NR_Ni_down_state.txt (moved) * src/sas/sasview/test/nr_data/NR_Ni_up_state.txt (moved) * src/sas/sasview/test/other_files/dist _THETA_weights.txt (moved) * src/sas/sasview/test/other_files/phi_weights.txt (moved) * src/sas/sasview/test/other_files/radius_dist.txt (moved) * src/sas/sasview/test/other_files/theta_weights.txt (moved) * src/sas/sasview/test/save_states/constrained_fit_project.svs (moved) * src/sas/sasview/test/save_states/fit_pr_and_invariant_project.svs (moved) * src/sas/sasview/test/save_states/fitstate.fitv (moved) * src/sas/sasview/test/save_states/project_multiplicative_constraint.svs (moved) * src/sas/sasview/test/save_states/prstate.prv (moved) * src/sas/sasview/test/save_states/test.inv (moved) * src/sas/sasview/test/save_states/test002.inv (moved) * src/sas/sasview/test/sesans_data/sphere2micron.ses (moved) * src/sas/sasview/test/sesans_data/sphere_isis.ses (moved) * src/sas/sasview/test/upcoming_formats/1000A_sphere_sm.xml (moved) * src/sas/sasview/welcome_panel.py (moved) * src/sas/sasview/wxcruft.py (moved) Merge branch 'master' into ticket-887-reorg Fri, 25 Aug 2017 14:02:34 GMT lewis [1c699de] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) Copy polydispersity params to Excel/LaTeX correctly Closes #906 Fri, 25 Aug 2017 13:04:52 GMT lewis [0900627] * src/sas/sasgui/perspectives/fitting/fitting.py (modified) Add comment Fri, 25 Aug 2017 11:39:07 GMT lewis [25bc5c8] * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * setup.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/IgorReader.py (deleted) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/defaults.json (deleted) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted) * src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/ascii2d_loader.py (added) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) * test/fileconverter/test/cansas1d.xml (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/MAR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.h5 (added) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_extension_registry.py (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/valid_cansas_xml.xml (added) * test/sasinvariant/test/utest_use_cases.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) Merge branch 'master' into 4.2.0-fixes Fri, 25 Aug 2017 11:38:23 GMT lewis [c4170068] * src/sas/sasgui/perspectives/fitting/fitting.py (modified) Ensure polysidpersity params are shown in batch fit Thu, 24 Aug 2017 13:51:22 GMT lewis [13991957] * src/sas/sasgui/plottools/plottables.py (modified) Ensure plot colours are set correctly Thu, 24 Aug 2017 11:36:00 GMT lewis [62a6a78] * src/sas/sasgui/perspectives/fitting/fitting.py (modified) Ensure all P(Q) and S(Q) plot are updated correctly Tue, 22 Aug 2017 11:15:19 GMT lewis [0b6f83c] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Ensure fitting uncertainties are shown. Fixes #967 Tue, 22 Aug 2017 10:22:17 GMT lewis [467068d] * src/sas/sasgui/perspectives/fitting/fitting.py (modified) Update P(Q) and S(Q) plots when parameters are changed Mon, 21 Aug 2017 14:50:05 GMT lewis [43345ab] * check_packages.py (modified) * docs/sphinx-docs/build_sphinx.py (modified) * run.py (modified) * sasview/test/sesans_data/sphere2micron.ses (modified) * sasview/test/sesans_data/sphere_isis.ses (added) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * test/calculatorview/__init__.py (added) * test/calculatorview/test/__init__.py (added) * test/corfunc/__init__.py (added) * test/corfunc/test/__init__.py (added) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/pr_inversion/test/utest_invertor.py (modified) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/test/__init__.py (added) * test/sasdataloader/test/sesans_examples/next_gen.ses (added) * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (added) * test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added) * test/sasdataloader/test/sesans_examples/sphere2micron.ses (added) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (added) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (added) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_sesans.py (added) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) Merge branch 'FixingTicket741' of https://github.com/SasView/sasview ... Mon, 21 Aug 2017 14:16:13 GMT lewis [dcb91cf] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/file_converter/ascii2d_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * test/fileconverter/test/cansas1d.xml (modified) * test/sasdataloader/test/utest_extension_registry.py (added) * test/sasdataloader/test/valid_cansas_xml.xml (added) Make suggested changes Mon, 21 Aug 2017 08:51:20 GMT lewis [44daa56] * docs/sphinx-docs/build_sphinx.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * setup.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/IgorReader.py (deleted) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/defaults.json (deleted) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted) * src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/ascii2d_loader.py (added) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/MAR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.h5 (added) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) Merge branch 'master' into ticket-876 Thu, 17 Aug 2017 14:15:23 GMT Paul Kienzle [6fab3a0] * check_packages.py (modified) * docs/sphinx-docs/build_sphinx.py (modified) * run.py (modified) * sasview/test/sesans_data/sphere2micron.ses (modified) * sasview/test/sesans_data/sphere_isis.ses (added) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * test/calculatorview/__init__.py (added) * test/calculatorview/test/__init__.py (added) * test/corfunc/__init__.py (added) * test/corfunc/test/__init__.py (added) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/pr_inversion/test/utest_invertor.py (modified) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/test/__init__.py (added) * test/sasdataloader/test/sesans_examples/next_gen.ses (added) * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (added) * test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added) * test/sasdataloader/test/sesans_examples/sphere2micron.ses (added) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (added) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (added) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_sesans.py (added) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) * .pydevproject (modified) * src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (added) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) Merge branch 'master' into ticket-597 Thu, 17 Aug 2017 14:14:37 GMT Paul Kienzle [12f7f24] * docs/sphinx-docs/build_sphinx.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * build_tools/deploy.bat (modified) * build_tools/jenkins_linux_build.sh (modified) * build_tools/jenkins_osx_build.sh (modified) * build_tools/jenkins_win64_build.bat (modified) * build_tools/jenkins_win_build.bat (modified) * build_tools/travis_build.sh (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * installers/MANIFEST.IN (moved) * installers/README-next-release.txt (moved) * installers/README.txt (moved) * installers/installer_generator.py (moved) * installers/license.txt (moved) * installers/macholib_patch.py (added) * installers/sasview.spec (moved) * installers/sasview_console.py (added) * installers/sasview_gui.py (added) * installers/setup.cfg (moved) * installers/setup_exe.py (moved) * installers/setup_mac.py (added) * installers/version.txt (moved) * run.py (modified) * sasview/__init__.py (deleted) * sasview/setup_mac.py (deleted) * setup.py (modified) * src/sas/logger_config.py (moved) * src/sas/logging.ini (moved) * src/sas/sasgui/__init__.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/acknowledgebox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/plottools/__init__.py (modified) * src/sas/sasview/__init__.py (added) * src/sas/sasview/custom_config.py (moved) * src/sas/sasview/images/SVwelcome.png (moved) * src/sas/sasview/images/SVwelcome_mini.png (moved) * src/sas/sasview/images/angles.png (moved) * src/sas/sasview/images/angles_flat.png (moved) * src/sas/sasview/images/ansto_logo.png (moved) * src/sas/sasview/images/ball.icns (moved) * src/sas/sasview/images/ball.ico (moved) * src/sas/sasview/images/danse_logo.png (moved) * src/sas/sasview/images/ess_logo.png (moved) * src/sas/sasview/images/ill_logo.png (moved) * src/sas/sasview/images/isis_logo.png (moved) * src/sas/sasview/images/nist_logo.png (moved) * src/sas/sasview/images/nsf_logo.png (moved) * src/sas/sasview/images/ornl_logo.png (moved) * src/sas/sasview/images/sns_logo.png (moved) * src/sas/sasview/images/tudelft_logo.png (moved) * src/sas/sasview/images/umd_logo.png (moved) * src/sas/sasview/images/utlogo.gif (moved) * src/sas/sasview/local_config.py (moved) * src/sas/sasview/media/README.txt (moved) * src/sas/sasview/media/Tutorial.pdf (moved) * src/sas/sasview/media/getting_started_with_sasview.pdf (moved) * src/sas/sasview/sasview.py (moved) * src/sas/sasview/test/1d_data/ testdata_line1.txt (moved) * src/sas/sasview/test/1d_data/1000A_sphere_dsm.xml (moved) * src/sas/sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved) * src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml (moved) * src/sas/sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml (moved) * src/sas/sasview/test/1d_data/APS_DND-CAT.TXT (moved) * src/sas/sasview/test/1d_data/Anton-Paar.pdh (moved) * src/sas/sasview/test/1d_data/CoreXY_ShellZ.txt (moved) * src/sas/sasview/test/1d_data/ISIS_83404.TXT (moved) * src/sas/sasview/test/1d_data/ISIS_98929.TXT (moved) * src/sas/sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_10_percent.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_30_percent.xml (moved) * src/sas/sasview/test/1d_data/P123_D2O_40_percent.xml (moved) * src/sas/sasview/test/1d_data/PolySpheres.txt (moved) * src/sas/sasview/test/1d_data/beam profile.DAT (moved) * src/sas/sasview/test/1d_data/circular_test.txt (moved) * src/sas/sasview/test/1d_data/cyl_400_20.txt (moved) * src/sas/sasview/test/1d_data/cyl_400_40.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata1.txt (moved) * src/sas/sasview/test/1d_data/cyl_testdata2.txt (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (moved) * src/sas/sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (moved) * src/sas/sasview/test/1d_data/latex_smeared.xml (moved) * src/sas/sasview/test/1d_data/rpa_igor.txt (moved) * src/sas/sasview/test/1d_data/saxess_example.pdh (moved) * src/sas/sasview/test/1d_data/sphere_60_q0_2.txt (moved) * src/sas/sasview/test/1d_data/sphere_80.txt (moved) * src/sas/sasview/test/1d_data/testdata_line.txt (moved) * src/sas/sasview/test/1d_data/testdata_line3.txt (moved) * src/sas/sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/2d_data/2P_New.sans (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved) * src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sasview/test/2d_data/Dec07031.ASC (moved) * src/sas/sasview/test/2d_data/HiResSAN14.ASC (moved) * src/sas/sasview/test/2d_data/MAR07262.ASC (moved) * src/sas/sasview/test/2d_data/P123_D2O_10_percent.dat (moved) * src/sas/sasview/test/2d_data/P123_D2O_30_percent.dat (moved) * src/sas/sasview/test/2d_data/P123_D2O_40_percent.dat (moved) * src/sas/sasview/test/2d_data/P_New.sans (moved) * src/sas/sasview/test/2d_data/SILIC009.ASC (moved) * src/sas/sasview/test/2d_data/SILIC010.DAT (moved) * src/sas/sasview/test/2d_data/SILIC010_noheader.DAT (moved) * src/sas/sasview/test/2d_data/SILIC010_noheader_3col.DAT (moved) * src/sas/sasview/test/2d_data/exp18_14_igor_2dqxqy.dat (moved) * src/sas/sasview/test/README.txt (moved) * src/sas/sasview/test/convertible_files/APS_X.TXT (moved) * src/sas/sasview/test/convertible_files/APS_Y.TXT (moved) * src/sas/sasview/test/convertible_files/FIT2D_I.TXT (moved) * src/sas/sasview/test/convertible_files/FIT2D_Q.TXT (moved) * src/sas/sasview/test/convertible_files/Z83000.I1D (moved) * src/sas/sasview/test/convertible_files/Z83000.QAX (moved) * src/sas/sasview/test/convertible_files/Z83001.I1D (moved) * src/sas/sasview/test/convertible_files/Z83001.QAX (moved) * src/sas/sasview/test/convertible_files/Z83002.I1D (moved) * src/sas/sasview/test/convertible_files/Z98000.I1D (moved) * src/sas/sasview/test/convertible_files/Z98000.QAX (moved) * src/sas/sasview/test/convertible_files/Z98001.I1D (moved) * src/sas/sasview/test/convertible_files/Z98001.QAX (moved) * src/sas/sasview/test/convertible_files/Z98002.I1D (moved) * src/sas/sasview/test/coordinate_data/A_Raw_Example-1.omf (moved) * src/sas/sasview/test/coordinate_data/diamond.pdb (moved) * src/sas/sasview/test/coordinate_data/dna.pdb (moved) * src/sas/sasview/test/coordinate_data/sld_file.sld (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_gif.gif (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_png.png (moved) * src/sas/sasview/test/image_data/ISIS_98940_greyscale_tif.tif (moved) * src/sas/sasview/test/media/testdata_help.rst (moved) * src/sas/sasview/test/nr_data/NR_Ni_down_state.txt (moved) * src/sas/sasview/test/nr_data/NR_Ni_up_state.txt (moved) * src/sas/sasview/test/other_files/dist _THETA_weights.txt (moved) * src/sas/sasview/test/other_files/phi_weights.txt (moved) * src/sas/sasview/test/other_files/radius_dist.txt (moved) * src/sas/sasview/test/other_files/theta_weights.txt (moved) * src/sas/sasview/test/save_states/constrained_fit_project.svs (moved) * src/sas/sasview/test/save_states/fit_pr_and_invariant_project.svs (moved) * src/sas/sasview/test/save_states/fitstate.fitv (moved) * src/sas/sasview/test/save_states/project_multiplicative_constraint.svs (moved) * src/sas/sasview/test/save_states/prstate.prv (moved) * src/sas/sasview/test/save_states/test.inv (moved) * src/sas/sasview/test/save_states/test002.inv (moved) * src/sas/sasview/test/sesans_data/sphere2micron.ses (moved) * src/sas/sasview/test/sesans_data/sphere_isis.ses (moved) * src/sas/sasview/test/upcoming_formats/1000A_sphere_sm.xml (moved) * src/sas/sasview/welcome_panel.py (moved) * src/sas/sasview/wxcruft.py (moved) Merge branch 'master' into ticket-887-reorg Thu, 17 Aug 2017 14:14:00 GMT Paul Kienzle [b682c6a] * docs/sphinx-docs/build_sphinx.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * docs/sphinx-docs/source/conf.py (modified) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/local_config.py (modified) * sasview/sasview.spec (modified) * sasview/setup_exe.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) Merge branch 'master' into 4_1_issues Thu, 17 Aug 2017 14:04:19 GMT Paul Kienzle [d24e41d] * docs/sphinx-docs/build_sphinx.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) Merge branch 'master' into FixingTicket741 Thu, 17 Aug 2017 14:01:11 GMT Paul Kienzle [e61a9b1] * check_packages.py (modified) * run.py (modified) * sasview/test/sesans_data/sphere2micron.ses (modified) * sasview/test/sesans_data/sphere_isis.ses (added) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * test/calculatorview/__init__.py (added) * test/calculatorview/test/__init__.py (added) * test/corfunc/__init__.py (added) * test/corfunc/test/__init__.py (added) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/test/__init__.py (added) * test/sasdataloader/test/sesans_examples/next_gen.ses (added) * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (added) * test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added) * test/sasdataloader/test/sesans_examples/sphere2micron.ses (added) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (added) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (added) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_sesans.py (added) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) Merge branch 'master' into FixingTicket741 Wed, 16 Aug 2017 14:55:45 GMT Paul Kienzle [f8b59e3] * src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (modified) * .gitignore (modified) * docs/sphinx-docs/Makefile (modified) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/convertKaTex.js (added) * docs/sphinx-docs/convertMathJax.js (added) * docs/sphinx-docs/source/_extensions/mathjax.py (added) * docs/sphinx-docs/source/_static/rendermath.js (added) * docs/sphinx-docs/source/conf.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) Merge branch 'ticket-510' into ticket-639-katex Tue, 15 Aug 2017 14:19:11 GMT krzywon [ce2819b] * docs/sphinx-docs/source/conf.py (modified) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/local_config.py (modified) * sasview/sasview.spec (modified) * sasview/setup_exe.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * .gitattributes (modified) * .gitignore (modified) * .travis.yml (modified) * Vagrantfile (modified) * Vagrantprovision.sh (modified) * build_tools/travis_build.sh (modified) * check_packages.py (modified) * docs/pandoc-docs/Makefile (added) * docs/pandoc-docs/build_pandoc.py (added) * docs/pandoc-docs/source/README.txt (added) * docs/sasview/Tutorial.pptx (modified) * docs/sasview/Tutorial_SV2.pdf (moved) * docs/sasview/Tutorial_SV2.pptx (moved) * docs/sasview/Tutorial_SV3.pdf (added) * docs/sasview/Tutorial_SV3.pptx (added) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/source/dev/dev.rst (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/marketplace.rst (modified) * docs/sphinx-docs/source/user/menu_bar.rst (modified) * docs/sphinx-docs/source/user/tools.rst (modified) * docs/sphinx-docs/source/user/user.rst (modified) * mac_setup_homebrew.sh (added) * run.py (modified) * sasview/custom_config.py (modified) * sasview/installer_generator.py (modified) * sasview/logger_config.py (added) * sasview/logging.ini (added) * sasview/sasview.py (modified) * sasview/setup_mac.py (modified) * sasview/test/nr_data/NR_Ni_down_state.txt (added) * sasview/test/nr_data/NR_Ni_up_state.txt (added) * sasview/test/sesans_data/sphere2micron.ses (modified) * sasview/test/sesans_data/sphere_isis.ses (added) * sasview/welcome_panel.py (modified) * sasview/wxcruft.py (modified) * setup.py (modified) * src/examples/data_generator/test_transfo.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/examples/test_chisq_panel.py (modified) * src/examples/test_copy_print.py (modified) * src/examples/test_panel.py (modified) * src/examples/test_panel2D.py (modified) * src/examples/test_text_panel.py (modified) * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sascalc/calculator/instrument.py (modified) * src/sas/sascalc/calculator/kiessig_calculator.py (modified) * src/sas/sascalc/calculator/resolution_calculator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/err1d.py (modified) * src/sas/sascalc/data_util/formatnum.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/data_util/uncertainty.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_constants.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (modified) * src/sas/sascalc/dataloader/readers/nexus_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/tiff_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/cansas_writer.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/invariant/invariant_mapper.py (modified) * src/sas/sascalc/pr/__init__.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/__init__.py (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/distance_explorer.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/BumpsFitting.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sascalc/realspace/__init__.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/minmax.h (modified) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified) * src/sas/sascalc/simulation/iqPy/tests/signon.py (modified) * src/sas/sascalc/simulation/iqPy/tests/testiq.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testnegativepr.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/CategoryManager.py (modified) * src/sas/sasgui/guiframe/__init__.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/custom_pstats.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/data_state.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/events.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_statusbar.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/gui_toolbar.py (modified) * src/sas/sasgui/guiframe/images/dls_logo.png (added) * src/sas/sasgui/guiframe/local_perspectives/data_loader/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/BaseInteractor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) * src/sas/sasgui/guiframe/panel_base.py (modified) * src/sas/sasgui/guiframe/pdfview.py (modified) * src/sas/sasgui/guiframe/plugin_base.py (modified) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/guiframe/report_dialog.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/__init__.py (modified) * src/sas/sasgui/perspectives/calculator/aperture_editor.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/calculator_widgets.py (modified) * src/sas/sasgui/perspectives/calculator/collimation_editor.py (modified) * src/sas/sasgui/perspectives/calculator/console.py (modified) * src/sas/sasgui/perspectives/calculator/data_editor.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.py (modified) * src/sas/sasgui/perspectives/calculator/detector_editor.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/load_thread.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/sample_editor.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/source_editor.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/console.py (modified) * src/sas/sasgui/perspectives/fitting/fit_thread.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitproblem.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified) * src/sas/sasgui/perspectives/fitting/hint_fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/fitting/resultpanel.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/utils.py (modified) * src/sas/sasgui/perspectives/invariant/__init__.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_details.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_widgets.py (modified) * src/sas/sasgui/perspectives/invariant/report_dialog.py (modified) * src/sas/sasgui/perspectives/pr/__init__.py (modified) * src/sas/sasgui/perspectives/pr/explore_dialog.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/perspectives/pr/pr_widgets.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeAdapter.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified) * src/sas/sasgui/perspectives/simulation/SimCanvas.py (modified) * src/sas/sasgui/perspectives/simulation/__init__.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/BaseInteractor.py (modified) * src/sas/sasgui/plottools/LabelDialog.py (modified) * src/sas/sasgui/plottools/LineModel.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/PropertyDialog.py (modified) * src/sas/sasgui/plottools/SizeDialog.py (modified) * src/sas/sasgui/plottools/TextDialog.py (modified) * src/sas/sasgui/plottools/arrow3d.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/canvas.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/plottools/toolbar.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/README.rst (modified) * test/calculatorview/__init__.py (moved) * test/calculatorview/test/__init__.py (moved) * test/calculatorview/test/utest_gui_sld.py (modified) * test/calculatorview/test/utest_sld.py (modified) * test/corfunc/__init__.py (moved) * test/corfunc/test/__init__.py (added) * test/corfunc/test/utest_corfunc.py (modified) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/fileconverter/test/export2d.h5 (deleted) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/logging.ini (added) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/pr_inversion/test/utest_explorer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/run_one.py (modified) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sascalculator/test/utest_resolution_calculator.py (modified) * test/sascalculator/test/utest_sas_gen.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/__init__.py (added) * test/sasdataloader/test/error_conditions.py (modified) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/sesans_examples/next_gen.ses (added) * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (added) * test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added) * test/sasdataloader/test/sesans_examples/sphere2micron.ses (added) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (added) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (added) * test/sasdataloader/test/testLoad.py (modified) * test/sasdataloader/test/testplugings.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (added) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasinvariant/test/utest_data_handling.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) * test/sasrealspace/test/early_test.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) Merge 4.1.1_path_typo into 4_1_issues Wed, 09 Aug 2017 19:22:01 GMT krzywon [d908932] * sasview/local_config.py (modified) * src/sas/sasgui/guiframe/config.py (modified) Update configs for 4.1.2 release. Tue, 08 Aug 2017 15:38:45 GMT lewis [e3f1fed] * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) Ensure P(Q) and S(Q) are labelled correctly Tue, 08 Aug 2017 10:55:39 GMT lewis [07ec714] * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) Tick overwrite box when invalid model is saved Mon, 07 Aug 2017 11:17:38 GMT lewis [4627657] * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) Run plug-in model unit tests when 'Check model' is clicked Mon, 07 Aug 2017 10:39:28 GMT lewis [489f53a] * src/sas/sasgui/perspectives/fitting/fitting.py (modified) Show warning message before deleting plug-in model. Refs #754 Mon, 07 Aug 2017 10:26:08 GMT lewis [b1c2011] * src/sas/sasgui/perspectives/fitting/models.py (modified) Don't append '[plug-in]' to model name every time models are re- loaded Fri, 04 Aug 2017 15:31:27 GMT lewis [40add21] * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) Use comment as fitting parameter description Fri, 04 Aug 2017 08:36:44 GMT lewis [1abd19c] * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) Add note about error on background value to docs Fri, 04 Aug 2017 08:22:51 GMT lewis [cb62bd5] * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) Use manually inputted background level in Pr calculation Thu, 03 Aug 2017 08:27:25 GMT lewis [a0e6b1b] * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) Esnure background value is saved/loaded when analysis is saved/loaded Wed, 02 Aug 2017 15:33:30 GMT lewis [5c3c310] * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) Add manual background input to Pr perspective Manual background value ... Wed, 02 Aug 2017 14:29:05 GMT lewis [490c617] * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) Parse parameter values correctly if line ends in comment Wed, 02 Aug 2017 10:43:41 GMT lewis [f26b7c1] * src/sas/sascalc/file_converter/ascii2d_loader.py (added) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * setup.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/IgorReader.py (deleted) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/defaults.json (deleted) * src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/MAR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.h5 (added) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) Merge branch 'ticket-970' into ticket-876 Tue, 01 Aug 2017 16:02:35 GMT lewis [5a8cdbb] * check_packages.py (modified) * run.py (modified) * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/nr_data/NR_Ni_down_state.txt (added) * sasview/test/nr_data/NR_Ni_up_state.txt (added) * sasview/test/sesans_data/sphere2micron.ses (modified) * sasview/test/sesans_data/sphere_isis.ses (added) * sasview/wxcruft.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/formatnum.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified) * src/sas/sascalc/simulation/iqPy/tests/signon.py (modified) * src/sas/sascalc/simulation/iqPy/tests/testiq.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/perspectives/calculator/detector_editor.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * test/calculatorview/__init__.py (added) * test/calculatorview/test/__init__.py (added) * test/corfunc/__init__.py (added) * test/corfunc/test/__init__.py (added) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/pr_inversion/test/utest_invertor.py (modified) * test/run_one.py (modified) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/__init__.py (added) * test/sasdataloader/test/isis_1_0_write_test.xml (deleted) * test/sasdataloader/test/isis_1_1_write_test.xml (deleted) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/sesans_examples/next_gen.ses (added) * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (added) * test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added) * test/sasdataloader/test/sesans_examples/sphere2micron.ses (added) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (added) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (added) * test/sasdataloader/test/testplugings.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_sesans.py (added) * test/sasdataloader/test/write_test.xml (deleted) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) * test/sasrealspace/test/early_test.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) * setup.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/defaults.json (deleted) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) Merge branch 'master' into ticket-876 Mon, 31 Jul 2017 10:28:48 GMT lewis [fafe52a] * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) Refactor Anton Paar SAXS reader to use FileReader class Mon, 31 Jul 2017 09:07:50 GMT lewis [9df816b] * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) Only show warning messages once Thu, 27 Jul 2017 16:13:00 GMT lewis [8dec7e7] * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) Raise DefaultReaderException in NXcanSAS reader and handle correctly Tue, 25 Jul 2017 12:22:07 GMT krzywon [146c669] * src/sas/sasgui/perspectives/fitting/models.py (modified) Resolved a merge conflict with a method name change. Mon, 24 Jul 2017 14:27:05 GMT krzywon [6a455cd3] * .gitattributes (modified) * .gitignore (modified) * .travis.yml (modified) * Vagrantfile (modified) * Vagrantprovision.sh (modified) * build_tools/travis_build.sh (modified) * check_packages.py (modified) * docs/pandoc-docs/Makefile (added) * docs/pandoc-docs/build_pandoc.py (added) * docs/pandoc-docs/source/README.txt (added) * docs/sasview/Tutorial.pptx (modified) * docs/sasview/Tutorial_SV2.pdf (moved) * docs/sasview/Tutorial_SV2.pptx (moved) * docs/sasview/Tutorial_SV3.pdf (added) * docs/sasview/Tutorial_SV3.pptx (added) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/dev/dev.rst (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/marketplace.rst (modified) * docs/sphinx-docs/source/user/menu_bar.rst (modified) * docs/sphinx-docs/source/user/tools.rst (modified) * docs/sphinx-docs/source/user/user.rst (modified) * mac_setup_homebrew.sh (added) * run.py (modified) * sasview/__init__.py (modified) * sasview/custom_config.py (modified) * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/logger_config.py (added) * sasview/logging.ini (added) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/nr_data/NR_Ni_down_state.txt (added) * sasview/test/nr_data/NR_Ni_up_state.txt (added) * sasview/test/sesans_data/sphere2micron.ses (modified) * sasview/test/sesans_data/sphere_isis.ses (added) * sasview/welcome_panel.py (modified) * sasview/wxcruft.py (modified) * setup.py (modified) * src/examples/data_generator/test_transfo.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/examples/test_chisq_panel.py (modified) * src/examples/test_copy_print.py (modified) * src/examples/test_panel.py (modified) * src/examples/test_panel2D.py (modified) * src/examples/test_text_panel.py (modified) * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sascalc/calculator/instrument.py (modified) * src/sas/sascalc/calculator/kiessig_calculator.py (modified) * src/sas/sascalc/calculator/resolution_calculator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/err1d.py (modified) * src/sas/sascalc/data_util/formatnum.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/data_util/uncertainty.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_constants.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (modified) * src/sas/sascalc/dataloader/readers/nexus_reader.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/tiff_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/cansas_writer.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/invariant/invariant_mapper.py (modified) * src/sas/sascalc/pr/__init__.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/__init__.py (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/distance_explorer.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/BumpsFitting.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sascalc/realspace/__init__.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/minmax.h (modified) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified) * src/sas/sascalc/simulation/iqPy/tests/signon.py (modified) * src/sas/sascalc/simulation/iqPy/tests/testiq.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/testnegativepr.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/CategoryManager.py (modified) * src/sas/sasgui/guiframe/__init__.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/custom_pstats.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/data_state.py (modified) * src/sas/sasgui/guiframe/documentation_window.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/events.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_statusbar.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/gui_toolbar.py (modified) * src/sas/sasgui/guiframe/images/dls_logo.png (added) * src/sas/sasgui/guiframe/local_perspectives/data_loader/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/BaseInteractor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) * src/sas/sasgui/guiframe/panel_base.py (modified) * src/sas/sasgui/guiframe/pdfview.py (modified) * src/sas/sasgui/guiframe/plugin_base.py (modified) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/guiframe/report_dialog.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/__init__.py (modified) * src/sas/sasgui/perspectives/calculator/aperture_editor.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/calculator_widgets.py (modified) * src/sas/sasgui/perspectives/calculator/collimation_editor.py (modified) * src/sas/sasgui/perspectives/calculator/console.py (modified) * src/sas/sasgui/perspectives/calculator/data_editor.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.py (modified) * src/sas/sasgui/perspectives/calculator/detector_editor.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/load_thread.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/sample_editor.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/source_editor.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/console.py (modified) * src/sas/sasgui/perspectives/fitting/fit_thread.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitproblem.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified) * src/sas/sasgui/perspectives/fitting/hint_fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/fitting/resultpanel.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/utils.py (modified) * src/sas/sasgui/perspectives/invariant/__init__.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_details.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_widgets.py (modified) * src/sas/sasgui/perspectives/invariant/report_dialog.py (modified) * src/sas/sasgui/perspectives/pr/__init__.py (modified) * src/sas/sasgui/perspectives/pr/explore_dialog.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/perspectives/pr/pr_widgets.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeAdapter.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified) * src/sas/sasgui/perspectives/simulation/SimCanvas.py (modified) * src/sas/sasgui/perspectives/simulation/__init__.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/BaseInteractor.py (modified) * src/sas/sasgui/plottools/LabelDialog.py (modified) * src/sas/sasgui/plottools/LineModel.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/PropertyDialog.py (modified) * src/sas/sasgui/plottools/SizeDialog.py (modified) * src/sas/sasgui/plottools/TextDialog.py (modified) * src/sas/sasgui/plottools/arrow3d.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/canvas.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/plottools/toolbar.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/README.rst (modified) * test/calculatorview/__init__.py (moved) * test/calculatorview/test/__init__.py (moved) * test/calculatorview/test/utest_gui_sld.py (modified) * test/calculatorview/test/utest_sld.py (modified) * test/corfunc/__init__.py (moved) * test/corfunc/test/__init__.py (added) * test/corfunc/test/utest_corfunc.py (modified) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/fileconverter/test/export2d.h5 (deleted) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/logging.ini (added) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/pr_inversion/test/utest_explorer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/run_one.py (modified) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sascalculator/test/utest_resolution_calculator.py (modified) * test/sascalculator/test/utest_sas_gen.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/__init__.py (added) * test/sasdataloader/test/error_conditions.py (modified) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/sesans_examples/next_gen.ses (added) * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (added) * test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added) * test/sasdataloader/test/sesans_examples/sphere2micron.ses (added) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (added) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (added) * test/sasdataloader/test/testLoad.py (modified) * test/sasdataloader/test/testplugings.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (added) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasinvariant/test/utest_data_handling.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) * test/sasrealspace/test/early_test.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * test/utest_sasview.py (modified) * sasview/README.txt (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) Merge branch 'master' into 4_1_issues # Conflicts: # ... Thu, 20 Jul 2017 15:53:44 GMT lewis [19296dc] * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) Update file converter panel text Thu, 20 Jul 2017 13:35:48 GMT lewis [94e3572] * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) Update file converter tooltip in tools menu Thu, 20 Jul 2017 11:14:37 GMT lewis [59decb81] * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) Update file converter docs to include 2D ASCII data Thu, 20 Jul 2017 11:03:45 GMT lewis [0267d56] * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) Update file converter panel text Thu, 20 Jul 2017 10:44:05 GMT lewis [eacc0b0] * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) Implement ascii2d conversion