# # ChangeLog for sasview in sasview # # Generated by Trac 1.0.1 # Apr 27, 2024 6:38:57 AM Thu, 06 Oct 2016 19:05:00 GMT smk78 [850a498] * sasview/test/1d_data/10wtAOT_Reline_120_reduced.pdh (moved) * sasview/test/1d_data/APS_DND-CAT.TXT (moved) * sasview/test/1d_data/APS_X.TXT (moved) * sasview/test/1d_data/APS_Y.TXT (moved) * sasview/test/1d_data/Anton-Paar_PDH.txt (moved) * sasview/test/1d_data/FIT2D_I.TXT (moved) * sasview/test/1d_data/FIT2D_Q.TXT (moved) * sasview/test/1d_data/ISIS_83404.TXT (moved) * sasview/test/1d_data/ISIS_98929.TXT (moved) * sasview/test/1d_data/Z83000.I1D (moved) * sasview/test/1d_data/Z83000.QAX (moved) * sasview/test/1d_data/Z83001.I1D (moved) * sasview/test/1d_data/Z83001.QAX (moved) * sasview/test/1d_data/Z83002.I1D (moved) * sasview/test/1d_data/Z98000.I1D (moved) * sasview/test/1d_data/Z98000.QAX (moved) * sasview/test/1d_data/Z98001.I1D (moved) * sasview/test/1d_data/Z98001.QAX (moved) * sasview/test/1d_data/Z98002.I1D (moved) * sasview/test/README.txt (modified) * sasview/test/coordinate_data/A_Raw_Example-1.omf (moved) * sasview/test/coordinate_data/diamond.pdb (moved) * sasview/test/coordinate_data/dna.pdb (moved) * sasview/test/sesans_data/spheres2micron.ses (added) Clean up and enhancement of test data folder. Closes #712 Thu, 06 Oct 2016 16:35:24 GMT GitHub [8d3d20a] * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/corfunc_help.rst (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (added) * sasview/local_config.py (modified) * sasview/sasview.py (modified) * src/sas/sascalc/corfunc/__init__.py (added) * src/sas/sascalc/corfunc/corfunc_calculator.py (added) * src/sas/sascalc/corfunc/transform_thread.py (added) * src/sas/sasgui/guiframe/events.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/corfunc/__init__.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (added) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (added) * src/sas/sasgui/perspectives/corfunc/media/fig1.gif (added) * src/sas/sasgui/perspectives/corfunc/media/fig2.gif (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (added) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (added) * test/corfunc/test/98929.txt (added) * test/corfunc/test/utest_corfunc.py (added) * .gitignore (modified) * .travis.yml (modified) * Vagrantfile (modified) * build_tools/sasview_deploy_test.au3 (modified) * build_tools/travis_build.sh (added) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/user/gpu_computations.rst (added) * docs/sphinx-docs/source/user/menu_bar.rst (added) * docs/sphinx-docs/source/user/opencl_installation.rst (added) * docs/sphinx-docs/source/user/sasgui/guiframe/data_formats_help.rst (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (added) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mag_vector.bmp (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/invariant/invariant_help.rst (modified) * docs/sphinx-docs/source/user/tools.rst (modified) * docs/sphinx-docs/source/user/tutorial.rst (modified) * docs/sphinx-docs/source/user/user.rst (modified) * docs/sphinx-docs/source/user/working.rst (modified) * run.py (modified) * sasview.latestversion (deleted) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/default_categories.json (modified) * sasview/images/ansto_logo.png (added) * sasview/images/ornl_logo.png (added) * sasview/setup_exe.py (modified) * sasview/test/1d_data/rpa_igor.txt (added) * sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (added) * sasview/test/image_data/ISIS_98940_greyscale_gif.gif (added) * sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (added) * sasview/test/image_data/ISIS_98940_greyscale_png.png (added) * sasview/test/image_data/ISIS_98940_greyscale_tif.tif (added) * setup.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/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/file_converter/__init__.py (added) * src/sas/sascalc/file_converter/bsl_loader.py (added) * src/sas/sascalc/file_converter/c_ext/__init__.py (added) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (added) * src/sas/sascalc/file_converter/c_ext/bsl_loader.h (added) * src/sas/sascalc/file_converter/cansas_writer.py (added) * src/sas/sascalc/file_converter/nxcansas_writer.py (added) * src/sas/sascalc/file_converter/otoko_loader.py (added) * src/sas/sascalc/file_converter/red2d_writer.py (added) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/acknowledgebox.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_statusbar.py (modified) * src/sas/sasgui/guiframe/images/ansto_logo.png (added) * src/sas/sasgui/guiframe/images/ornl_logo.png (added) * src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) * src/sas/sasgui/guiframe/media/guinier_fit.png (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/file_converter/__init__.py (added) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (added) * src/sas/sasgui/perspectives/file_converter/converter_widgets.py (added) * src/sas/sasgui/perspectives/file_converter/file_converter.py (added) * src/sas/sasgui/perspectives/file_converter/frame_select_dialog.py (added) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (added) * src/sas/sasgui/perspectives/file_converter/meta_panels.py (added) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/fitting.rst (modified) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (added) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) * test/fileconverter/test/cansas1d.xml (added) * test/fileconverter/test/exp18_14_igor_2dqxqy.dat (added) * test/fileconverter/test/export2d.h5 (added) * test/fileconverter/test/utest_nxcansas_writer.py (added) * test/sasdataloader/test/utest_ascii.py (modified) Merge pull request #11 from SasView/corfunc Implement Correlation ... Thu, 06 Oct 2016 16:21:22 GMT GitHub [0639476] * .gitignore (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (added) * docs/sphinx-docs/source/user/tools.rst (modified) * run.py (modified) * sasview/sasview.py (modified) * setup.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/__init__.py (added) * src/sas/sascalc/file_converter/bsl_loader.py (added) * src/sas/sascalc/file_converter/c_ext/__init__.py (added) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (added) * src/sas/sascalc/file_converter/c_ext/bsl_loader.h (added) * src/sas/sascalc/file_converter/cansas_writer.py (added) * src/sas/sascalc/file_converter/nxcansas_writer.py (added) * src/sas/sascalc/file_converter/otoko_loader.py (added) * src/sas/sascalc/file_converter/red2d_writer.py (added) * src/sas/sasgui/perspectives/file_converter/__init__.py (added) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (added) * src/sas/sasgui/perspectives/file_converter/converter_widgets.py (added) * src/sas/sasgui/perspectives/file_converter/file_converter.py (added) * src/sas/sasgui/perspectives/file_converter/frame_select_dialog.py (added) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (added) * src/sas/sasgui/perspectives/file_converter/meta_panels.py (added) * test/fileconverter/test/cansas1d.xml (added) * test/fileconverter/test/exp18_14_igor_2dqxqy.dat (added) * test/fileconverter/test/export2d.h5 (added) * test/fileconverter/test/utest_nxcansas_writer.py (added) * .travis.yml (modified) * Vagrantfile (modified) * build_tools/sasview_deploy_test.au3 (modified) * build_tools/travis_build.sh (added) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/gpu_computations.rst (added) * docs/sphinx-docs/source/user/menu_bar.rst (added) * docs/sphinx-docs/source/user/opencl_installation.rst (added) * docs/sphinx-docs/source/user/sasgui/guiframe/data_formats_help.rst (modified) * docs/sphinx-docs/source/user/sasgui/guiframe/graph_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/kiessig_calculator_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/resolution_calculator_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sas_calculator_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sld_calculator_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/slit_calculator_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fitting_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mag_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mag_vector.bmp (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/residuals_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/invariant/invariant_help.copy (deleted) * docs/sphinx-docs/source/user/sasgui/perspectives/invariant/invariant_help.rst (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/pr/pr_help.copy (deleted) * docs/sphinx-docs/source/user/tutorial.rst (modified) * docs/sphinx-docs/source/user/user.rst (modified) * docs/sphinx-docs/source/user/working.rst (modified) * sasview.latestversion (deleted) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/default_categories.json (modified) * sasview/images/ansto_logo.png (added) * sasview/images/ornl_logo.png (added) * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/setup_exe.py (modified) * sasview/test/1d_data/rpa_igor.txt (added) * sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (added) * sasview/test/image_data/ISIS_98940_greyscale_gif.gif (added) * sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (added) * sasview/test/image_data/ISIS_98940_greyscale_png.png (added) * sasview/test/image_data/ISIS_98940_greyscale_tif.tif (added) * 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/xml_reader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/acknowledgebox.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_statusbar.py (modified) * src/sas/sasgui/guiframe/images/ansto_logo.png (added) * src/sas/sasgui/guiframe/images/ornl_logo.png (added) * src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) * src/sas/sasgui/guiframe/media/graph_help.copy (deleted) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) * src/sas/sasgui/guiframe/media/guinier_fit.png (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.copy (deleted) * src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.copy (deleted) * src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.copy (deleted) * src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.copy (deleted) * src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.copy (deleted) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/fitting.rst (modified) * src/sas/sasgui/perspectives/fitting/media/fitting_help.copy (deleted) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/mag_help.copy (deleted) * src/sas/sasgui/perspectives/fitting/media/pd_help.copy (deleted) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (added) * src/sas/sasgui/perspectives/fitting/media/residuals_help.copy (deleted) * src/sas/sasgui/perspectives/fitting/media/sm_help.copy (deleted) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.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/media/invariant_help.copy (deleted) * src/sas/sasgui/perspectives/pr/media/pr_help.copy (deleted) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) * test/sasdataloader/test/utest_ascii.py (modified) Merge pull request #12 from lewisodriscoll/file-converter Implement ... Tue, 04 Oct 2016 20:13:07 GMT smk78 [c1fdf84] * sasview/local_config.py (modified) * src/sas/sasgui/guiframe/acknowledgebox.py (modified) Enlarged Acknowledgement box so text is no longer truncated Tue, 04 Oct 2016 19:13:42 GMT smk78 [e0f28e6] * sasview/images/ansto_logo.png (moved) * sasview/images/ornl_logo.png (added) * sasview/local_config.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/images/ansto_logo.png (added) * src/sas/sasgui/guiframe/images/ornl_logo.png (added) Updated About box text and images. Changed SNS image to ORNL image (more ... Tue, 04 Oct 2016 18:01:18 GMT smk78 [d4c8513a] * sasview/images/ansto.png (added) Provide ANSTO logo Tue, 04 Oct 2016 15:46:02 GMT smk78 [311fce5] * sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (moved) * sasview/test/image_data/ISIS_98940_greyscale_gif.gif (moved) * sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (moved) * sasview/test/image_data/ISIS_98940_greyscale_png.png (moved) * sasview/test/image_data/ISIS_98940_greyscale_tif.tif (moved) Renamed test image files Sun, 02 Oct 2016 02:05:16 GMT butler [ed0b796] * Vagrantfile (modified) * docs/sphinx-docs/source/conf.py (modified) * sasview.latestversion (deleted) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/local_config.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * sasview/test/1d_data/rpa_igor.txt (added) Merge branch 'master' of https://github.com/SasView/sasview.git Sun, 02 Oct 2016 01:56:21 GMT butler [d186319] * sasview/test/1d_data/rpa_igor.txt (added) Adding rpa test file for case 0 Sat, 01 Oct 2016 21:50:17 GMT ajj [e74274ab] * sasview/local_config.py (modified) Fix non ascii character problem Sat, 01 Oct 2016 21:37:49 GMT ajj [9a182b2] * docs/sphinx-docs/source/conf.py (modified) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/local_config.py (modified) Updating version numbers for 4.0 release and making some release notes Sat, 01 Oct 2016 04:49:53 GMT butler [9bbc074] * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mag_vector.bmp (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/invariant/invariant_help.rst (modified) * sasview/local_config.py (modified) * sasview/setup_exe.py (modified) updating the copyright date from 2009-2013 to 2009-2016 Fri, 09 Sep 2016 14:31:38 GMT smk78 [fd196cb] * sasview/test/image_data/ISIS_98940_greyscale.bmp (added) * sasview/test/image_data/ISIS_98940_greyscale.gif (added) * sasview/test/image_data/ISIS_98940_greyscale.jpg (added) * sasview/test/image_data/ISIS_98940_greyscale.png (added) * sasview/test/image_data/ISIS_98940_greyscale.tif (added) Added some image test data Fri, 02 Sep 2016 16:50:30 GMT ajj [4ac4caa] * sasview/__init__.py (modified) Clean up un-needed commented line after jkrzywon fixed subprocess bad ... Fri, 02 Sep 2016 12:02:04 GMT krzywon [54756fc] * sasview/__init__.py (modified) Resolves #627: Modified subprocess call to be os dependant. Fri, 02 Sep 2016 00:13:19 GMT ajj [7b2d6fb] * sasview/__init__.py (modified) Theoretically now actually fixing #627 - needs checking on windows ... Wed, 31 Aug 2016 15:46:14 GMT ajj [a3f1c11e] * sasview/__init__.py (modified) Fixing problem with getting git revision Tue, 30 Aug 2016 15:40:56 GMT ajj [86eb046] * docs/sphinx-docs/source/conf.py (modified) * sasview/README.txt (modified) * sasview/__init__.py (modified) Changing version numbers for 4.0 beta release to comply with PEP440 Mon, 29 Aug 2016 14:37:57 GMT ajj [a756755] * sasview/default_categories.json (modified) Adding unfied_power_Rg model to default_categories.json so that it shows ... Wed, 24 Aug 2016 15:15:28 GMT lewis [96d293da] * sasview/local_config.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) Implement save analysis in corfunc Mon, 22 Aug 2016 08:08:36 GMT lewis [9a15a87] * docs/sphinx-docs/source/conf.py (modified) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/installer_generator.py (modified) * sasview/setup_exe.py (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/corfunc_help.rst (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (added) * sasview/sasview.py (modified) * src/sas/sascalc/corfunc/__init__.py (added) * src/sas/sascalc/corfunc/corfunc_calculator.py (added) * src/sas/sascalc/corfunc/transform_thread.py (added) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/perspectives/corfunc/__init__.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (added) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (added) * src/sas/sasgui/perspectives/corfunc/media/fig1.gif (added) * src/sas/sasgui/perspectives/corfunc/media/fig2.gif (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (added) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (added) * test/corfunc/test/98929.txt (added) * test/corfunc/test/utest_corfunc.py (added) Merge branch 'master' into corfunc Mon, 22 Aug 2016 06:27:57 GMT Piotr Rozyczko [525aaa2] * sasview/installer_generator.py (modified) * sasview/setup_exe.py (modified) Reverted precompiled models removal - requires more thought Fri, 19 Aug 2016 15:35:56 GMT butler [ee6d4ad] * sasview/README.txt (modified) update readme in preparation for beta release Fri, 19 Aug 2016 15:35:00 GMT butler [4394be16] * docs/sphinx-docs/source/conf.py (modified) * sasview/__init__.py (modified) update version numbers for 4.0.0-beta Fri, 19 Aug 2016 15:02:55 GMT lewis [2387abc] * build_tools/deploy.bat (added) * build_tools/sasview_deploy_test.au3 (added) * build_tools/test_deployment.bat (added) * docs/sphinx-docs/build_sphinx.py (modified) * sasview/installer_generator.py (modified) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * src/sas/sascalc/dataloader/data_info.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/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid.xsd (deleted) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (added) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (added) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/media/data_explorer_help.rst (modified) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified) * src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/RangeDialog.py (added) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/corfunc_help.rst (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (added) * src/sas/sascalc/corfunc/__init__.py (added) * src/sas/sascalc/corfunc/corfunc_calculator.py (added) * src/sas/sascalc/corfunc/transform_thread.py (added) * src/sas/sasgui/perspectives/corfunc/__init__.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (added) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (added) * src/sas/sasgui/perspectives/corfunc/media/fig1.gif (added) * src/sas/sasgui/perspectives/corfunc/media/fig2.gif (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (added) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (added) * test/corfunc/test/98929.txt (added) * test/corfunc/test/utest_corfunc.py (added) Merge branch 'master' into corfunc Fri, 19 Aug 2016 13:21:28 GMT lewis [fdd3ba1] * build_tools/sasview_deploy_test.au3 (modified) * sasview/installer_generator.py (modified) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * .gitignore (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (added) * docs/sphinx-docs/source/user/tools.rst (modified) * run.py (modified) * setup.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/file_converter/__init__.py (added) * src/sas/sascalc/file_converter/bsl_loader.py (added) * src/sas/sascalc/file_converter/c_ext/__init__.py (added) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (added) * src/sas/sascalc/file_converter/c_ext/bsl_loader.h (added) * src/sas/sascalc/file_converter/cansas_writer.py (added) * src/sas/sascalc/file_converter/nxcansas_writer.py (added) * src/sas/sascalc/file_converter/otoko_loader.py (added) * src/sas/sascalc/file_converter/red2d_writer.py (added) * src/sas/sasgui/perspectives/file_converter/__init__.py (added) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (added) * src/sas/sasgui/perspectives/file_converter/converter_widgets.py (added) * src/sas/sasgui/perspectives/file_converter/file_converter.py (added) * src/sas/sasgui/perspectives/file_converter/frame_select_dialog.py (added) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (added) * src/sas/sasgui/perspectives/file_converter/meta_panels.py (added) Merge branch 'master' into file-converter Fri, 19 Aug 2016 12:53:00 GMT lewis [cde6e52] * sasview/sasview.py (modified) Attempt to fix mac build Fri, 19 Aug 2016 09:47:26 GMT Piotr Rozyczko [09afe90] * sasview/installer_generator.py (modified) * sasview/setup_exe.py (modified) Removed precompiled models Fri, 19 Aug 2016 08:11:40 GMT lewis [7f71637] * build_tools/sasview_deploy_test.au3 (modified) * sasview/sasview.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/schema/cansas1d_invalid.xsd (deleted) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (added) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (added) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) * test/sasdataloader/test/utest_cansas.py (modified) * .gitignore (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (added) * docs/sphinx-docs/source/user/tools.rst (modified) * run.py (modified) * setup.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/file_converter/__init__.py (added) * src/sas/sascalc/file_converter/bsl_loader.py (added) * src/sas/sascalc/file_converter/c_ext/__init__.py (added) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (added) * src/sas/sascalc/file_converter/c_ext/bsl_loader.h (added) * src/sas/sascalc/file_converter/cansas_writer.py (added) * src/sas/sascalc/file_converter/nxcansas_writer.py (added) * src/sas/sascalc/file_converter/otoko_loader.py (added) * src/sas/sascalc/file_converter/red2d_writer.py (added) * src/sas/sasgui/perspectives/file_converter/__init__.py (added) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (added) * src/sas/sasgui/perspectives/file_converter/converter_widgets.py (added) * src/sas/sasgui/perspectives/file_converter/file_converter.py (added) * src/sas/sasgui/perspectives/file_converter/frame_select_dialog.py (added) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (added) * src/sas/sasgui/perspectives/file_converter/meta_panels.py (added) Merge branch 'master' into file-converter Wed, 17 Aug 2016 11:19:57 GMT lewis [e68c9bf] * sasview/sasview.py (modified) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) Remove option to save plot as PGF format (closes #446) Wed, 17 Aug 2016 10:08:39 GMT lewis [348bc8b] * build_tools/jenkins_win64_build.bat (modified) * build_tools/sasview_deploy_test.au3 (added) * docs/sphinx-docs/build_sphinx.py (modified) * sasview/setup_exe.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.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/SimplePlot.py (modified) * src/sas/sasgui/guiframe/media/data_explorer_help.rst (modified) * src/sas/sasgui/guiframe/media/graph_help.rst (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified) * src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/PropertyDialog.py (modified) * src/sas/sasgui/plottools/RangeDialog.py (added) * src/sas/sasgui/plottools/transform.py (modified) * .gitignore (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (added) * docs/sphinx-docs/source/user/tools.rst (modified) * run.py (modified) * sasview/sasview.py (modified) * setup.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/file_converter/__init__.py (added) * src/sas/sascalc/file_converter/bsl_loader.py (added) * src/sas/sascalc/file_converter/c_ext/__init__.py (added) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (added) * src/sas/sascalc/file_converter/c_ext/bsl_loader.h (added) * src/sas/sascalc/file_converter/cansas_writer.py (added) * src/sas/sascalc/file_converter/convert_bsl_thread.py (added) * src/sas/sascalc/file_converter/otoko_loader.py (added) * src/sas/sascalc/file_converter/red2d_writer.py (added) * src/sas/sasgui/perspectives/file_converter/__init__.py (added) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (added) * src/sas/sasgui/perspectives/file_converter/converter_widgets.py (added) * src/sas/sasgui/perspectives/file_converter/file_converter.py (added) * src/sas/sasgui/perspectives/file_converter/frame_select_dialog.py (added) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (added) * src/sas/sasgui/perspectives/file_converter/meta_panels.py (added) Merge branch 'master' into file-converter Fri, 12 Aug 2016 10:40:40 GMT lewis [a47d0c8] * build_tools/jenkins_win64_build.bat (modified) * sasview/setup_exe.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/SimplePlot.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/PropertyDialog.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/corfunc_help.rst (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (added) * sasview/sasview.py (modified) * src/sas/sascalc/corfunc/__init__.py (added) * src/sas/sascalc/corfunc/corfunc_calculator.py (added) * src/sas/sascalc/corfunc/transform_thread.py (added) * src/sas/sasgui/perspectives/corfunc/__init__.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (added) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (added) * src/sas/sasgui/perspectives/corfunc/media/fig1.gif (added) * src/sas/sasgui/perspectives/corfunc/media/fig2.gif (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (added) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (added) * test/corfunc/test/98929.txt (added) * test/corfunc/test/utest_corfunc.py (added) Merge branch 'master' into corfunc Fri, 12 Aug 2016 07:55:41 GMT Piotr Rozyczko [98d89df] * sasview/setup_exe.py (modified) Added numerical library checks Thu, 11 Aug 2016 12:21:59 GMT lewis [4699761] * build_tools/jenkins_win_build.bat (modified) * sasview/__init__.py (modified) * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * .gitignore (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (added) * docs/sphinx-docs/source/user/tools.rst (modified) * run.py (modified) * sasview/sasview.py (modified) * setup.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/file_converter/__init__.py (added) * src/sas/sascalc/file_converter/bsl_loader.py (added) * src/sas/sascalc/file_converter/c_ext/__init__.py (added) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (added) * src/sas/sascalc/file_converter/c_ext/bsl_loader.h (added) * src/sas/sascalc/file_converter/cansas_writer.py (added) * src/sas/sascalc/file_converter/convert_bsl_thread.py (added) * src/sas/sascalc/file_converter/otoko_loader.py (added) * src/sas/sascalc/file_converter/red2d_writer.py (added) * src/sas/sasgui/perspectives/file_converter/__init__.py (added) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (added) * src/sas/sasgui/perspectives/file_converter/converter_widgets.py (added) * src/sas/sasgui/perspectives/file_converter/file_converter.py (added) * src/sas/sasgui/perspectives/file_converter/frame_select_dialog.py (added) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (added) * src/sas/sasgui/perspectives/file_converter/meta_panels.py (added) Merge branch 'master' into file-converter Thu, 11 Aug 2016 12:19:11 GMT lewis [2c627ad] * build_tools/jenkins_win_build.bat (modified) * sasview/__init__.py (modified) * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/corfunc_help.rst (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (added) * sasview/sasview.py (modified) * src/sas/sascalc/corfunc/__init__.py (added) * src/sas/sascalc/corfunc/corfunc_calculator.py (added) * src/sas/sascalc/corfunc/transform_thread.py (added) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/perspectives/corfunc/__init__.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (added) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (added) * src/sas/sasgui/perspectives/corfunc/media/fig1.gif (added) * src/sas/sasgui/perspectives/corfunc/media/fig2.gif (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (added) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (added) * test/corfunc/test/98929.txt (added) * test/corfunc/test/utest_corfunc.py (added) Merge branch 'master' into corfunc Thu, 11 Aug 2016 07:51:21 GMT Piotr Rozyczko [801a296] * build_tools/jenkins_win_build.bat (modified) * sasview/__init__.py (modified) Don't flash the cmd window at start Wed, 10 Aug 2016 11:05:32 GMT lewis [ca6659f] * sasview/setup_exe.py (modified) * .gitignore (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (added) * docs/sphinx-docs/source/user/tools.rst (modified) * run.py (modified) * sasview/sasview.py (modified) * setup.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/file_converter/__init__.py (added) * src/sas/sascalc/file_converter/bsl_loader.py (added) * src/sas/sascalc/file_converter/c_ext/__init__.py (added) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (added) * src/sas/sascalc/file_converter/c_ext/bsl_loader.h (added) * src/sas/sascalc/file_converter/cansas_writer.py (added) * src/sas/sascalc/file_converter/convert_bsl_thread.py (added) * src/sas/sascalc/file_converter/otoko_loader.py (added) * src/sas/sascalc/file_converter/red2d_writer.py (added) * src/sas/sasgui/perspectives/file_converter/__init__.py (added) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (added) * src/sas/sasgui/perspectives/file_converter/converter_widgets.py (added) * src/sas/sasgui/perspectives/file_converter/file_converter.py (added) * src/sas/sasgui/perspectives/file_converter/frame_select_dialog.py (added) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (added) * src/sas/sasgui/perspectives/file_converter/meta_panels.py (added) Merge branch 'master' into file-converter Wed, 10 Aug 2016 11:05:19 GMT lewis [b6f5ad1c] * sasview/setup_exe.py (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/corfunc_help.rst (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (added) * sasview/sasview.py (modified) * src/sas/sascalc/corfunc/__init__.py (added) * src/sas/sascalc/corfunc/corfunc_calculator.py (added) * src/sas/sascalc/corfunc/transform_thread.py (added) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/perspectives/corfunc/__init__.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (added) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (added) * src/sas/sasgui/perspectives/corfunc/media/fig1.gif (added) * src/sas/sasgui/perspectives/corfunc/media/fig2.gif (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (added) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (added) * test/corfunc/test/98929.txt (added) * test/corfunc/test/utest_corfunc.py (added) Merge branch 'master' into corfunc Wed, 10 Aug 2016 09:54:50 GMT Piotr Rozyczko [c3e4e213] * sasview/setup_exe.py (modified) Attempt at fixing annoying numpy issues Mon, 08 Aug 2016 12:17:11 GMT lewis [fcba29a] * build_tools/jenkins_win64_build.bat (added) * sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved) * sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved) * sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved) * sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved) * sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved) * sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sascalc/dataloader/data_info.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/schema/cansas1d_invalid.xsd (added) * test/sasdataloader/test/cansas1d_notitle.xml (added) * test/sasdataloader/test/cansas_1Dand2D_multiplesasentry_multiplesasdata.h5 (added) * test/sasdataloader/test/cansas_1Dand2D_samedatafile.h5 (added) * test/sasdataloader/test/cansas_1Dand2D_samesasentry.h5 (added) * test/sasdataloader/test/simpleexamplefile.h5 (added) * test/sasdataloader/test/utest_cansas.py (modified) * .gitignore (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (added) * docs/sphinx-docs/source/user/tools.rst (modified) * sasview/sasview.py (modified) * src/sas/sasgui/perspectives/file_converter/__init__.py (added) * src/sas/sasgui/perspectives/file_converter/bsl_loader.py (added) * src/sas/sasgui/perspectives/file_converter/cansas_writer.py (added) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (added) * src/sas/sasgui/perspectives/file_converter/converter_widgets.py (added) * src/sas/sasgui/perspectives/file_converter/file_converter.py (added) * src/sas/sasgui/perspectives/file_converter/frame_select_dialog.py (added) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (added) * src/sas/sasgui/perspectives/file_converter/meta_panels.py (added) Merge branch 'master' into file-converter Mon, 08 Aug 2016 12:16:18 GMT lewis [40b14f3] * build_tools/jenkins_win64_build.bat (added) * sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved) * sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved) * sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved) * sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved) * sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved) * sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sascalc/dataloader/data_info.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/schema/cansas1d_invalid.xsd (added) * test/sasdataloader/test/cansas1d_notitle.xml (added) * test/sasdataloader/test/cansas_1Dand2D_multiplesasentry_multiplesasdata.h5 (added) * test/sasdataloader/test/cansas_1Dand2D_samedatafile.h5 (added) * test/sasdataloader/test/cansas_1Dand2D_samesasentry.h5 (added) * test/sasdataloader/test/simpleexamplefile.h5 (added) * test/sasdataloader/test/utest_cansas.py (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/corfunc_help.rst (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (added) * sasview/sasview.py (modified) * src/sas/sascalc/corfunc/__init__.py (added) * src/sas/sascalc/corfunc/corfunc_calculator.py (added) * src/sas/sascalc/corfunc/transform_thread.py (added) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/perspectives/corfunc/__init__.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (added) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (added) * src/sas/sasgui/perspectives/corfunc/media/fig1.gif (added) * src/sas/sasgui/perspectives/corfunc/media/fig2.gif (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (added) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (added) * test/corfunc/test/98929.txt (added) * test/corfunc/test/utest_corfunc.py (added) Merge branch 'master' into corfunc Thu, 04 Aug 2016 17:37:51 GMT krzywon [d72567e] * sasview/test/1d_data/33837rear_1D_1.75_16.5_CanSAS1D.xml (moved) * sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (moved) * sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (moved) * sasview/test/2d_data/33837rear_2D_1.75_16.5_NIST.dat (moved) * sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (moved) * sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (moved) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * test/sasdataloader/test/cansas_1Dand2D_multiplesasentry_multiplesasdata.h5 (added) * test/sasdataloader/test/cansas_1Dand2D_samedatafile.h5 (added) * test/sasdataloader/test/cansas_1Dand2D_samesasentry.h5 (added) * test/sasdataloader/test/simpleexamplefile.h5 (added) * test/sasdataloader/test/utest_cansas.py (modified) Refactored Cansas HDF5 reader to allow multiple instances of SASdata of ... Thu, 04 Aug 2016 07:56:28 GMT lewis [7a12540] * build_tools/jenkins_win_build.bat (modified) * sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (modified) * sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (modified) * sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (modified) * setup.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/corfunc_help.rst (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (added) * sasview/sasview.py (modified) * src/sas/sascalc/corfunc/__init__.py (added) * src/sas/sascalc/corfunc/corfunc_calculator.py (added) * src/sas/sascalc/corfunc/transform_thread.py (added) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/perspectives/corfunc/__init__.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (added) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (added) * src/sas/sasgui/perspectives/corfunc/media/fig1.gif (added) * src/sas/sasgui/perspectives/corfunc/media/fig2.gif (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (added) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (added) * test/corfunc/test/98929.txt (added) * test/corfunc/test/utest_corfunc.py (added) Merge branch 'master' into corfunc Thu, 04 Aug 2016 07:55:03 GMT lewis [3931ea14] * build_tools/jenkins_win_build.bat (modified) * sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (modified) * sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (modified) * sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (modified) * setup.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * .gitignore (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (added) * docs/sphinx-docs/source/user/tools.rst (modified) * sasview/sasview.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sasgui/perspectives/file_converter/__init__.py (added) * src/sas/sasgui/perspectives/file_converter/bsl_loader.py (added) * src/sas/sasgui/perspectives/file_converter/cansas_writer.py (added) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (added) * src/sas/sasgui/perspectives/file_converter/converter_widgets.py (added) * src/sas/sasgui/perspectives/file_converter/file_converter.py (added) * src/sas/sasgui/perspectives/file_converter/frame_select_dialog.py (added) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (added) * src/sas/sasgui/perspectives/file_converter/meta_panels.py (added) Merge branch 'master' into file-converter Wed, 27 Jul 2016 08:24:55 GMT smk78 [7ffa826d] * sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (modified) * sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (modified) * sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (modified) Corrected lambda unit from erroneous "Wavelength" to "A". Fixes Ticket ... Tue, 19 Jul 2016 16:03:30 GMT lewis [bdcdee4] * sasview/test/upcoming_formats/APS_DND-CAT.TXT (added) * sasview/test/upcoming_formats/APS_X.TXT (added) * sasview/test/upcoming_formats/APS_Y.TXT (added) * sasview/test/upcoming_formats/Anton-Paar_PDH.txt (added) * sasview/test/upcoming_formats/FIT2D_I.TXT (added) * sasview/test/upcoming_formats/FIT2D_Q.TXT (added) * sasview/test/upcoming_formats/ISIS_83404.TXT (added) * sasview/test/upcoming_formats/ISIS_98929.TXT (added) * sasview/test/upcoming_formats/Z83000.I1D (added) * sasview/test/upcoming_formats/Z83000.QAX (added) * sasview/test/upcoming_formats/Z83001.I1D (added) * sasview/test/upcoming_formats/Z83001.QAX (added) * sasview/test/upcoming_formats/Z83002.I1D (added) * sasview/test/upcoming_formats/Z98000.I1D (added) * sasview/test/upcoming_formats/Z98000.QAX (added) * sasview/test/upcoming_formats/Z98001.I1D (added) * sasview/test/upcoming_formats/Z98001.QAX (added) * sasview/test/upcoming_formats/Z98002.I1D (added) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/corfunc_help.rst (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (added) * sasview/sasview.py (modified) * src/sas/sascalc/corfunc/__init__.py (added) * src/sas/sascalc/corfunc/corfunc_calculator.py (added) * src/sas/sascalc/corfunc/transform_thread.py (added) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/perspectives/corfunc/__init__.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (added) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (added) * src/sas/sasgui/perspectives/corfunc/media/fig1.gif (added) * src/sas/sasgui/perspectives/corfunc/media/fig2.gif (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (added) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (added) * test/corfunc/test/98929.txt (added) * test/corfunc/test/utest_corfunc.py (added) Merge branch 'master' into corfunc Tue, 19 Jul 2016 15:57:56 GMT lewis [bf23693] * sasview/test/upcoming_formats/APS_DND-CAT.TXT (added) * sasview/test/upcoming_formats/APS_X.TXT (added) * sasview/test/upcoming_formats/APS_Y.TXT (added) * sasview/test/upcoming_formats/Anton-Paar_PDH.txt (added) * sasview/test/upcoming_formats/FIT2D_I.TXT (added) * sasview/test/upcoming_formats/FIT2D_Q.TXT (added) * sasview/test/upcoming_formats/ISIS_83404.TXT (added) * sasview/test/upcoming_formats/ISIS_98929.TXT (added) * sasview/test/upcoming_formats/Z83000.I1D (added) * sasview/test/upcoming_formats/Z83000.QAX (added) * sasview/test/upcoming_formats/Z83001.I1D (added) * sasview/test/upcoming_formats/Z83001.QAX (added) * sasview/test/upcoming_formats/Z83002.I1D (added) * sasview/test/upcoming_formats/Z98000.I1D (added) * sasview/test/upcoming_formats/Z98000.QAX (added) * sasview/test/upcoming_formats/Z98001.I1D (added) * sasview/test/upcoming_formats/Z98001.QAX (added) * sasview/test/upcoming_formats/Z98002.I1D (added) * sasview/sasview.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sasgui/perspectives/file_converter/__init__.py (added) * src/sas/sasgui/perspectives/file_converter/bsl_loader.py (added) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (added) * src/sas/sasgui/perspectives/file_converter/converter_widgets.py (added) * src/sas/sasgui/perspectives/file_converter/file_converter.py (added) * src/sas/sasgui/perspectives/file_converter/meta_panels.py (added) Merge branch 'master' into file-converter Fri, 15 Jul 2016 16:48:40 GMT smk78 [e19d29b] * sasview/test/upcoming_formats/APS_DND-CAT.TXT (added) * sasview/test/upcoming_formats/Anton-Paar_PDH.txt (added) * sasview/test/upcoming_formats/FIT2D_I.TXT (added) * sasview/test/upcoming_formats/FIT2D_Q.TXT (added) Some more example 1D file formats to be supported. Fri, 15 Jul 2016 16:34:07 GMT smk78 [f9fbe99] * sasview/test/upcoming_formats/APS_X.TXT (added) * sasview/test/upcoming_formats/APS_Y.TXT (added) * sasview/test/upcoming_formats/ISIS_83404.TXT (added) * sasview/test/upcoming_formats/ISIS_98929.TXT (added) * sasview/test/upcoming_formats/Z83000.I1D (added) * sasview/test/upcoming_formats/Z83000.QAX (added) * sasview/test/upcoming_formats/Z83001.I1D (added) * sasview/test/upcoming_formats/Z83001.QAX (added) * sasview/test/upcoming_formats/Z83002.I1D (added) * sasview/test/upcoming_formats/Z98000.I1D (added) * sasview/test/upcoming_formats/Z98000.QAX (added) * sasview/test/upcoming_formats/Z98001.I1D (added) * sasview/test/upcoming_formats/Z98001.QAX (added) * sasview/test/upcoming_formats/Z98002.I1D (added) Added examples of new 1D file formats to be supported. Thu, 14 Jul 2016 08:07:40 GMT lewis [a8ed421] * sasview/test/upcoming_formats/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (added) * sasview/test/upcoming_formats/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (added) * src/sas/sascalc/dataloader/readers/cansas_constants.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * sasview/sasview.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sasgui/perspectives/file_converter/__init__.py (added) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (added) * src/sas/sasgui/perspectives/file_converter/file_converter.py (added) Merge branch 'master' into file-converter Thu, 14 Jul 2016 07:56:03 GMT lewis [9f8209b] * sasview/test/upcoming_formats/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (added) * sasview/test/upcoming_formats/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (added) * src/sas/sascalc/dataloader/readers/cansas_constants.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * docs/sphinx-docs/source/user/analysis.rst (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/corfunc_help.rst (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (added) * docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (added) * sasview/sasview.py (modified) * src/sas/sascalc/corfunc/__init__.py (added) * src/sas/sascalc/corfunc/corfunc_calculator.py (added) * src/sas/sascalc/corfunc/transform_thread.py (added) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/perspectives/corfunc/__init__.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (added) * src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (added) * src/sas/sasgui/perspectives/corfunc/media/fig1.gif (added) * src/sas/sasgui/perspectives/corfunc/media/fig2.gif (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (added) * src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (added) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (added) * test/corfunc/test/98929.txt (added) * test/corfunc/test/utest_corfunc.py (added) Merge branch 'master' into corfunc Wed, 13 Jul 2016 12:52:08 GMT krzywon [d398285] * sasview/test/upcoming_formats/33837rear_1D_1.75_16.5_NXcanSAS_v3.h5 (added) * sasview/test/upcoming_formats/33837rear_2D_1.75_16.5_NXcanSAS_v3.h5 (added) * src/sas/sascalc/dataloader/readers/cansas_constants.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) #237: Modified the CanSAS HDF5 reader to read the latest version output ... Tue, 12 Jul 2016 16:11:40 GMT lewis [77d92cd] * sasview/sasview.py (modified) * src/sas/sasgui/perspectives/file_converter/__init__.py (added) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (added) * src/sas/sasgui/perspectives/file_converter/file_converter.py (added) Add backbone for file converter Mon, 11 Jul 2016 08:36:55 GMT lewis [c23f303] * sasview/sasview.py (modified) * src/sas/sasgui/perspectives/corfunc/__init__.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc.py (added) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (added) Added backbone of corfunc perspective Fri, 01 Jul 2016 15:09:20 GMT krzywon [80c5d46] * sasview/test/upcoming_formats/10wtAOT_Reline_120_reduced.pdh (added) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (added) * src/sas/sascalc/dataloader/readers/defaults.json (modified) Ticket #500: Start of a SAXSess reader. Loads in ASCII data. Next step - ... Thu, 30 Jun 2016 11:04:31 GMT trnielsen [8ca1ba1] * build_tools/jenkins_linux_build.sh (modified) * build_tools/jenkins_osx_build.sh (modified) * sasview/__init__.py (modified) Ticket #419: OSX Linux - Move GIT revision nr to build script Tue, 28 Jun 2016 20:51:41 GMT Paul Kienzle [5552396] * sasview/setup_exe.py (modified) include libiomp5md in windows build Sun, 19 Jun 2016 21:30:07 GMT butler [53b9fc8] * sasview/default_categories.json (modified) closes #582 - added barbell back to default_categories.json (not sure ... Fri, 10 Jun 2016 13:06:52 GMT wojciech [3d8e3c7] * sasview/setup_mac.py (modified) h5py update in setup_mac.py Fri, 10 Jun 2016 10:19:35 GMT wojciech [da1ba29] * sasview/setup_mac.py (modified) Small fix in setup_mac.py Fri, 10 Jun 2016 09:17:43 GMT wojciech [a929b6b] * sasview/setup_mac.py (modified) h5py added to mac packages in setup_mac.py Thu, 09 Jun 2016 12:25:38 GMT Piotr Rozyczko [abb02db] * sasview/setup_exe.py (modified) Added h5py to the library Wed, 25 May 2016 08:51:03 GMT wojciech [1be5202] * sasview/sasview.py (modified) Added .sasview mkdir in sasview.py so the program doesn't complain about ... Tue, 24 May 2016 15:27:31 GMT Paul Kienzle [9528caa] * sasview/setup_exe.py (modified) include tinycc in build, if available; support 64-bit python Mon, 23 May 2016 13:16:32 GMT wojciech [7c752d0e] * sasview/setup_mac.py (modified) pyopencl package added to mac installer Fri, 20 May 2016 13:53:09 GMT piotr [230178b] * sasview/setup_exe.py (modified) added pyopencl include files Thu, 19 May 2016 09:33:08 GMT Piotr Rozyczko [0c10782] * sasview/setup_exe.py (modified) Exclude build machine specific opencl.dll Fri, 13 May 2016 06:40:14 GMT Piotr Rozyczko [e04f87b] * .gitignore (modified) * sasview/installer.iss (deleted) removed autogenerated installer.iss Wed, 11 May 2016 13:09:46 GMT smk78 [a9946e9] * sasview/test/upcoming_formats/33837rear_1D_1.75_16.5_CanSAS1D.xml (added) * sasview/test/upcoming_formats/33837rear_1D_1.75_16.5_NXcanSAS.h5 (added) * sasview/test/upcoming_formats/33837rear_2D_1.75_16.5_NIST.dat (added) * sasview/test/upcoming_formats/33837rear_2D_1.75_16.5_NXcanSAS.h5 (added) Added 1D & 2D NXcanSAS test data sets + same data in existing CanSAS and ... Tue, 10 May 2016 07:10:35 GMT piotr [7e76afe] * sasview/setup_exe.py (modified) Minor syntax fixes. Mon, 09 May 2016 11:58:58 GMT wojciech [aa4a549] * sasview/setup_mac.py (modified) It points to __init__.py in sasmodels dir now Mon, 09 May 2016 10:59:33 GMT wojciech [3371d81] * check_packages.py (modified) * docs/sphinx-docs/Makefile (modified) * sasview/installer_generator.py (modified) * sasview/setup_exe.py (modified) * setup.py (modified) * src/sas/sascalc/calculator/c_extensions/librefl.c (modified) * src/sas/sascalc/calculator/c_extensions/sld2i.cpp (modified) * src/sas/sascalc/calculator/c_extensions/sld2i.hh (modified) * src/sas/sascalc/calculator/c_extensions/sld2i_module.cpp (modified) * src/sas/sascalc/calculator/c_extensions/winFuncs.c (deleted) * src/sas/sascalc/calculator/c_extensions/winFuncs.h (deleted) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * build_tools/jenkins_osx_build.sh (modified) * sasview/setup_mac.py (modified) setup.py fixed. Merged with Master Fri, 06 May 2016 07:09:58 GMT Paul Kienzle [6a698c0] * sasview/installer_generator.py (modified) * sasview/setup_exe.py (modified) refactor support for precompiled models in windows Tue, 03 May 2016 09:40:35 GMT Piotr Rozyczko [ddf571d] * sasview/installer_generator.py (modified) Copy precompiled models to user accessible location. Thu, 28 Apr 2016 11:38:05 GMT wojciech [aff7904] * build_tools/conda/bumps/meta.yaml (modified) * build_tools/jenkins_linux_build.sh (modified) * build_tools/jenkins_linux_build_ver02.sh (modified) * build_tools/jenkins_osx_build.sh (modified) * build_tools/jenkins_rhel6_build.sh (modified) * build_tools/jenkins_win32_build.bat (modified) * build_tools/jenkins_win32_py27_build.bat (modified) * build_tools/requirements.txt (modified) * check_packages.py (modified) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/default_categories.json (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * setup.py (modified) * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/__init__.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/plugin_models/__init__.py (added) * src/sas/sasgui/plottools/PlotPanel.py (modified) Conflicts fixed, merged with master Thu, 28 Apr 2016 11:29:38 GMT wojciech [5881b17] * build_tools/jenkins_osx_build.sh (modified) * sasview/setup_mac.py (modified) * setup.py (modified) Setup changes to make mac running Tue, 26 Apr 2016 09:19:52 GMT trnielsen [628acad] * sasview/setup_mac.py (modified) Updating inclusion of sasmodels.models to fit new sasview - sasmodels ... Tue, 26 Apr 2016 08:41:22 GMT trnielsen [a7c4ad2] * sasview/setup_exe.py (modified) * setup.py (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/plugin_models/__init__.py (added) Fixed some Windows issues for setupSasView.exe by reversing earlier ... Fri, 22 Apr 2016 20:27:10 GMT Paul Kienzle [243fbc0] * build_tools/conda/bumps/meta.yaml (modified) * build_tools/jenkins_linux_build.sh (modified) * build_tools/jenkins_linux_build_ver02.sh (modified) * build_tools/jenkins_rhel6_build.sh (modified) * build_tools/jenkins_win32_build.bat (modified) * build_tools/jenkins_win32_py27_build.bat (modified) * build_tools/requirements.txt (modified) * check_packages.py (modified) * sasview/README.txt (modified) * setup.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) move bumps version to 0.7.5.9 Sat, 16 Apr 2016 20:28:15 GMT butler [42585bf] * sasview/default_categories.json (modified) oops ..renabled by default. should now be ready for alpha release. ... Sat, 16 Apr 2016 20:17:47 GMT butler [a724bfb] * sasview/default_categories.json (modified) add all models to original default categories for alpha release Tue, 12 Apr 2016 20:13:13 GMT krzywon [fa4ea80] * sasview/README.txt (modified) * sasview/__init__.py (modified) Updated version number for alpha release and added release notes. Tue, 12 Apr 2016 09:23:39 GMT wojciech [70be725] * build_tools/jenkins_osx_build.sh (modified) * sasview/setup_mac.py (modified) Build script fixes Sun, 20 Mar 2016 20:25:51 GMT butler [50008e3] * sasview/installer.iss (modified) * sasview/installer_generator.py (modified) * setup.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) Fix so 4.0 uses categories.json instead of serialized_cat.json. Thus ... Sun, 20 Mar 2016 15:48:40 GMT ajj [558d64e] * sasview/sasview.py (modified) Fixing matplotlib directory clash issue Fri, 18 Mar 2016 15:53:13 GMT ajj [6313823] * sasview/default_categories.json (modified) Fixing up default categories again. Fri, 18 Mar 2016 11:02:59 GMT ajj [bd971ec] * sasview/setup_mac.py (modified) Adding sasmodels to dependencies in setup_mac.py Thu, 17 Mar 2016 16:41:47 GMT ajj [26d5aa5] * sasview/default_categories.json (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) Making easy sum model work with sasmodels Thu, 17 Mar 2016 15:13:00 GMT ajj [1c628f0] * sasview/default_categories.json (modified) Correct default_categories.json Still haven't worked out why this ever ... Thu, 17 Mar 2016 15:08:10 GMT ajj [bac3988] * sasview/default_categories.json (modified) * sasview/default_categories.p (deleted) * src/sas/sasgui/guiframe/default_categories.p (deleted) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) Fixing category lists and list of models in GUI Wed, 16 Mar 2016 21:00:54 GMT Piotr Rozyczko [40fc798] * sasview/setup_exe.py (modified) Missed reference to dataloader Wed, 16 Mar 2016 13:39:40 GMT Piotr Rozyczko [55c7d4b] * sasview/setup_mac.py (modified) Path fix for Macs Tue, 15 Mar 2016 15:02:33 GMT ajj [4ee041f] * sasview/default_categories.json (modified) * sasview/test/1d_data/saxess_example.pdh (added) * setup.py (modified) * src/sas/models/c_extension/c_models/barbell.cpp (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * docs/sphinx-docs/source/conf.py (modified) * run.py (modified) * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/welcome_panel.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/guiframe/.pydevproject (deleted) * src/sas/guiframe/local_perspectives/data_loader/__init__.py (deleted) * src/sas/guiframe/local_perspectives/plotting/__init__.py (deleted) * src/sas/models/smearing_2d.py (modified) * src/sas/sascalc/__init__.py (moved) * src/sas/sascalc/calculator/__init__.py (moved) * src/sas/sascalc/calculator/instrument.py (moved) * src/sas/sascalc/calculator/kiessig_calculator.py (moved) * src/sas/sascalc/calculator/resolution_calculator.py (moved) * src/sas/sascalc/calculator/sas_gen.py (moved) * src/sas/sascalc/calculator/slit_length_calculator.py (moved) * src/sas/sascalc/data_util/__init__.py (moved) * src/sas/sascalc/data_util/calcthread.py (moved) * src/sas/sascalc/data_util/err1d.py (moved) * src/sas/sascalc/data_util/formatnum.py (moved) * src/sas/sascalc/data_util/nxsunit.py (moved) * src/sas/sascalc/data_util/odict.py (moved) * src/sas/sascalc/data_util/ordereddict.py (moved) * src/sas/sascalc/data_util/ordereddicttest.py (moved) * src/sas/sascalc/data_util/pathutils.py (moved) * src/sas/sascalc/data_util/registry.py (moved) * src/sas/sascalc/data_util/release_notes.txt (moved) * src/sas/sascalc/data_util/uncertainty.py (moved) * src/sas/sascalc/data_util/uniquelist.py (moved) * src/sas/sascalc/dataloader/__init__.py (moved) * src/sas/sascalc/dataloader/data_info.py (moved) * src/sas/sascalc/dataloader/loader.py (moved) * src/sas/sascalc/dataloader/manipulations.py (moved) * src/sas/sascalc/dataloader/readers/IgorReader.py (moved) * src/sas/sascalc/dataloader/readers/__init__.py (moved) * src/sas/sascalc/dataloader/readers/abs_reader.py (moved) * src/sas/sascalc/dataloader/readers/ascii_reader.py (moved) * src/sas/sascalc/dataloader/readers/associations.py (moved) * src/sas/sascalc/dataloader/readers/cansas_constants.py (moved) * src/sas/sascalc/dataloader/readers/cansas_reader.py (moved) * src/sas/sascalc/dataloader/readers/danse_reader.py (moved) * src/sas/sascalc/dataloader/readers/defaults.json (moved) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (moved) * src/sas/sascalc/dataloader/readers/nexus_reader.py (moved) * src/sas/sascalc/dataloader/readers/red2d_reader.py (moved) * src/sas/sascalc/dataloader/readers/schema/cansas1d_v1_0.xsd (moved) * src/sas/sascalc/dataloader/readers/schema/cansas1d_v1_1.xsd (moved) * src/sas/sascalc/dataloader/readers/sesans_reader.py (moved) * src/sas/sascalc/dataloader/readers/tiff_reader.py (moved) * src/sas/sascalc/dataloader/readers/xml_reader.py (moved) * src/sas/sascalc/fit/AbstractFitEngine.py (moved) * src/sas/sascalc/fit/BumpsFitting.py (moved) * src/sas/sascalc/fit/Loader.py (moved) * src/sas/sascalc/fit/__init__.py (moved) * src/sas/sascalc/fit/expression.py (moved) * src/sas/sascalc/invariant/__init__.py (moved) * src/sas/sascalc/invariant/invariant.py (moved) * src/sas/sascalc/invariant/invariant_mapper.py (moved) * src/sas/sascalc/pr/Doxyfile (moved) * src/sas/sascalc/pr/__init__.py (moved) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (moved) * src/sas/sascalc/pr/c_extensions/__init__.py (moved) * src/sas/sascalc/pr/c_extensions/invertor.c (moved) * src/sas/sascalc/pr/c_extensions/invertor.h (moved) * src/sas/sascalc/pr/distance_explorer.py (moved) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (added) * src/sas/sascalc/pr/fit/BumpsFitting.py (added) * src/sas/sascalc/pr/fit/Loader.py (added) * src/sas/sascalc/pr/fit/__init__.py (added) * src/sas/sascalc/pr/fit/expression.py (added) * src/sas/sascalc/pr/invertor.py (moved) * src/sas/sascalc/pr/num_term.py (moved) * src/sas/sascalc/pr/release_notes.txt (moved) * src/sas/sascalc/realspace/VolumeCanvas.py (moved) * src/sas/sascalc/realspace/__init__.py (moved) * src/sas/sascalc/simulation/__init__.py (moved) * src/sas/sascalc/simulation/analmodelpy/Make.mm (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpy/Make.mm (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpy/__init__.py (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpymodule/Make.mm (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpymodule/analmodelpymodule.cc (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpymodule/bindings.cc (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpymodule/bindings.h (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpymodule/exceptions.cc (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpymodule/exceptions.h (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpymodule/local.def (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpymodule/misc.cc (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpymodule/misc.h (moved) * src/sas/sascalc/simulation/analmodelpy/examples/Make.mm (moved) * src/sas/sascalc/simulation/analmodelpy/libanalmodelpy/Make.mm (moved) * src/sas/sascalc/simulation/analmodelpy/libanalmodelpy/analytical_model.cc (moved) * src/sas/sascalc/simulation/analmodelpy/libanalmodelpy/analytical_model.h (moved) * src/sas/sascalc/simulation/analmodelpy/libanalmodelpy/local.def (moved) * src/sas/sascalc/simulation/analmodelpy/libanalmodelpy/sas_model.h (moved) * src/sas/sascalc/simulation/analmodelpy/tests/Make.mm (moved) * src/sas/sascalc/simulation/analmodelpy/tests/signon.py (moved) * src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (moved) * src/sas/sascalc/simulation/analmodelpy/tests/testanalytical_model.cc (moved) * src/sas/sascalc/simulation/geoshapespy/Make.mm (moved) * src/sas/sascalc/simulation/geoshapespy/examples/Make.mm (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespy/Make.mm (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespy/__init__.py (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespymodule/Make.mm (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespymodule/bindings.cc (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespymodule/bindings.h (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespymodule/exceptions.cc (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespymodule/exceptions.h (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespymodule/geoshapespymodule.cc (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespymodule/local.def (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespymodule/misc.cc (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespymodule/misc.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/Make.mm (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/Point3D.cc (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/Point3D.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/cylinder.cc (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/cylinder.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/ellipsoid.cc (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/ellipsoid.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/geo_shape.cc (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/geo_shape.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/hollow_sphere.cc (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/hollow_sphere.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/local.def (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/minmax.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/myutil.cc (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/myutil.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/single_helix.cc (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/single_helix.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/sphere.cc (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/sphere.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/transformation.cc (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/transformation.h (moved) * src/sas/sascalc/simulation/geoshapespy/tests/Make.mm (moved) * src/sas/sascalc/simulation/geoshapespy/tests/testPoint.cc (moved) * src/sas/sascalc/simulation/geoshapespy/tests/testorientation.cc (moved) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.cc (moved) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (moved) * src/sas/sascalc/simulation/geoshapespy/tests/testsphere.cc (moved) * src/sas/sascalc/simulation/iqPy/Make.mm (moved) * src/sas/sascalc/simulation/iqPy/examples/Make.mm (moved) * src/sas/sascalc/simulation/iqPy/iqPy/Make.mm (moved) * src/sas/sascalc/simulation/iqPy/iqPy/__init__.py (moved) * src/sas/sascalc/simulation/iqPy/iqPymodule/Make.mm (moved) * src/sas/sascalc/simulation/iqPy/iqPymodule/bindings.cc (moved) * src/sas/sascalc/simulation/iqPy/iqPymodule/bindings.h (moved) * src/sas/sascalc/simulation/iqPy/iqPymodule/exceptions.cc (moved) * src/sas/sascalc/simulation/iqPy/iqPymodule/exceptions.h (moved) * src/sas/sascalc/simulation/iqPy/iqPymodule/iqPymodule.cc (moved) * src/sas/sascalc/simulation/iqPy/iqPymodule/local.def (moved) * src/sas/sascalc/simulation/iqPy/iqPymodule/misc.cc (moved) * src/sas/sascalc/simulation/iqPy/iqPymodule/misc.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/Make.mm (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/iq.cc (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/iq.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/local.def (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_array1d.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_array1d_utils.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_array2d.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_array2d_utils.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_array3d.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_array3d_utils.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_cmat.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_fortran_array1d.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_fortran_array1d_utils.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_fortran_array2d.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_fortran_array2d_utils.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_fortran_array3d.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_fortran_array3d_utils.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_i_refvec.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_math_utils.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_sparse_matrix_csr.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_stopwatch.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_subscript.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_vec.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_version.h (moved) * src/sas/sascalc/simulation/iqPy/tests/Make.mm (moved) * src/sas/sascalc/simulation/iqPy/tests/signon.py (moved) * src/sas/sascalc/simulation/iqPy/tests/testiq.cc (moved) * src/sas/sascalc/simulation/iqPy/tests/testiq.py (moved) * src/sas/sascalc/simulation/pointsmodelpy/Make.mm (moved) * src/sas/sascalc/simulation/pointsmodelpy/examples/Make.mm (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/Make.mm (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/complex_model.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/complex_model.h (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/local.def (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/lores_model.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/lores_model.h (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/pdb_model.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/pdb_model.h (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/points_model.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/points_model.h (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpy/Make.mm (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpy/__init__.py (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpymodule/Make.mm (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpymodule/bindings.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpymodule/bindings.h (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpymodule/exceptions.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpymodule/exceptions.h (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpymodule/local.def (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpymodule/misc.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpymodule/misc.h (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpymodule/pointsmodelpymodule.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/Make.mm (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/test.pdb (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2.pdb (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/testnegativepr.py (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/testpdb.cc (moved) * src/sas/sascalc/simulation/setup.py (moved) * src/sas/sasgui/__init__.py (moved) * src/sas/sasgui/guiframe/.current_version (moved) * src/sas/sasgui/guiframe/CategoryInstaller.py (moved) * src/sas/sasgui/guiframe/CategoryManager.py (moved) * src/sas/sasgui/guiframe/__init__.py (moved) * src/sas/sasgui/guiframe/aboutbox.py (moved) * src/sas/sasgui/guiframe/acknowledgebox.py (moved) * src/sas/sasgui/guiframe/config.py (moved) * src/sas/sasgui/guiframe/custom_pstats.py (moved) * src/sas/sasgui/guiframe/customdir.py (moved) * src/sas/sasgui/guiframe/dataFitting.py (moved) * src/sas/sasgui/guiframe/data_manager.py (moved) * src/sas/sasgui/guiframe/data_panel.py (moved) * src/sas/sasgui/guiframe/data_processor.py (moved) * src/sas/sasgui/guiframe/data_state.py (moved) * src/sas/sasgui/guiframe/default_categories.p (moved) * src/sas/sasgui/guiframe/documentation_window.py (moved) * src/sas/sasgui/guiframe/dummyapp.py (moved) * src/sas/sasgui/guiframe/events.py (moved) * src/sas/sasgui/guiframe/gui_manager.py (moved) * src/sas/sasgui/guiframe/gui_statusbar.py (moved) * src/sas/sasgui/guiframe/gui_style.py (moved) * src/sas/sasgui/guiframe/gui_toolbar.py (moved) * src/sas/sasgui/guiframe/images/Thumbs.db (moved) * src/sas/sasgui/guiframe/images/angles.png (moved) * src/sas/sasgui/guiframe/images/angles_flat.png (moved) * src/sas/sasgui/guiframe/images/ball.icns (moved) * src/sas/sasgui/guiframe/images/ball.ico (moved) * src/sas/sasgui/guiframe/images/bookmark.png (moved) * src/sas/sasgui/guiframe/images/copy.png (moved) * src/sas/sasgui/guiframe/images/danse_logo.png (moved) * src/sas/sasgui/guiframe/images/drag_arrow.png (moved) * src/sas/sasgui/guiframe/images/drag_hand.png (moved) * src/sas/sasgui/guiframe/images/ess_logo.png (moved) * src/sas/sasgui/guiframe/images/favorites.png (moved) * src/sas/sasgui/guiframe/images/hide.png (moved) * src/sas/sasgui/guiframe/images/house_2.png (moved) * src/sas/sasgui/guiframe/images/ill_logo.png (moved) * src/sas/sasgui/guiframe/images/isis_logo.png (moved) * src/sas/sasgui/guiframe/images/nist_logo.png (moved) * src/sas/sasgui/guiframe/images/nsf_logo.png (moved) * src/sas/sasgui/guiframe/images/paste.png (moved) * src/sas/sasgui/guiframe/images/preview.png (moved) * src/sas/sasgui/guiframe/images/printer.png (moved) * src/sas/sasgui/guiframe/images/redo.png (moved) * src/sas/sasgui/guiframe/images/report.png (moved) * src/sas/sasgui/guiframe/images/reset.png (moved) * src/sas/sasgui/guiframe/images/save.png (moved) * src/sas/sasgui/guiframe/images/search.png (moved) * src/sas/sasgui/guiframe/images/search_pan.png (moved) * src/sas/sasgui/guiframe/images/sns_logo.png (moved) * src/sas/sasgui/guiframe/images/star_plus.png (moved) * src/sas/sasgui/guiframe/images/umd_logo.png (moved) * src/sas/sasgui/guiframe/images/undo.png (moved) * src/sas/sasgui/guiframe/images/utlogo.gif (moved) * src/sas/sasgui/guiframe/images/zoom_in.png (moved) * src/sas/sasgui/guiframe/images/zoom_out.png (moved) * src/sas/sasgui/guiframe/local_perspectives/__init__.py (moved) * src/sas/sasgui/guiframe/local_perspectives/data_loader/__init__.py (added) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (moved) * src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/AzimutSlicer.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/BaseInteractor.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/__init__.py (added) * src/sas/sasgui/guiframe/local_perspectives/plotting/appearanceDialog.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/graphAppearance.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (moved) * src/sas/sasgui/guiframe/media/BatchGridClassLayout.png (moved) * src/sas/sasgui/guiframe/media/M_angles_pic.bmp (moved) * src/sas/sasgui/guiframe/media/data_explorer_help.rst (moved) * src/sas/sasgui/guiframe/media/data_formats_help.rst (moved) * src/sas/sasgui/guiframe/media/graph_help.rst (moved) * src/sas/sasgui/guiframe/media/guinier_fit.png (moved) * src/sas/sasgui/guiframe/media/hand_menu.png (moved) * src/sas/sasgui/guiframe/panel_base.py (moved) * src/sas/sasgui/guiframe/pdfview.py (moved) * src/sas/sasgui/guiframe/plugin_base.py (moved) * src/sas/sasgui/guiframe/proxy.py (moved) * src/sas/sasgui/guiframe/report_dialog.py (moved) * src/sas/sasgui/guiframe/startup_configuration.py (moved) * src/sas/sasgui/guiframe/utils.py (moved) * src/sas/sasgui/perspectives/__init__.py (added) * src/sas/sasgui/perspectives/calculator/__init__.py (moved) * src/sas/sasgui/perspectives/calculator/aperture_editor.py (moved) * src/sas/sasgui/perspectives/calculator/calculator.py (moved) * src/sas/sasgui/perspectives/calculator/calculator_widgets.py (moved) * src/sas/sasgui/perspectives/calculator/collimation_editor.py (moved) * src/sas/sasgui/perspectives/calculator/console.py (moved) * src/sas/sasgui/perspectives/calculator/data_editor.py (moved) * src/sas/sasgui/perspectives/calculator/data_operator.py (moved) * src/sas/sasgui/perspectives/calculator/density_panel.py (moved) * src/sas/sasgui/perspectives/calculator/detector_editor.py (moved) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (moved) * src/sas/sasgui/perspectives/calculator/image_viewer.py (moved) * src/sas/sasgui/perspectives/calculator/images/ball.icns (moved) * src/sas/sasgui/perspectives/calculator/images/ball.ico (moved) * src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (moved) * src/sas/sasgui/perspectives/calculator/load_thread.py (moved) * src/sas/sasgui/perspectives/calculator/media/data_oper_pic.png (moved) * src/sas/sasgui/perspectives/calculator/media/data_operator_help.rst (moved) * src/sas/sasgui/perspectives/calculator/media/density_calculator_help.rst (moved) * src/sas/sasgui/perspectives/calculator/media/density_tutor.gif (moved) * src/sas/sasgui/perspectives/calculator/media/dm_eq.gif (moved) * src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.gif (moved) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (moved) * src/sas/sasgui/perspectives/calculator/media/gen_i.gif (moved) * src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.bmp (moved) * src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (moved) * src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (moved) * src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.rst (moved) * src/sas/sasgui/perspectives/calculator/media/load_image.bmp (moved) * src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (moved) * src/sas/sasgui/perspectives/calculator/media/mqx.gif (moved) * src/sas/sasgui/perspectives/calculator/media/mqy.gif (moved) * src/sas/sasgui/perspectives/calculator/media/mxp.gif (moved) * src/sas/sasgui/perspectives/calculator/media/myp.gif (moved) * src/sas/sasgui/perspectives/calculator/media/mzp.gif (moved) * src/sas/sasgui/perspectives/calculator/media/pdb_combo.jpg (moved) * src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (moved) * src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (moved) * src/sas/sasgui/perspectives/calculator/media/pycrust_example.png (moved) * src/sas/sasgui/perspectives/calculator/media/python_shell_help.rst (moved) * src/sas/sasgui/perspectives/calculator/media/q.gif (moved) * src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (moved) * src/sas/sasgui/perspectives/calculator/media/resolution_tutor.gif (moved) * src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (moved) * src/sas/sasgui/perspectives/calculator/media/sigma_q.gif (moved) * src/sas/sasgui/perspectives/calculator/media/sigma_table.gif (moved) * src/sas/sasgui/perspectives/calculator/media/sld1.gif (moved) * src/sas/sasgui/perspectives/calculator/media/sld2.gif (moved) * src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.rst (moved) * src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (moved) * src/sas/sasgui/perspectives/calculator/media/v_j.gif (moved) * src/sas/sasgui/perspectives/calculator/model_editor.py (moved) * src/sas/sasgui/perspectives/calculator/pyconsole.py (moved) * src/sas/sasgui/perspectives/calculator/resolcal_thread.py (moved) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (moved) * src/sas/sasgui/perspectives/calculator/sample_editor.py (moved) * src/sas/sasgui/perspectives/calculator/sld_panel.py (moved) * src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (moved) * src/sas/sasgui/perspectives/calculator/source_editor.py (moved) * src/sas/sasgui/perspectives/fitting/__init__.py (moved) * src/sas/sasgui/perspectives/fitting/basepage.py (moved) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (moved) * src/sas/sasgui/perspectives/fitting/console.py (moved) * src/sas/sasgui/perspectives/fitting/fit_thread.py (moved) * src/sas/sasgui/perspectives/fitting/fitpage.py (moved) * src/sas/sasgui/perspectives/fitting/fitpanel.py (moved) * src/sas/sasgui/perspectives/fitting/fitproblem.py (moved) * src/sas/sasgui/perspectives/fitting/fitting.py (moved) * src/sas/sasgui/perspectives/fitting/fitting_widgets.py (moved) * src/sas/sasgui/perspectives/fitting/hint_fitpage.py (moved) * src/sas/sasgui/perspectives/fitting/media/M_angles_pic.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/ball.ico (moved) * src/sas/sasgui/perspectives/fitting/media/batch_button_area.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/cat_fig0.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/cat_fig1.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/cat_fig2.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/dm_eq.gif (moved) * src/sas/sasgui/perspectives/fitting/media/edit_menu.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/edit_model_menu.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/file_menu.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/fitting.rst (moved) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (moved) * src/sas/sasgui/perspectives/fitting/media/m0x_eq.gif (moved) * src/sas/sasgui/perspectives/fitting/media/m0y_eq.gif (moved) * src/sas/sasgui/perspectives/fitting/media/m0z_eq.gif (moved) * src/sas/sasgui/perspectives/fitting/media/mag_help.rst (moved) * src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/mqx.gif (moved) * src/sas/sasgui/perspectives/fitting/media/mqy.gif (moved) * src/sas/sasgui/perspectives/fitting/media/mxp.gif (moved) * src/sas/sasgui/perspectives/fitting/media/myp.gif (moved) * src/sas/sasgui/perspectives/fitting/media/mzp.gif (moved) * src/sas/sasgui/perspectives/fitting/media/new_model.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/pd_help.rst (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image001.png (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image002.png (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image003.png (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image004.jpg (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image005.png (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image006.jpg (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image007.png (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image008.png (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image009.png (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image010.jpg (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image011.png (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image012.png (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image013.jpg (moved) * src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (moved) * src/sas/sasgui/perspectives/fitting/media/restore_batch_window.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/sld1.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sld2.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_help.rst (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image002.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image003.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image004.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image005.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image006.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image007.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image008.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image009.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image010.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image011.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image012.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image013.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image016.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image017.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image018.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image019.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image020.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image021.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image022.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image023.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image024.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image025.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image026.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image027.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image028.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sum_model.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/view_button.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/view_data_model.bmp (moved) * src/sas/sasgui/perspectives/fitting/model_thread.py (moved) * src/sas/sasgui/perspectives/fitting/pagestate.py (moved) * src/sas/sasgui/perspectives/fitting/plugin_models/__init__.py (added) * src/sas/sasgui/perspectives/fitting/plugin_models/polynomial5.py (moved) * src/sas/sasgui/perspectives/fitting/plugin_models/sph_bessel_jn.py (moved) * src/sas/sasgui/perspectives/fitting/plugin_models/sum_Ap1_1_Ap2.py (moved) * src/sas/sasgui/perspectives/fitting/plugin_models/sum_p1_p2.py (moved) * src/sas/sasgui/perspectives/fitting/plugin_models/testmodel.py (moved) * src/sas/sasgui/perspectives/fitting/plugin_models/testmodel_2.py (moved) * src/sas/sasgui/perspectives/fitting/report_dialog.py (moved) * src/sas/sasgui/perspectives/fitting/resultpanel.py (moved) * src/sas/sasgui/perspectives/fitting/simfitpage.py (moved) * src/sas/sasgui/perspectives/fitting/utils.py (moved) * src/sas/sasgui/perspectives/invariant/__init__.py (moved) * src/sas/sasgui/perspectives/invariant/invariant.py (moved) * src/sas/sasgui/perspectives/invariant/invariant_details.py (moved) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (moved) * src/sas/sasgui/perspectives/invariant/invariant_state.py (moved) * src/sas/sasgui/perspectives/invariant/invariant_widgets.py (moved) * src/sas/sasgui/perspectives/invariant/media/bookmark.png (moved) * src/sas/sasgui/perspectives/invariant/media/image001.gif (moved) * src/sas/sasgui/perspectives/invariant/media/image002.gif (moved) * src/sas/sasgui/perspectives/invariant/media/image003.gif (moved) * src/sas/sasgui/perspectives/invariant/media/image004.gif (moved) * src/sas/sasgui/perspectives/invariant/media/image005.gif (moved) * src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (moved) * src/sas/sasgui/perspectives/invariant/media/redo.png (moved) * src/sas/sasgui/perspectives/invariant/media/report.png (moved) * src/sas/sasgui/perspectives/invariant/media/report_template.html (moved) * src/sas/sasgui/perspectives/invariant/media/save.png (moved) * src/sas/sasgui/perspectives/invariant/media/undo.png (moved) * src/sas/sasgui/perspectives/invariant/report_dialog.py (moved) * src/sas/sasgui/perspectives/pr/__init__.py (moved) * src/sas/sasgui/perspectives/pr/explore_dialog.py (moved) * src/sas/sasgui/perspectives/pr/inversion_panel.py (moved) * src/sas/sasgui/perspectives/pr/inversion_state.py (moved) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (moved) * src/sas/sasgui/perspectives/pr/pr.py (moved) * src/sas/sasgui/perspectives/pr/pr_thread.py (moved) * src/sas/sasgui/perspectives/pr/pr_widgets.py (moved) * src/sas/sasgui/perspectives/simulation/ShapeAdapter.py (moved) * src/sas/sasgui/perspectives/simulation/ShapeParameters.py (moved) * src/sas/sasgui/perspectives/simulation/SimCanvas.py (moved) * src/sas/sasgui/perspectives/simulation/__init__.py (moved) * src/sas/sasgui/perspectives/simulation/requirements.txt (moved) * src/sas/sasgui/perspectives/simulation/simulation.py (moved) * src/sas/sasgui/plottools/BaseInteractor.py (moved) * src/sas/sasgui/plottools/LabelDialog.py (moved) * src/sas/sasgui/plottools/LineModel.py (moved) * src/sas/sasgui/plottools/PlotPanel.py (moved) * src/sas/sasgui/plottools/PropertyDialog.py (moved) * src/sas/sasgui/plottools/SimpleFont.py (moved) * src/sas/sasgui/plottools/SizeDialog.py (moved) * src/sas/sasgui/plottools/TextDialog.py (moved) * src/sas/sasgui/plottools/__init__.py (moved) * src/sas/sasgui/plottools/arrow3d.py (moved) * src/sas/sasgui/plottools/binder.py (moved) * src/sas/sasgui/plottools/canvas.py (moved) * src/sas/sasgui/plottools/config.py (moved) * src/sas/sasgui/plottools/convert_units.py (moved) * src/sas/sasgui/plottools/fitDialog.py (moved) * src/sas/sasgui/plottools/fittings.py (moved) * src/sas/sasgui/plottools/plottable_interactor.py (moved) * src/sas/sasgui/plottools/plottables.py (moved) * src/sas/sasgui/plottools/toolbar.py (moved) * src/sas/sasgui/plottools/transform.py (moved) * test/calculatorview/test/utest_gui_sld.py (modified) * test/pr_inversion/test/test_module.py (modified) * test/pr_inversion/test/utest_explorer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * 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/plugins/test_reader.py (modified) * test/sasdataloader/test/error_conditions.py (modified) * test/sasdataloader/test/isis_1_0_write_test.xml (modified) * test/sasdataloader/test/isis_1_1_write_test.xml (modified) * 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/write_test.xml (modified) * test/sasfit/test/batch_fit.py (modified) * test/sasfit/test/utest_fit_cylinder.py (modified) * test/sasfit/test/utest_fit_line.py (modified) * test/sasfit/test/utest_fit_smeared.py (modified) * test/sasfit/test/utest_multiplicative_model.py (modified) * test/sasfit/test/utest_small_test.py (modified) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/test/utest_data_handling.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) * test/sasmodels/test/utest_smearing.py (modified) * test/sasmodels/test/utest_sphere_dispersity.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) Merge branch 'master' into ESS_dev Sun, 13 Mar 2016 22:22:25 GMT ajj [12e19bd] * sasview/test/1d_data/saxess_example.pdh (added) Adding example Saxess data file Wed, 02 Mar 2016 00:31:49 GMT Paul Kienzle [db46d13] * sasview/default_categories.json (modified) * src/sas/models/c_extension/c_models/barbell.cpp (modified) * src/sas/perspectives/fitting/models.py (modified) fix 2D barbell model and add it to the fit page Mon, 22 Feb 2016 14:04:24 GMT Piotr Rozyczko [d85c194] * docs/sphinx-docs/source/conf.py (modified) * sasview/local_config.py (modified) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/welcome_panel.py (modified) * setup.py (modified) * src/sas/guiframe/.pydevproject (deleted) * src/sas/guiframe/local_perspectives/data_loader/__init__.py (deleted) * src/sas/guiframe/local_perspectives/plotting/__init__.py (deleted) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (moved) * src/sas/sascalc/realspace/__init__.py (moved) * src/sas/sascalc/simulation/__init__.py (moved) * src/sas/sascalc/simulation/analmodelpy/Make.mm (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpy/Make.mm (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpy/__init__.py (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpymodule/Make.mm (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpymodule/analmodelpymodule.cc (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpymodule/bindings.cc (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpymodule/bindings.h (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpymodule/exceptions.cc (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpymodule/exceptions.h (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpymodule/local.def (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpymodule/misc.cc (moved) * src/sas/sascalc/simulation/analmodelpy/analmodelpymodule/misc.h (moved) * src/sas/sascalc/simulation/analmodelpy/examples/Make.mm (moved) * src/sas/sascalc/simulation/analmodelpy/libanalmodelpy/Make.mm (moved) * src/sas/sascalc/simulation/analmodelpy/libanalmodelpy/analytical_model.cc (moved) * src/sas/sascalc/simulation/analmodelpy/libanalmodelpy/analytical_model.h (moved) * src/sas/sascalc/simulation/analmodelpy/libanalmodelpy/local.def (moved) * src/sas/sascalc/simulation/analmodelpy/libanalmodelpy/sas_model.h (moved) * src/sas/sascalc/simulation/analmodelpy/tests/Make.mm (moved) * src/sas/sascalc/simulation/analmodelpy/tests/signon.py (moved) * src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (moved) * src/sas/sascalc/simulation/analmodelpy/tests/testanalytical_model.cc (moved) * src/sas/sascalc/simulation/geoshapespy/Make.mm (moved) * src/sas/sascalc/simulation/geoshapespy/examples/Make.mm (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespy/Make.mm (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespy/__init__.py (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespymodule/Make.mm (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespymodule/bindings.cc (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespymodule/bindings.h (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespymodule/exceptions.cc (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespymodule/exceptions.h (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespymodule/geoshapespymodule.cc (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespymodule/local.def (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespymodule/misc.cc (moved) * src/sas/sascalc/simulation/geoshapespy/geoshapespymodule/misc.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/Make.mm (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/Point3D.cc (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/Point3D.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/cylinder.cc (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/cylinder.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/ellipsoid.cc (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/ellipsoid.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/geo_shape.cc (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/geo_shape.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/hollow_sphere.cc (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/hollow_sphere.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/local.def (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/minmax.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/myutil.cc (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/myutil.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/single_helix.cc (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/single_helix.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/sphere.cc (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/sphere.h (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/transformation.cc (moved) * src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/transformation.h (moved) * src/sas/sascalc/simulation/geoshapespy/tests/Make.mm (moved) * src/sas/sascalc/simulation/geoshapespy/tests/testPoint.cc (moved) * src/sas/sascalc/simulation/geoshapespy/tests/testorientation.cc (moved) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.cc (moved) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (moved) * src/sas/sascalc/simulation/geoshapespy/tests/testsphere.cc (moved) * src/sas/sascalc/simulation/iqPy/Make.mm (moved) * src/sas/sascalc/simulation/iqPy/examples/Make.mm (moved) * src/sas/sascalc/simulation/iqPy/iqPy/Make.mm (moved) * src/sas/sascalc/simulation/iqPy/iqPy/__init__.py (moved) * src/sas/sascalc/simulation/iqPy/iqPymodule/Make.mm (moved) * src/sas/sascalc/simulation/iqPy/iqPymodule/bindings.cc (moved) * src/sas/sascalc/simulation/iqPy/iqPymodule/bindings.h (moved) * src/sas/sascalc/simulation/iqPy/iqPymodule/exceptions.cc (moved) * src/sas/sascalc/simulation/iqPy/iqPymodule/exceptions.h (moved) * src/sas/sascalc/simulation/iqPy/iqPymodule/iqPymodule.cc (moved) * src/sas/sascalc/simulation/iqPy/iqPymodule/local.def (moved) * src/sas/sascalc/simulation/iqPy/iqPymodule/misc.cc (moved) * src/sas/sascalc/simulation/iqPy/iqPymodule/misc.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/Make.mm (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/iq.cc (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/iq.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/local.def (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_array1d.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_array1d_utils.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_array2d.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_array2d_utils.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_array3d.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_array3d_utils.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_cmat.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_fortran_array1d.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_fortran_array1d_utils.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_fortran_array2d.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_fortran_array2d_utils.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_fortran_array3d.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_fortran_array3d_utils.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_i_refvec.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_math_utils.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_sparse_matrix_csr.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_stopwatch.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_subscript.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_vec.h (moved) * src/sas/sascalc/simulation/iqPy/libiqPy/tnt/tnt_version.h (moved) * src/sas/sascalc/simulation/iqPy/tests/Make.mm (moved) * src/sas/sascalc/simulation/iqPy/tests/signon.py (moved) * src/sas/sascalc/simulation/iqPy/tests/testiq.cc (moved) * src/sas/sascalc/simulation/iqPy/tests/testiq.py (moved) * src/sas/sascalc/simulation/pointsmodelpy/Make.mm (moved) * src/sas/sascalc/simulation/pointsmodelpy/examples/Make.mm (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/Make.mm (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/complex_model.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/complex_model.h (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/local.def (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/lores_model.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/lores_model.h (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/pdb_model.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/pdb_model.h (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/points_model.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/libpointsmodelpy/points_model.h (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpy/Make.mm (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpy/__init__.py (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpymodule/Make.mm (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpymodule/bindings.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpymodule/bindings.h (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpymodule/exceptions.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpymodule/exceptions.h (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpymodule/local.def (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpymodule/misc.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpymodule/misc.h (moved) * src/sas/sascalc/simulation/pointsmodelpy/pointsmodelpymodule/pointsmodelpymodule.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/Make.mm (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/test.pdb (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2.pdb (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.cc (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/testnegativepr.py (moved) * src/sas/sascalc/simulation/pointsmodelpy/tests/testpdb.cc (moved) * src/sas/sascalc/simulation/setup.py (moved) * src/sas/sasgui/guiframe/.current_version (moved) * src/sas/sasgui/guiframe/CategoryInstaller.py (moved) * src/sas/sasgui/guiframe/CategoryManager.py (moved) * src/sas/sasgui/guiframe/__init__.py (moved) * src/sas/sasgui/guiframe/aboutbox.py (moved) * src/sas/sasgui/guiframe/acknowledgebox.py (moved) * src/sas/sasgui/guiframe/config.py (moved) * src/sas/sasgui/guiframe/custom_pstats.py (moved) * src/sas/sasgui/guiframe/customdir.py (moved) * src/sas/sasgui/guiframe/dataFitting.py (moved) * src/sas/sasgui/guiframe/data_manager.py (moved) * src/sas/sasgui/guiframe/data_panel.py (moved) * src/sas/sasgui/guiframe/data_processor.py (moved) * src/sas/sasgui/guiframe/data_state.py (moved) * src/sas/sasgui/guiframe/default_categories.p (moved) * src/sas/sasgui/guiframe/documentation_window.py (moved) * src/sas/sasgui/guiframe/dummyapp.py (moved) * src/sas/sasgui/guiframe/events.py (moved) * src/sas/sasgui/guiframe/gui_manager.py (moved) * src/sas/sasgui/guiframe/gui_statusbar.py (moved) * src/sas/sasgui/guiframe/gui_style.py (moved) * src/sas/sasgui/guiframe/gui_toolbar.py (moved) * src/sas/sasgui/guiframe/images/Thumbs.db (moved) * src/sas/sasgui/guiframe/images/angles.png (moved) * src/sas/sasgui/guiframe/images/angles_flat.png (moved) * src/sas/sasgui/guiframe/images/ball.icns (moved) * src/sas/sasgui/guiframe/images/ball.ico (moved) * src/sas/sasgui/guiframe/images/bookmark.png (moved) * src/sas/sasgui/guiframe/images/copy.png (moved) * src/sas/sasgui/guiframe/images/danse_logo.png (moved) * src/sas/sasgui/guiframe/images/drag_arrow.png (moved) * src/sas/sasgui/guiframe/images/drag_hand.png (moved) * src/sas/sasgui/guiframe/images/ess_logo.png (moved) * src/sas/sasgui/guiframe/images/favorites.png (moved) * src/sas/sasgui/guiframe/images/hide.png (moved) * src/sas/sasgui/guiframe/images/house_2.png (moved) * src/sas/sasgui/guiframe/images/ill_logo.png (moved) * src/sas/sasgui/guiframe/images/isis_logo.png (moved) * src/sas/sasgui/guiframe/images/nist_logo.png (moved) * src/sas/sasgui/guiframe/images/nsf_logo.png (moved) * src/sas/sasgui/guiframe/images/paste.png (moved) * src/sas/sasgui/guiframe/images/preview.png (moved) * src/sas/sasgui/guiframe/images/printer.png (moved) * src/sas/sasgui/guiframe/images/redo.png (moved) * src/sas/sasgui/guiframe/images/report.png (moved) * src/sas/sasgui/guiframe/images/reset.png (moved) * src/sas/sasgui/guiframe/images/save.png (moved) * src/sas/sasgui/guiframe/images/search.png (moved) * src/sas/sasgui/guiframe/images/search_pan.png (moved) * src/sas/sasgui/guiframe/images/sns_logo.png (moved) * src/sas/sasgui/guiframe/images/star_plus.png (moved) * src/sas/sasgui/guiframe/images/umd_logo.png (moved) * src/sas/sasgui/guiframe/images/undo.png (moved) * src/sas/sasgui/guiframe/images/utlogo.gif (moved) * src/sas/sasgui/guiframe/images/zoom_in.png (moved) * src/sas/sasgui/guiframe/images/zoom_out.png (moved) * src/sas/sasgui/guiframe/local_perspectives/__init__.py (moved) * src/sas/sasgui/guiframe/local_perspectives/data_loader/__init__.py (added) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (moved) * src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/AzimutSlicer.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/BaseInteractor.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/__init__.py (added) * src/sas/sasgui/guiframe/local_perspectives/plotting/appearanceDialog.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/graphAppearance.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (moved) * src/sas/sasgui/guiframe/media/BatchGridClassLayout.png (moved) * src/sas/sasgui/guiframe/media/M_angles_pic.bmp (moved) * src/sas/sasgui/guiframe/media/data_explorer_help.rst (moved) * src/sas/sasgui/guiframe/media/data_formats_help.rst (moved) * src/sas/sasgui/guiframe/media/graph_help.rst (moved) * src/sas/sasgui/guiframe/media/guinier_fit.png (moved) * src/sas/sasgui/guiframe/media/hand_menu.png (moved) * src/sas/sasgui/guiframe/panel_base.py (moved) * src/sas/sasgui/guiframe/pdfview.py (moved) * src/sas/sasgui/guiframe/plugin_base.py (moved) * src/sas/sasgui/guiframe/proxy.py (moved) * src/sas/sasgui/guiframe/report_dialog.py (moved) * src/sas/sasgui/guiframe/startup_configuration.py (moved) * src/sas/sasgui/guiframe/utils.py (moved) * src/sas/sasgui/perspectives/__init__.py (moved) * src/sas/sasgui/perspectives/calculator/__init__.py (moved) * src/sas/sasgui/perspectives/calculator/aperture_editor.py (moved) * src/sas/sasgui/perspectives/calculator/calculator.py (moved) * src/sas/sasgui/perspectives/calculator/calculator_widgets.py (moved) * src/sas/sasgui/perspectives/calculator/collimation_editor.py (moved) * src/sas/sasgui/perspectives/calculator/console.py (moved) * src/sas/sasgui/perspectives/calculator/data_editor.py (moved) * src/sas/sasgui/perspectives/calculator/data_operator.py (moved) * src/sas/sasgui/perspectives/calculator/density_panel.py (moved) * src/sas/sasgui/perspectives/calculator/detector_editor.py (moved) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (moved) * src/sas/sasgui/perspectives/calculator/image_viewer.py (moved) * src/sas/sasgui/perspectives/calculator/images/ball.icns (moved) * src/sas/sasgui/perspectives/calculator/images/ball.ico (moved) * src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (moved) * src/sas/sasgui/perspectives/calculator/load_thread.py (moved) * src/sas/sasgui/perspectives/calculator/media/data_oper_pic.png (moved) * src/sas/sasgui/perspectives/calculator/media/data_operator_help.rst (moved) * src/sas/sasgui/perspectives/calculator/media/density_calculator_help.rst (moved) * src/sas/sasgui/perspectives/calculator/media/density_tutor.gif (moved) * src/sas/sasgui/perspectives/calculator/media/dm_eq.gif (moved) * src/sas/sasgui/perspectives/calculator/media/gen_debye_eq.gif (moved) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (moved) * src/sas/sasgui/perspectives/calculator/media/gen_i.gif (moved) * src/sas/sasgui/perspectives/calculator/media/gen_mag_pic.bmp (moved) * src/sas/sasgui/perspectives/calculator/media/gen_sas_help.html (moved) * src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (moved) * src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.rst (moved) * src/sas/sasgui/perspectives/calculator/media/load_image.bmp (moved) * src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (moved) * src/sas/sasgui/perspectives/calculator/media/mqx.gif (moved) * src/sas/sasgui/perspectives/calculator/media/mqy.gif (moved) * src/sas/sasgui/perspectives/calculator/media/mxp.gif (moved) * src/sas/sasgui/perspectives/calculator/media/myp.gif (moved) * src/sas/sasgui/perspectives/calculator/media/mzp.gif (moved) * src/sas/sasgui/perspectives/calculator/media/pdb_combo.jpg (moved) * src/sas/sasgui/perspectives/calculator/media/pic_convert.bmp (moved) * src/sas/sasgui/perspectives/calculator/media/pic_plot.bmp (moved) * src/sas/sasgui/perspectives/calculator/media/pycrust_example.png (moved) * src/sas/sasgui/perspectives/calculator/media/python_shell_help.rst (moved) * src/sas/sasgui/perspectives/calculator/media/q.gif (moved) * src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst (moved) * src/sas/sasgui/perspectives/calculator/media/resolution_tutor.gif (moved) * src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (moved) * src/sas/sasgui/perspectives/calculator/media/sigma_q.gif (moved) * src/sas/sasgui/perspectives/calculator/media/sigma_table.gif (moved) * src/sas/sasgui/perspectives/calculator/media/sld1.gif (moved) * src/sas/sasgui/perspectives/calculator/media/sld2.gif (moved) * src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.rst (moved) * src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.rst (moved) * src/sas/sasgui/perspectives/calculator/media/v_j.gif (moved) * src/sas/sasgui/perspectives/calculator/model_editor.py (moved) * src/sas/sasgui/perspectives/calculator/pyconsole.py (moved) * src/sas/sasgui/perspectives/calculator/resolcal_thread.py (moved) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (moved) * src/sas/sasgui/perspectives/calculator/sample_editor.py (moved) * src/sas/sasgui/perspectives/calculator/sld_panel.py (moved) * src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (moved) * src/sas/sasgui/perspectives/calculator/source_editor.py (moved) * src/sas/sasgui/perspectives/fitting/__init__.py (moved) * src/sas/sasgui/perspectives/fitting/basepage.py (moved) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (moved) * src/sas/sasgui/perspectives/fitting/console.py (moved) * src/sas/sasgui/perspectives/fitting/fit_thread.py (moved) * src/sas/sasgui/perspectives/fitting/fitpage.py (moved) * src/sas/sasgui/perspectives/fitting/fitpanel.py (moved) * src/sas/sasgui/perspectives/fitting/fitproblem.py (moved) * src/sas/sasgui/perspectives/fitting/fitting.py (moved) * src/sas/sasgui/perspectives/fitting/fitting_widgets.py (moved) * src/sas/sasgui/perspectives/fitting/hint_fitpage.py (moved) * src/sas/sasgui/perspectives/fitting/media/M_angles_pic.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/ball.ico (moved) * src/sas/sasgui/perspectives/fitting/media/batch_button_area.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/cat_fig0.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/cat_fig1.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/cat_fig2.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/dm_eq.gif (moved) * src/sas/sasgui/perspectives/fitting/media/edit_menu.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/edit_model_menu.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/file_menu.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/fitting.rst (moved) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (moved) * src/sas/sasgui/perspectives/fitting/media/m0x_eq.gif (moved) * src/sas/sasgui/perspectives/fitting/media/m0y_eq.gif (moved) * src/sas/sasgui/perspectives/fitting/media/m0z_eq.gif (moved) * src/sas/sasgui/perspectives/fitting/media/mag_help.rst (moved) * src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/mqx.gif (moved) * src/sas/sasgui/perspectives/fitting/media/mqy.gif (moved) * src/sas/sasgui/perspectives/fitting/media/mxp.gif (moved) * src/sas/sasgui/perspectives/fitting/media/myp.gif (moved) * src/sas/sasgui/perspectives/fitting/media/mzp.gif (moved) * src/sas/sasgui/perspectives/fitting/media/new_model.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/pd_help.rst (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image001.png (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image002.png (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image003.png (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image004.jpg (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image005.png (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image006.jpg (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image007.png (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image008.png (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image009.png (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image010.jpg (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image011.png (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image012.png (moved) * src/sas/sasgui/perspectives/fitting/media/pd_image013.jpg (moved) * src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/residuals_help.rst (moved) * src/sas/sasgui/perspectives/fitting/media/restore_batch_window.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/sld1.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sld2.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_help.rst (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image002.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image003.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image004.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image005.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image006.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image007.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image008.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image009.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image010.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image011.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image012.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image013.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image016.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image017.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image018.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image019.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image020.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image021.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image022.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image023.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image024.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image025.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image026.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image027.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sm_image028.gif (moved) * src/sas/sasgui/perspectives/fitting/media/sum_model.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/view_button.bmp (moved) * src/sas/sasgui/perspectives/fitting/media/view_data_model.bmp (moved) * src/sas/sasgui/perspectives/fitting/model_thread.py (moved) * src/sas/sasgui/perspectives/fitting/models.py (moved) * src/sas/sasgui/perspectives/fitting/pagestate.py (moved) * src/sas/sasgui/perspectives/fitting/plugin_models/__init__.py (moved) * src/sas/sasgui/perspectives/fitting/plugin_models/polynomial5.py (moved) * src/sas/sasgui/perspectives/fitting/plugin_models/sph_bessel_jn.py (moved) * src/sas/sasgui/perspectives/fitting/plugin_models/sum_Ap1_1_Ap2.py (moved) * src/sas/sasgui/perspectives/fitting/plugin_models/sum_p1_p2.py (moved) * src/sas/sasgui/perspectives/fitting/plugin_models/testmodel.py (moved) * src/sas/sasgui/perspectives/fitting/plugin_models/testmodel_2.py (moved) * src/sas/sasgui/perspectives/fitting/report_dialog.py (moved) * src/sas/sasgui/perspectives/fitting/resultpanel.py (moved) * src/sas/sasgui/perspectives/fitting/simfitpage.py (moved) * src/sas/sasgui/perspectives/fitting/utils.py (moved) * src/sas/sasgui/perspectives/invariant/__init__.py (moved) * src/sas/sasgui/perspectives/invariant/invariant.py (moved) * src/sas/sasgui/perspectives/invariant/invariant_details.py (moved) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (moved) * src/sas/sasgui/perspectives/invariant/invariant_state.py (moved) * src/sas/sasgui/perspectives/invariant/invariant_widgets.py (moved) * src/sas/sasgui/perspectives/invariant/media/bookmark.png (moved) * src/sas/sasgui/perspectives/invariant/media/image001.gif (moved) * src/sas/sasgui/perspectives/invariant/media/image002.gif (moved) * src/sas/sasgui/perspectives/invariant/media/image003.gif (moved) * src/sas/sasgui/perspectives/invariant/media/image004.gif (moved) * src/sas/sasgui/perspectives/invariant/media/image005.gif (moved) * src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (moved) * src/sas/sasgui/perspectives/invariant/media/redo.png (moved) * src/sas/sasgui/perspectives/invariant/media/report.png (moved) * src/sas/sasgui/perspectives/invariant/media/report_template.html (moved) * src/sas/sasgui/perspectives/invariant/media/save.png (moved) * src/sas/sasgui/perspectives/invariant/media/undo.png (moved) * src/sas/sasgui/perspectives/invariant/report_dialog.py (moved) * src/sas/sasgui/perspectives/pr/__init__.py (moved) * src/sas/sasgui/perspectives/pr/explore_dialog.py (moved) * src/sas/sasgui/perspectives/pr/inversion_panel.py (moved) * src/sas/sasgui/perspectives/pr/inversion_state.py (moved) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (moved) * src/sas/sasgui/perspectives/pr/pr.py (moved) * src/sas/sasgui/perspectives/pr/pr_thread.py (moved) * src/sas/sasgui/perspectives/pr/pr_widgets.py (moved) * src/sas/sasgui/perspectives/simulation/ShapeAdapter.py (moved) * src/sas/sasgui/perspectives/simulation/ShapeParameters.py (moved) * src/sas/sasgui/perspectives/simulation/SimCanvas.py (moved) * src/sas/sasgui/perspectives/simulation/__init__.py (moved) * src/sas/sasgui/perspectives/simulation/requirements.txt (moved) * src/sas/sasgui/perspectives/simulation/simulation.py (moved) * src/sas/sasgui/plottools/PlotPanel.py (modified) * test/calculatorview/test/utest_gui_sld.py (modified) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_oriented.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) Remaining modules refactored Fri, 19 Feb 2016 15:07:22 GMT Piotr Rozyczko [b699768] * docs/sphinx-docs/source/conf.py (modified) * run.py (modified) * sasview/installer_generator.py (modified) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * setup.py (modified) * src/examples/test_panel2D.py (modified) * src/sas/guiframe/CategoryInstaller.py (modified) * src/sas/guiframe/dataFitting.py (modified) * src/sas/guiframe/data_manager.py (modified) * src/sas/guiframe/data_panel.py (modified) * src/sas/guiframe/gui_manager.py (modified) * src/sas/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/guiframe/local_perspectives/data_loader/load_thread.py (modified) * src/sas/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) * src/sas/guiframe/local_perspectives/plotting/AzimutSlicer.py (modified) * src/sas/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/guiframe/local_perspectives/plotting/boxMask.py (modified) * src/sas/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/guiframe/local_perspectives/plotting/boxSum.py (modified) * src/sas/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/models/smearing_2d.py (modified) * src/sas/perspectives/calculator/collimation_editor.py (modified) * src/sas/perspectives/calculator/console.py (modified) * src/sas/perspectives/calculator/data_editor.py (modified) * src/sas/perspectives/calculator/data_operator.py (modified) * src/sas/perspectives/calculator/detector_editor.py (modified) * src/sas/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/perspectives/calculator/image_viewer.py (modified) * src/sas/perspectives/calculator/kiessig_calculator_panel.py (modified) * src/sas/perspectives/calculator/load_thread.py (modified) * src/sas/perspectives/calculator/resolcal_thread.py (modified) * src/sas/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/perspectives/calculator/sample_editor.py (modified) * src/sas/perspectives/calculator/slit_length_calculator_panel.py (modified) * src/sas/perspectives/calculator/source_editor.py (modified) * src/sas/perspectives/fitting/basepage.py (modified) * src/sas/perspectives/fitting/console.py (modified) * src/sas/perspectives/fitting/fit_thread.py (modified) * src/sas/perspectives/fitting/fitting.py (modified) * src/sas/perspectives/fitting/model_thread.py (modified) * src/sas/perspectives/fitting/pagestate.py (modified) * src/sas/perspectives/invariant/__init__.py (modified) * src/sas/perspectives/invariant/invariant.py (modified) * src/sas/perspectives/invariant/invariant_panel.py (modified) * src/sas/perspectives/invariant/invariant_state.py (modified) * src/sas/perspectives/pr/explore_dialog.py (modified) * src/sas/perspectives/pr/inversion_panel.py (modified) * src/sas/perspectives/pr/inversion_state.py (modified) * src/sas/perspectives/pr/pr.py (modified) * src/sas/perspectives/pr/pr_thread.py (modified) * src/sas/perspectives/simulation/simulation.py (modified) * src/sas/sascalc/__init__.py (moved) * src/sas/sascalc/calculator/__init__.py (moved) * src/sas/sascalc/calculator/instrument.py (moved) * src/sas/sascalc/calculator/kiessig_calculator.py (moved) * src/sas/sascalc/calculator/resolution_calculator.py (moved) * src/sas/sascalc/calculator/sas_gen.py (moved) * src/sas/sascalc/calculator/slit_length_calculator.py (moved) * src/sas/sascalc/data_util/__init__.py (moved) * src/sas/sascalc/data_util/calcthread.py (moved) * src/sas/sascalc/data_util/err1d.py (moved) * src/sas/sascalc/data_util/formatnum.py (moved) * src/sas/sascalc/data_util/nxsunit.py (moved) * src/sas/sascalc/data_util/odict.py (moved) * src/sas/sascalc/data_util/ordereddict.py (moved) * src/sas/sascalc/data_util/ordereddicttest.py (moved) * src/sas/sascalc/data_util/pathutils.py (moved) * src/sas/sascalc/data_util/registry.py (moved) * src/sas/sascalc/data_util/release_notes.txt (moved) * src/sas/sascalc/data_util/uncertainty.py (moved) * src/sas/sascalc/data_util/uniquelist.py (moved) * src/sas/sascalc/dataloader/__init__.py (moved) * src/sas/sascalc/dataloader/data_info.py (moved) * src/sas/sascalc/dataloader/loader.py (moved) * src/sas/sascalc/dataloader/manipulations.py (moved) * src/sas/sascalc/dataloader/readers/IgorReader.py (moved) * src/sas/sascalc/dataloader/readers/__init__.py (moved) * src/sas/sascalc/dataloader/readers/abs_reader.py (moved) * src/sas/sascalc/dataloader/readers/ascii_reader.py (moved) * src/sas/sascalc/dataloader/readers/associations.py (moved) * src/sas/sascalc/dataloader/readers/cansas_constants.py (moved) * src/sas/sascalc/dataloader/readers/cansas_reader.py (moved) * src/sas/sascalc/dataloader/readers/danse_reader.py (moved) * src/sas/sascalc/dataloader/readers/defaults.json (moved) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (moved) * src/sas/sascalc/dataloader/readers/nexus_reader.py (moved) * src/sas/sascalc/dataloader/readers/red2d_reader.py (moved) * src/sas/sascalc/dataloader/readers/schema/cansas1d_v1_0.xsd (moved) * src/sas/sascalc/dataloader/readers/schema/cansas1d_v1_1.xsd (moved) * src/sas/sascalc/dataloader/readers/sesans_reader.py (moved) * src/sas/sascalc/dataloader/readers/tiff_reader.py (moved) * src/sas/sascalc/dataloader/readers/xml_reader.py (moved) * src/sas/sascalc/fit/AbstractFitEngine.py (moved) * src/sas/sascalc/fit/BumpsFitting.py (moved) * src/sas/sascalc/fit/Loader.py (moved) * src/sas/sascalc/fit/__init__.py (moved) * src/sas/sascalc/fit/expression.py (moved) * src/sas/sascalc/invariant/__init__.py (added) * src/sas/sascalc/invariant/invariant.py (moved) * src/sas/sascalc/invariant/invariant_mapper.py (moved) * src/sas/sascalc/pr/Doxyfile (moved) * src/sas/sascalc/pr/__init__.py (moved) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (moved) * src/sas/sascalc/pr/c_extensions/__init__.py (moved) * src/sas/sascalc/pr/c_extensions/invertor.c (moved) * src/sas/sascalc/pr/c_extensions/invertor.h (moved) * src/sas/sascalc/pr/distance_explorer.py (moved) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (added) * src/sas/sascalc/pr/fit/BumpsFitting.py (added) * src/sas/sascalc/pr/fit/Loader.py (added) * src/sas/sascalc/pr/fit/__init__.py (added) * src/sas/sascalc/pr/fit/expression.py (added) * src/sas/sascalc/pr/invertor.py (moved) * src/sas/sascalc/pr/num_term.py (moved) * src/sas/sascalc/pr/release_notes.txt (moved) * test/pr_inversion/test/test_module.py (modified) * test/pr_inversion/test/utest_explorer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * 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/plugins/test_reader.py (modified) * test/sasdataloader/test/error_conditions.py (modified) * test/sasdataloader/test/isis_1_0_write_test.xml (modified) * test/sasdataloader/test/isis_1_1_write_test.xml (modified) * 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/write_test.xml (modified) * test/sasfit/test/batch_fit.py (modified) * test/sasfit/test/utest_fit_cylinder.py (modified) * test/sasfit/test/utest_fit_line.py (modified) * test/sasfit/test/utest_fit_smeared.py (modified) * test/sasfit/test/utest_multiplicative_model.py (modified) * test/sasfit/test/utest_small_test.py (modified) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/test/utest_data_handling.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) * test/sasmodels/test/utest_smearing.py (modified) * test/sasmodels/test/utest_sphere_dispersity.py (modified) Initial commit of the refactored SasCalc module. Tue, 08 Dec 2015 16:19:34 GMT ajj [792e6be] * docs/sphinx-docs/source/conf.py (modified) * sasview.latestversion (modified) * sasview/README.txt (modified) * sasview/__init__.py (modified) Updating version numbers for release Wed, 25 Nov 2015 11:47:02 GMT ajj [ed5beb3] * .gitignore (modified) * build.txt (deleted) * install.txt (deleted) * sasview/README.txt (modified) * sasview/sasview.py (modified) * sasview/wxcruft.py (added) * setup.cfg (deleted) * src/sas/guiframe/gui_toolbar.py (modified) * src/sas/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/guiframe/utils.py (modified) * src/sas/models/PeakGaussModel.py (modified) * src/sas/models/resolution.py (modified) * src/sas/perspectives/fitting/basepage.py (modified) * src/sas/perspectives/fitting/batchfitpage.py (modified) * src/sas/perspectives/fitting/fitpage.py (modified) * src/sas/perspectives/fitting/fitpanel.py (modified) * src/sas/perspectives/fitting/fitting.py (modified) * src/sas/perspectives/fitting/fitting_widgets.py (modified) * src/sas/perspectives/fitting/hint_fitpage.py (modified) * src/sas/perspectives/fitting/pagestate.py (modified) * src/sas/perspectives/fitting/resultpanel.py (modified) * src/sas/perspectives/fitting/simfitpage.py (modified) * src/sas/plottools/toolbar.py (modified) * test/pr_inversion/test/test_output.txt (deleted) * test/sasdataloader/test/plugins.zip (deleted) * test/sasdataloader/test/test_log.txt (deleted) * test/sasfit/test/utest_fit_line.py (modified) * test/sasfit/test/utest_fit_smeared.py (modified) * sasview/setup_mac.py (modified) Merge branch 'master' of https://github.com/SasView/sasview Wed, 25 Nov 2015 11:46:10 GMT ajj [e8e3e38] * sasview/setup_mac.py (modified) Updating name of DMG file for mac Closes #485