# # ChangeLog for src/sas in sasview # # Generated by Trac 1.0.1 # Dec 25, 2024 1:42:16 AM Fri, 20 Feb 2015 10:35:48 GMT pkienzle [efa5e44] * sasview/default_categories.json (modified) * src/sas/fit/ParkFitting.py (deleted) * src/sas/fit/ScipyFitting.py (deleted) * src/sas/perspectives/fitting/ftol_dialog.py (deleted) * test/sasfit/test/PolySpheres.txt (modified) * test/sasfit/test/SILIC010_noheader.DAT (modified) * test/sasfit/test/batch_fit.py (modified) * test/sasfit/test/cyl_400_20.txt (modified) * test/sasfit/test/cyl_400_20_disp5r.txt (modified) * test/sasfit/test/cyl_400_40.txt (modified) * test/sasfit/test/cyl_testdata.txt (modified) * test/sasfit/test/cyl_testdata1.txt (modified) * test/sasfit/test/cylinder_data.txt (modified) * test/sasfit/test/latex_qdev.txt (modified) * test/sasfit/test/latex_qdev2.txt (modified) * test/sasfit/test/sphere_80.txt (modified) * test/sasfit/test/sphere_test_data.txt (modified) * test/sasfit/test/testdata_cst.txt (modified) * test/sasfit/test/testdata_line.txt (modified) * test/sasfit/test/testdata_line1.txt (modified) * test/sasfit/test/testdata_line3.txt (modified) * test/sasfit/test/utest_fit_line.py (modified) * test/sasfit/test/utest_fit_smeared.py (modified) * test/sasfit/test/utest_small_test.py (modified) remove remaining refs to park/scipy Fri, 20 Feb 2015 10:02:38 GMT pkienzle [386ffe1] * .gitignore (modified) * docs/pre-sphinx-docs/simultaneous_fit_help_v0.html (modified) * src/sas/fit/AbstractFitEngine.py (modified) * src/sas/fit/BumpsFitting.py (modified) * src/sas/fit/Fitting.py (modified) * src/sas/fit/ParkFitting.py (modified) * src/sas/fit/ScipyFitting.py (modified) * src/sas/perspectives/fitting/fit_thread.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/ftol_dialog.py (modified) * src/sas/perspectives/fitting/simfitpage.py (modified) * test/park_integration/test/batch_fit.py (modified) * test/park_integration/test/utest_fit_cylinder.py (modified) * test/park_integration/test/utest_fit_line.py (modified) * test/park_integration/test/utest_fit_smeared.py (modified) * test/park_integration/test/utest_park_scipy.py (deleted) * test/park_integration/test/utest_small_test.py (modified) * test/pr_inversion/test/test_output.txt (modified) * test/sasmodels/test/utest_models.py (modified) remove scipy levenburg marquardt and park from ui Thu, 19 Feb 2015 21:23:38 GMT smk78 [0721c3d] * src/sas/perspectives/invariant/media/invariant_help.rst (modified) Proof read. Thu, 19 Feb 2015 16:20:54 GMT smk78 [8a22b5b] * src/sas/perspectives/calculator/media/slit_calculator_help.rst (modified) * src/sas/perspectives/pr/media/pr_help.rst (modified) Proof read. Thu, 19 Feb 2015 16:16:39 GMT smk78 [6271222] * src/sas/guiframe/documentation_window.py (modified) * src/sas/guiframe/gui_manager.py (modified) * src/sas/perspectives/calculator/media/resolution_calculator_help.rst (modified) * src/sas/perspectives/calculator/media/sas_calculator_help.rst (modified) * src/sas/perspectives/calculator/media/sld_calculator_help.rst (modified) Merge branch 'master' of https://github.com/SasView/sasview.git Thu, 19 Feb 2015 16:06:49 GMT krzywon [064723b] * src/sas/guiframe/gui_manager.py (modified) Found one small issue with the last commit. Thu, 19 Feb 2015 16:03:42 GMT krzywon [c3866b8] * .gitignore (modified) * Vagrantfile (added) * Vagrantprovision.sh (added) * src/sas/guiframe/documentation_window.py (modified) * src/sas/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/perspectives/calculator/media/python_shell_help.rst (modified) * src/sas/guiframe/gui_manager.py (modified) Merge branch 'master' of https://github.com/SasView/sasview/ Thu, 19 Feb 2015 16:03:32 GMT krzywon [74d679d] * src/sas/guiframe/gui_manager.py (modified) Fixed a wx id issue. The acknowledge entry was not creating a new id ... Thu, 19 Feb 2015 15:20:53 GMT Peter Parker [78bcf3c3] * src/sas/guiframe/documentation_window.py (modified) Fix docs on Mac. Thu, 19 Feb 2015 14:05:07 GMT smk78 [850c753] * src/sas/perspectives/calculator/media/resolution_calculator_help.rst (modified) * src/sas/perspectives/calculator/media/sas_calculator_help.rst (modified) * src/sas/perspectives/calculator/media/sld_calculator_help.rst (modified) Proof read. Thu, 19 Feb 2015 13:49:14 GMT smk78 [17d30be] * src/sas/perspectives/calculator/media/python_shell_help.rst (modified) Minor formatting change. Thu, 19 Feb 2015 13:48:05 GMT smk78 [80c84b5] * src/sas/perspectives/calculator/media/image_viewer_help.rst (modified) Fixed Sphinx compilation error preventing an image from loading. Thu, 19 Feb 2015 13:13:19 GMT krzywon [4749514] * src/sas/dataloader/loader.py (modified) Removed a print statement in the dataloader.loader package. Thu, 19 Feb 2015 13:08:50 GMT krzywon [b7c9f7d] * src/sas/perspectives/calculator/media/data_operator_help.rst (modified) * src/sas/perspectives/calculator/media/density_calculator_help.rst (modified) * src/sas/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/perspectives/calculator/media/kiessig_calculator_help.rst (modified) * src/sas/perspectives/calculator/media/pycrust_example.bmp (deleted) * src/sas/perspectives/calculator/media/pycrust_example.png (added) * src/sas/perspectives/calculator/media/python_shell_help.rst (modified) * src/sas/perspectives/calculator/media/resolution_calculator_help.rst (modified) * src/sas/guiframe/local_perspectives/plotting/slicerpanel.py (modified) Merge branch 'master' of https://github.com/SasView/sasview/ Thu, 19 Feb 2015 13:08:44 GMT krzywon [27ab091] * src/sas/guiframe/local_perspectives/plotting/slicerpanel.py (modified) Fixed the issue outlined in trac ticket #349. The box sum panel did not ... Thu, 19 Feb 2015 11:27:22 GMT smk78 [bc9a0e1] * src/sas/perspectives/calculator/media/resolution_calculator_help.rst (modified) Proof read. Thu, 19 Feb 2015 11:26:49 GMT smk78 [60e1a73] * src/sas/perspectives/calculator/media/pycrust_example.bmp (deleted) * src/sas/perspectives/calculator/media/pycrust_example.png (added) pycrust_example.bmp replaced by more up-to-date example in ... Thu, 19 Feb 2015 11:25:37 GMT smk78 [77a9ddc] * src/sas/perspectives/calculator/media/python_shell_help.rst (modified) Proof read. Thu, 19 Feb 2015 11:24:27 GMT smk78 [cbae5a2] * src/sas/perspectives/calculator/media/density_calculator_help.rst (modified) Minor formatting change. Thu, 19 Feb 2015 11:23:45 GMT smk78 [7829bb7] * sasview/local_config.py (modified) * src/sas/guiframe/acknowledgebox.py (added) * src/sas/guiframe/config.py (modified) * src/sas/guiframe/gui_manager.py (modified) * src/sas/perspectives/calculator/media/data_operator_help.rst (modified) * src/sas/perspectives/calculator/media/density_calculator_help.rst (modified) * src/sas/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/perspectives/calculator/media/kiessig_calculator_help.rst (modified) Merge branch 'master' of https://github.com/SasView/sasview.git Thu, 19 Feb 2015 09:09:00 GMT krzywon [83eff66] * src/sas/dataloader/data_info.py (modified) * src/sas/dataloader/loader.py (modified) * src/sas/dataloader/readers/associations.py (modified) * src/sas/dataloader/readers/defaults.json (modified) * src/sas/dataloader/readers/sesans_reader.py (added) * src/sas/guiframe/media/graph_help.rst (modified) * src/sas/guiframe/report_dialog.py (added) * src/sas/models/media/model_functions.rst (modified) * src/sas/perspectives/calculator/help_panel.py (deleted) * src/sas/perspectives/calculator/image_viewer.py (modified) * src/sas/perspectives/calculator/media/data_operator_help.rst (modified) * src/sas/perspectives/calculator/media/density_calculator_help.rst (modified) * src/sas/perspectives/fitting/basepage.py (modified) * src/sas/perspectives/fitting/report_dialog.py (modified) * src/sas/perspectives/invariant/report_dialog.py (modified) * sasview/local_config.py (modified) * src/sas/guiframe/acknowledgebox.py (added) * src/sas/guiframe/config.py (modified) * src/sas/guiframe/gui_manager.py (modified) Merge branch 'master' of https://github.com/SasView/sasview/ Thu, 19 Feb 2015 09:08:49 GMT krzywon [f53cd30] * sasview/local_config.py (modified) * src/sas/guiframe/acknowledgebox.py (added) * src/sas/guiframe/config.py (modified) * src/sas/guiframe/gui_manager.py (modified) Created and implemented an acknowledgement window that can be accessed ... Thu, 19 Feb 2015 08:55:15 GMT smk78 [17e1f14] * src/sas/dataloader/data_info.py (modified) * src/sas/dataloader/loader.py (modified) * src/sas/dataloader/readers/associations.py (modified) * src/sas/dataloader/readers/defaults.json (modified) * src/sas/dataloader/readers/sesans_reader.py (added) * src/sas/guiframe/report_dialog.py (added) * src/sas/perspectives/calculator/help_panel.py (deleted) * src/sas/perspectives/calculator/image_viewer.py (modified) * src/sas/perspectives/fitting/basepage.py (modified) * src/sas/perspectives/fitting/report_dialog.py (modified) * src/sas/perspectives/invariant/report_dialog.py (modified) * src/sas/perspectives/calculator/media/data_operator_help.rst (modified) * src/sas/perspectives/calculator/media/density_calculator_help.rst (modified) * src/sas/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/perspectives/calculator/media/kiessig_calculator_help.rst (modified) Merge branch 'master' of https://github.com/SasView/sasview.git Wed, 18 Feb 2015 22:32:58 GMT jhbakker [5e326a6] * src/sas/dataloader/data_info.py (modified) * src/sas/dataloader/loader.py (modified) * src/sas/dataloader/readers/associations.py (modified) * src/sas/dataloader/readers/defaults.json (modified) * src/sas/dataloader/readers/sesans_reader.py (added) added sesans_reader for SESANS analysis Wed, 18 Feb 2015 22:13:56 GMT butler [cbe8c5c] * src/sas/perspectives/calculator/help_panel.py (deleted) Remove help_panel.py from sas/perspective/calculator package Wed, 18 Feb 2015 22:10:32 GMT butler [d90f91b] * src/sas/perspectives/calculator/image_viewer.py (modified) Fix Image Viewer Help to point to new documentation. I believe this is ... Wed, 18 Feb 2015 21:53:13 GMT smk78 [36819ee] * src/sas/perspectives/calculator/media/density_calculator_help.rst (modified) Proof read. Wed, 18 Feb 2015 21:51:32 GMT smk78 [1e01486] * src/sas/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/perspectives/calculator/media/kiessig_calculator_help.rst (modified) Proof read. Wed, 18 Feb 2015 21:50:18 GMT smk78 [ad4d8b4] * src/sas/perspectives/calculator/media/data_operator_help.rst (modified) Fixed problem with Sphinx interpreting specified operands by adding \ ... Wed, 18 Feb 2015 20:46:23 GMT butler [7d32aaf] * build_tools/conda/pyopencl/meta.yaml (modified) * src/sas/guiframe/media/data_explorer_help.rst (modified) * src/sas/guiframe/media/data_formats_help.rst (modified) * src/sas/guiframe/media/graph_help.rst (modified) * src/sas/guiframe/report_dialog.py (added) * src/sas/models/media/model_functions.rst (modified) * src/sas/perspectives/calculator/image_viewer.py (modified) * src/sas/perspectives/calculator/media/data_operator_help.rst (modified) * src/sas/perspectives/calculator/media/density_calculator_help.rst (modified) * src/sas/perspectives/fitting/batchfitpage.py (modified) * src/sas/perspectives/fitting/fitpanel.py (modified) * src/sas/perspectives/fitting/report_dialog.py (modified) * src/sas/perspectives/invariant/report_dialog.py (modified) * src/sas/perspectives/fitting/basepage.py (modified) Merge branch 'master' of https://github.com/SasView/sasview.git Wed, 18 Feb 2015 20:45:37 GMT butler [c1694f8] * src/sas/perspectives/fitting/basepage.py (modified) Moved the rest of basepage help to the new method. Basically MODELS 1) ... Wed, 18 Feb 2015 20:20:54 GMT Mathieu Doucet [e8bb5b6] * src/sas/guiframe/report_dialog.py (added) * src/sas/perspectives/fitting/report_dialog.py (modified) * src/sas/perspectives/invariant/report_dialog.py (modified) Re #336 Move common report code to guiframe. Wed, 18 Feb 2015 18:12:34 GMT smk78 [054a3ad] * src/sas/perspectives/calculator/media/density_calculator_help.rst (modified) Proof read. Wed, 18 Feb 2015 18:01:27 GMT smk78 [7072ce6] * src/sas/models/media/model_functions.rst (modified) Added placeholder documantation for Miguels new MicelleSphCoreModel. Wed, 18 Feb 2015 17:38:51 GMT smk78 [684fade] * src/sas/perspectives/calculator/media/data_operator_help.rst (modified) Proof read. Wed, 18 Feb 2015 17:38:20 GMT smk78 [fb07044d] * src/sas/models/media/model_functions.rst (modified) Added note Wed, 18 Feb 2015 17:37:44 GMT smk78 [1394952] * src/sas/guiframe/media/graph_help.rst (modified) Fixed links to anchors in different .rst file (thank you Paul K). Wed, 18 Feb 2015 17:05:21 GMT Mathieu Doucet [eec63a8] * src/sas/perspectives/calculator/image_viewer.py (modified) Make sure OSX build can load images. Wed, 18 Feb 2015 17:01:35 GMT krzywon [e1251ef] * src/sas/guiframe/media/data_explorer_help.rst (modified) * src/sas/perspectives/fitting/batchfitpage.py (modified) * src/sas/perspectives/fitting/fitpanel.py (modified) Merge branch 'master' of https://github.com/SasView/sasview/ Wed, 18 Feb 2015 17:01:28 GMT krzywon [fa09d62] * src/sas/perspectives/fitting/batchfitpage.py (modified) * src/sas/perspectives/fitting/fitpanel.py (modified) Modified the batch fit panel to give a warning/message saying the file ... Wed, 18 Feb 2015 16:49:55 GMT smk78 [2bf5e3b] * src/sas/guiframe/media/data_explorer_help.rst (modified) Proof read. Wed, 18 Feb 2015 16:14:57 GMT smk78 [3fd3d5a4] * src/sas/guiframe/media/data_formats_help.rst (modified) * src/sas/guiframe/media/graph_help.rst (modified) Proof read. Wed, 18 Feb 2015 16:13:34 GMT smk78 [5c44f33] * build_tools/conda/README.md (modified) * build_tools/conda/altgraph/bld.bat (added) * build_tools/conda/altgraph/build.sh (added) * build_tools/conda/altgraph/meta.yaml (added) * build_tools/conda/macholib/bld.bat (added) * build_tools/conda/macholib/build.sh (added) * build_tools/conda/macholib/meta.yaml (added) * build_tools/conda/modulegraph/bld.bat (added) * build_tools/conda/modulegraph/build.sh (added) * build_tools/conda/modulegraph/meta.yaml (added) * build_tools/conda/py2app/bld.bat (added) * build_tools/conda/py2app/build.sh (added) * build_tools/conda/py2app/meta.yaml (added) * build_tools/conda/pyopencl/bld.bat (modified) * build_tools/conda/pyopencl/meta.yaml (modified) * sasview/setup_exe.py (modified) * src/sas/dataloader/manipulations.py (modified) * src/sas/dataloader/readers/ascii_reader.py (modified) * src/sas/fit/ScipyFitting.py (modified) * src/sas/guiframe/documentation_window.py (modified) * src/sas/guiframe/gui_manager.py (modified) * src/sas/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/perspectives/fitting/basepage.py (modified) * src/sas/perspectives/fitting/help_panel.py (deleted) * src/sas/perspectives/fitting/models.py (modified) * test/park_integration/test/utest_fit_cylinder.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * src/sas/models/media/model_functions.rst (modified) Merge branch 'master' of https://github.com/SasView/sasview.git Wed, 18 Feb 2015 15:03:23 GMT butler [ac85c4b] * build_tools/conda/altgraph/bld.bat (added) * build_tools/conda/altgraph/build.sh (added) * build_tools/conda/altgraph/meta.yaml (added) * build_tools/conda/macholib/bld.bat (added) * build_tools/conda/macholib/build.sh (added) * build_tools/conda/macholib/meta.yaml (added) * build_tools/conda/modulegraph/bld.bat (added) * build_tools/conda/modulegraph/build.sh (added) * build_tools/conda/modulegraph/meta.yaml (added) * build_tools/conda/py2app/bld.bat (added) * build_tools/conda/py2app/build.sh (added) * build_tools/conda/py2app/meta.yaml (added) * sasview/setup_exe.py (modified) * src/sas/fit/ScipyFitting.py (modified) * src/sas/guiframe/documentation_window.py (modified) * src/sas/perspectives/fitting/models.py (modified) * test/park_integration/test/utest_fit_cylinder.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * src/sas/perspectives/fitting/basepage.py (modified) * src/sas/perspectives/fitting/help_panel.py (deleted) Merge branch 'master' of https://github.com/SasView/sasview.git Wed, 18 Feb 2015 15:02:52 GMT butler [82221a9e] * src/sas/perspectives/fitting/help_panel.py (deleted) remove the help_panel.py from perspective/fitting as I think now all ... Wed, 18 Feb 2015 14:49:10 GMT butler [4380c03] * src/sas/perspectives/fitting/basepage.py (modified) magnetic angles help now points to new documentation Wed, 18 Feb 2015 13:52:57 GMT krzywon [5160609] * build_tools/conda/py2app/bld.bat (added) * build_tools/conda/py2app/build.sh (added) * build_tools/conda/py2app/meta.yaml (added) * sasview/setup_exe.py (modified) * src/sas/guiframe/documentation_window.py (modified) * src/sas/guiframe/gui_manager.py (modified) * src/sas/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/perspectives/fitting/basepage.py (modified) * src/sas/perspectives/fitting/models.py (modified) * src/sas/fit/ScipyFitting.py (modified) * test/park_integration/test/utest_fit_cylinder.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) Merge branch 'master' of https://github.com/SasView/sasview/ Wed, 18 Feb 2015 13:52:50 GMT krzywon [a10364b] * src/sas/fit/ScipyFitting.py (modified) * test/park_integration/test/utest_fit_cylinder.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) Found the issue with the failing tests in ScipyFitting and fixed the ... Wed, 18 Feb 2015 13:12:45 GMT Peter Parker [573e7034] * sasview/setup_exe.py (modified) * src/sas/dataloader/manipulations.py (modified) * src/sas/dataloader/readers/ascii_reader.py (modified) * src/sas/guiframe/documentation_window.py (modified) * src/sas/guiframe/gui_manager.py (modified) * src/sas/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/perspectives/fitting/basepage.py (modified) * src/sas/perspectives/fitting/models.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) Merge branch 'master' of github.com:SasView/sasview Wed, 18 Feb 2015 13:12:03 GMT Peter Parker [9afc543] * src/sas/guiframe/documentation_window.py (modified) Allow the docs to reachable from inside the installer. Wed, 18 Feb 2015 13:05:14 GMT ajj [1ee0772] * src/sas/perspectives/fitting/models.py (modified) * sasview/setup_exe.py (modified) * src/sas/guiframe/documentation_window.py (modified) * src/sas/guiframe/gui_manager.py (modified) * src/sas/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/perspectives/fitting/basepage.py (modified) Merge pull request #2 from SasView/sasmodels-integration adding ... Wed, 18 Feb 2015 13:03:38 GMT ajj [6f82ba1] * src/sas/perspectives/fitting/models.py (modified) adding try-except to prepare for removing models Wed, 18 Feb 2015 12:52:06 GMT smk78 [3342eb3] * src/sas/models/media/model_functions.rst (modified) Description of 2.1.30. LamellarFFHGModel updated to say that the total ... Wed, 18 Feb 2015 11:38:46 GMT butler [69032d4] * src/sas/guiframe/documentation_window.py (modified) fixed overide of "title" parameter Wed, 18 Feb 2015 11:33:17 GMT butler [4547688] * build_tools/conda/README.md (modified) * build_tools/conda/pyopencl/bld.bat (modified) * sasview/setup_exe.py (modified) * src/sas/dataloader/manipulations.py (modified) * src/sas/dataloader/readers/ascii_reader.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * src/sas/guiframe/gui_manager.py (modified) * src/sas/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/perspectives/fitting/basepage.py (modified) Merge branch 'master' of https://github.com/SasView/sasview.git Wed, 18 Feb 2015 11:32:15 GMT butler [0d9401e] * src/sas/perspectives/fitting/basepage.py (modified) Removed a chunck of obsolete code starting at line 1863 The code had ... Wed, 18 Feb 2015 11:27:19 GMT butler [74f6c7e] * src/sas/perspectives/fitting/basepage.py (modified) Update basepage so that polydispersity help now pulls from the new ... Wed, 18 Feb 2015 10:31:30 GMT krzywon [53df2ea] * build_tools/conda/README.md (modified) * build_tools/conda/pyopencl/bld.bat (modified) * sasview/setup_exe.py (modified) * src/sas/models/media/list-of-links.txt (added) * src/sas/dataloader/manipulations.py (modified) * src/sas/dataloader/readers/ascii_reader.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) Merge branch 'master' of https://github.com/SasView/sasview/ Wed, 18 Feb 2015 10:30:22 GMT krzywon [ddc192a] * src/sas/dataloader/manipulations.py (modified) Fixed an indentation issue with the sector averaging function within the ... Wed, 18 Feb 2015 10:28:13 GMT krzywon [ef3445e2] * src/sas/dataloader/readers/ascii_reader.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) Fixed the failing test associated with data loading and sector averaging ... Wed, 18 Feb 2015 10:22:20 GMT butler [e4d4de2] * src/sas/models/media/list-of-links.txt (added) * src/sas/guiframe/gui_manager.py (modified) * src/sas/guiframe/local_perspectives/data_loader/data_loader.py (modified) Merge branch 'master' of https://github.com/SasView/sasview.git Wed, 18 Feb 2015 10:13:25 GMT smk78 [c4c3ec3] * src/sas/models/media/list-of-links.txt (added) List of anchor names extracted from model_functions.rst for Paul to use. Wed, 18 Feb 2015 08:35:24 GMT butler [00323d6] * docs/sphinx-docs/source/user/user.rst (modified) * src/sas/guiframe/media/data_explorer_help.rst (modified) * src/sas/guiframe/media/data_formats_help.rst (added) * src/sas/models/media/model_functions.rst (modified) * src/sas/perspectives/fitting/basepage.py (modified) * src/sas/perspectives/fitting/pagestate.py (modified) * src/sas/perspectives/invariant/invariant_panel.py (modified) * src/sas/guiframe/gui_manager.py (modified) * src/sas/guiframe/local_perspectives/data_loader/data_loader.py (modified) Merge branch 'master' of https://github.com/SasView/sasview.git Tue, 17 Feb 2015 22:14:54 GMT Mathieu Doucet [d838715] * src/sas/perspectives/fitting/pagestate.py (modified) * src/sas/perspectives/invariant/invariant_panel.py (modified) The report dialog can't be modal if the print preview is to be used. Tue, 17 Feb 2015 18:47:05 GMT Mathieu Doucet [6e653582] * src/sas/perspectives/fitting/basepage.py (modified) Minor tweak to avoid annoying popup. Tue, 17 Feb 2015 17:02:05 GMT smk78 [c147870] * src/sas/guiframe/media/data_explorer_help.rst (modified) Text proof read. Tue, 17 Feb 2015 17:00:41 GMT smk78 [3d29cab0] * check_packages.py (modified) * sasview/setup_exe.py (modified) * src/sas/guiframe/gui_manager.py (modified) * src/sas/perspectives/fitting/report_dialog.py (modified) * src/sas/perspectives/invariant/report_dialog.py (modified) * docs/sphinx-docs/source/user/user.rst (modified) * src/sas/guiframe/media/data_formats_help.rst (added) * src/sas/models/media/model_functions.rst (modified) Merge branch 'master' of https://github.com/SasView/sasview.git Tue, 17 Feb 2015 16:48:47 GMT butler [707c6be] * check_packages.py (modified) * sasview/installer.iss (modified) * sasview/setup_exe.py (modified) * setup.py (modified) * src/sas/guiframe/gui_manager.py (modified) * src/sas/perspectives/fitting/report_dialog.py (modified) * src/sas/perspectives/invariant/report_dialog.py (modified) * src/sas/guiframe/local_perspectives/data_loader/data_loader.py (modified) Merge branch 'master' of https://github.com/SasView/sasview.git Tue, 17 Feb 2015 16:48:27 GMT butler [8729965] * src/sas/guiframe/gui_manager.py (modified) * src/sas/guiframe/local_perspectives/data_loader/data_loader.py (modified) Removed print statment and started work on dataloader help Tue, 17 Feb 2015 16:34:00 GMT smk78 [6f10243] * src/sas/guiframe/media/data_formats_help.rst (modified) Minor format change Tue, 17 Feb 2015 16:30:24 GMT Mathieu Doucet [4d5c42f] * src/sas/guiframe/gui_manager.py (modified) Move tutorial display to xhtml2pdf Tue, 17 Feb 2015 16:22:47 GMT smk78 [2b7d102] * docs/sphinx-docs/source/user/user.rst (modified) * src/sas/guiframe/media/data_formats_help.rst (added) Sphinx toctree updated to include new help item: Data Formats Tue, 17 Feb 2015 15:49:39 GMT Mathieu Doucet [e843a1c] * build.txt (added) * docs/README-BUILD-TIPS.TXT (moved) * docs/pre-sphinx-docs/Graph_help_v0.html (moved) * docs/pre-sphinx-docs/NIST_IGOR_SANS_Model_Docs_v4.10.pdf (moved) * docs/pre-sphinx-docs/README-OLD-DOCS.TXT (added) * docs/pre-sphinx-docs/averaging_help_v0.html (moved) * docs/pre-sphinx-docs/batch_help_v0.html (moved) * docs/pre-sphinx-docs/category_manager_help_v0.html (moved) * docs/pre-sphinx-docs/change_scale_help_v0.html (moved) * docs/pre-sphinx-docs/data_explorer_help_v0.html (moved) * docs/pre-sphinx-docs/data_operator_help_v0.html (moved) * docs/pre-sphinx-docs/density_calculator_help_v0.html (moved) * docs/pre-sphinx-docs/fitting_key_help_v0.html (moved) * docs/pre-sphinx-docs/glossaryhelp_v0.html (moved) * docs/pre-sphinx-docs/graph_key_help_v0.html (moved) * docs/pre-sphinx-docs/help_v0.html (moved) * docs/pre-sphinx-docs/invariant_help_v0.html (moved) * docs/pre-sphinx-docs/kiessig_calculator_help_v0.html (moved) * docs/pre-sphinx-docs/load_data_help_v0.html (moved) * docs/pre-sphinx-docs/load_image_help_v0.html (moved) * docs/pre-sphinx-docs/model_documentation.docx (moved) * docs/pre-sphinx-docs/model_editor_help_v0.html (moved) * docs/pre-sphinx-docs/model_use_help_v0.html (moved) * docs/pre-sphinx-docs/pd_help_v0.html (moved) * docs/pre-sphinx-docs/polar_mag_help_v0.html (moved) * docs/pre-sphinx-docs/pycrust_help_v0.html (moved) * docs/pre-sphinx-docs/report_template_v0.html (added) * docs/pre-sphinx-docs/resolution_calculator_help_v0.html (moved) * docs/pre-sphinx-docs/simultaneous_fit_help_v0.html (moved) * docs/pre-sphinx-docs/single_fit_help_v0.html (moved) * docs/pre-sphinx-docs/sld_calculator_help_v0.html (moved) * docs/pre-sphinx-docs/slit_calculator_help_v0.html (moved) * docs/pre-sphinx-docs/smear_computation_v0.html (moved) * docs/pre-sphinx-docs/status_bar_help_v0.html (moved) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/source/user/user.rst (modified) * install.txt (added) * src/sas/calculator/media/density_calculator_help.rst (deleted) * src/sas/calculator/media/kiessig_calculator_help.rst (deleted) * src/sas/calculator/media/resolution_calculator_help.rst (deleted) * src/sas/calculator/media/sas_calculator_help.rst (deleted) * src/sas/calculator/media/sld_calculator.rst (deleted) * src/sas/calculator/media/slit_calculator_help.rst (deleted) * src/sas/data_util/media/data_operator_help.rst (deleted) * src/sas/dataloader/data_info.py (modified) * src/sas/dataloader/manipulations.py (modified) * src/sas/fit/media/fitting_help.rst (deleted) * src/sas/guiframe/documentation_window.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/plotting/AnnulusSlicer.py (modified) * src/sas/guiframe/media/data_explorer_help.rst (modified) * src/sas/guiframe/media/graph_help.rst (modified) * src/sas/invariant/media/invariant_help.rst (deleted) * src/sas/invariant/media/pr_help.rst (deleted) * src/sas/models/media/model_functions.rst (modified) * src/sas/models/media/readme.txt (deleted) * src/sas/perspectives/calculator/data_editor.py (modified) * src/sas/perspectives/calculator/media/data_operator_help.rst (added) * src/sas/perspectives/calculator/media/density_calculator_help.rst (added) * src/sas/perspectives/calculator/media/image_viewer_help.rst (added) * src/sas/perspectives/calculator/media/kiessig_calculator_help.rst (added) * src/sas/perspectives/calculator/media/python_shell_help.rst (added) * src/sas/perspectives/calculator/media/resolution_calculator_help.rst (added) * src/sas/perspectives/calculator/media/sas_calculator_help.rst (added) * src/sas/perspectives/calculator/media/sld_calculator_help.rst (added) * src/sas/perspectives/calculator/media/slit_calculator_help.rst (added) * src/sas/perspectives/fitting/media/M_angles_pic.bmp (added) * src/sas/perspectives/fitting/media/dm_eq.gif (added) * src/sas/perspectives/fitting/media/fitting_help.html (added) * src/sas/perspectives/fitting/media/fitting_help.rst (added) * src/sas/perspectives/fitting/media/m0x_eq.gif (added) * src/sas/perspectives/fitting/media/m0y_eq.gif (added) * src/sas/perspectives/fitting/media/m0z_eq.gif (added) * src/sas/perspectives/fitting/media/mag_vector.bmp (added) * src/sas/perspectives/fitting/media/mqx.gif (added) * src/sas/perspectives/fitting/media/mqy.gif (added) * src/sas/perspectives/fitting/media/mxp.gif (added) * src/sas/perspectives/fitting/media/myp.gif (added) * src/sas/perspectives/fitting/media/mzp.gif (added) * src/sas/perspectives/fitting/media/pd_image001.png (added) * src/sas/perspectives/fitting/media/pd_image002.png (added) * src/sas/perspectives/fitting/media/pd_image003.png (added) * src/sas/perspectives/fitting/media/pd_image004.jpg (added) * src/sas/perspectives/fitting/media/pd_image005.png (added) * src/sas/perspectives/fitting/media/pd_image006.jpg (added) * src/sas/perspectives/fitting/media/pd_image007.png (added) * src/sas/perspectives/fitting/media/pd_image008.png (added) * src/sas/perspectives/fitting/media/pd_image009.png (added) * src/sas/perspectives/fitting/media/pd_image010.jpg (added) * src/sas/perspectives/fitting/media/pd_image011.png (added) * src/sas/perspectives/fitting/media/pd_image012.png (added) * src/sas/perspectives/fitting/media/pd_image013.jpg (added) * src/sas/perspectives/fitting/media/sld1.gif (added) * src/sas/perspectives/fitting/media/sld2.gif (added) * src/sas/perspectives/fitting/media/sm_image002.gif (added) * src/sas/perspectives/fitting/media/sm_image003.gif (added) * src/sas/perspectives/fitting/media/sm_image004.gif (added) * src/sas/perspectives/fitting/media/sm_image005.gif (added) * src/sas/perspectives/fitting/media/sm_image006.gif (added) * src/sas/perspectives/fitting/media/sm_image007.gif (added) * src/sas/perspectives/fitting/media/sm_image008.gif (added) * src/sas/perspectives/fitting/media/sm_image009.gif (added) * src/sas/perspectives/fitting/media/sm_image010.gif (added) * src/sas/perspectives/fitting/media/sm_image011.gif (added) * src/sas/perspectives/fitting/media/sm_image012.gif (added) * src/sas/perspectives/fitting/media/sm_image013.gif (added) * src/sas/perspectives/fitting/media/sm_image016.gif (added) * src/sas/perspectives/fitting/media/sm_image017.gif (added) * src/sas/perspectives/fitting/media/sm_image018.gif (added) * src/sas/perspectives/fitting/media/sm_image019.gif (added) * src/sas/perspectives/fitting/media/sm_image020.gif (added) * src/sas/perspectives/fitting/media/sm_image021.gif (added) * src/sas/perspectives/fitting/media/sm_image022.gif (added) * src/sas/perspectives/fitting/media/sm_image023.gif (added) * src/sas/perspectives/fitting/media/sm_image024.gif (added) * src/sas/perspectives/fitting/media/sm_image025.gif (added) * src/sas/perspectives/fitting/media/sm_image026.gif (added) * src/sas/perspectives/fitting/media/sm_image027.gif (added) * src/sas/perspectives/fitting/media/sm_image028.gif (added) * src/sas/perspectives/invariant/media/invariant_help.rst (added) * src/sas/perspectives/invariant/media/report_template.html (modified) * src/sas/perspectives/pr/media/pr_help.rst (added) * test/pr_inversion/test/test_output.txt (added) * test/sasdataloader/test/isis_1_0_write_test.xml (added) * test/sasdataloader/test/isis_1_1_write_test.xml (added) * test/sasdataloader/test/ring_testdata.txt (modified) * test/sasdataloader/test/write_test.xml (added) * src/sas/perspectives/fitting/report_dialog.py (modified) * src/sas/perspectives/invariant/report_dialog.py (modified) Merge branch 'master' of https://github.com/SasView/sasview into ... Tue, 17 Feb 2015 15:45:44 GMT Mathieu Doucet [4ec242e] * src/sas/perspectives/fitting/report_dialog.py (modified) * src/sas/perspectives/invariant/report_dialog.py (modified) Move report_dialog.py files to xhtml2pdf Tue, 17 Feb 2015 15:17:30 GMT smk78 [4f1791e] * src/sans/models/BCCrystalModel.py (deleted) * src/sans/models/BarBellModel.py (deleted) * src/sans/models/BinaryHSModel.py (deleted) * src/sans/models/CSParallelepipedModel.py (deleted) * src/sans/models/CappedCylinderModel.py (deleted) * src/sans/models/Core2ndMomentModel.py (deleted) * src/sans/models/CoreFourShellModel.py (deleted) * src/sans/models/CoreShellBicelleModel.py (deleted) * src/sans/models/CoreShellCylinderModel.py (deleted) * src/sans/models/CoreShellEllipsoidModel.py (deleted) * src/sans/models/CoreShellEllipsoidXTModel.py (deleted) * src/sans/models/CoreShellModel.py (deleted) * src/sans/models/CylinderModel.py (deleted) * src/sans/models/DABModel.py (deleted) * src/sans/models/DiamCylFunc.py (deleted) * src/sans/models/DiamEllipFunc.py (deleted) * src/sans/models/EllipsoidModel.py (deleted) * src/sans/models/EllipticalCylinderModel.py (deleted) * src/sans/models/FCCrystalModel.py (deleted) * src/sans/models/FlexCylEllipXModel.py (deleted) * src/sans/models/FlexibleCylinderModel.py (deleted) * src/sans/models/FractalModel.py (deleted) * src/sans/models/FractalO_Z.py (deleted) * src/sans/models/FuzzySphereModel.py (deleted) * src/sans/models/Gaussian.py (deleted) * src/sans/models/GelFitModel.py (deleted) * src/sans/models/HardsphereStructure.py (deleted) * src/sans/models/HayterMSAStructure.py (deleted) * src/sans/models/HollowCylinderModel.py (deleted) * src/sans/models/LamellarFFHGModel.py (deleted) * src/sans/models/LamellarModel.py (deleted) * src/sans/models/LamellarPCrystalModel.py (deleted) * src/sans/models/LamellarPSHGModel.py (deleted) * src/sans/models/LamellarPSModel.py (deleted) * src/sans/models/LinearPearlsModel.py (deleted) * src/sans/models/LogNormal.py (deleted) * src/sans/models/Lorentzian.py (deleted) * src/sans/models/MassFractalModel.py (deleted) * src/sans/models/MassSurfaceFractal.py (deleted) * src/sans/models/MicelleSphCoreModel.py (deleted) * src/sans/models/MultiShellModel.py (deleted) * src/sans/models/OnionModel.py (deleted) * src/sans/models/ParallelepipedModel.py (deleted) * src/sans/models/PearlNecklaceModel.py (deleted) * src/sans/models/Poly_GaussCoil.py (deleted) * src/sans/models/PringlesModel.py (deleted) * src/sans/models/RPAModel.py (deleted) * src/sans/models/RaspBerryModel.py (deleted) * src/sans/models/RectangularHollowPrismInfThinWallsModel.py (deleted) * src/sans/models/RectangularHollowPrismModel.py (deleted) * src/sans/models/RectangularPrismModel.py (deleted) * src/sans/models/ReflAdvModel.py (deleted) * src/sans/models/ReflModel.py (deleted) * src/sans/models/SCCrystalModel.py (deleted) * src/sans/models/SLDCalFunc.py (deleted) * src/sans/models/Schulz.py (deleted) * src/sans/models/SchulzHuber.py (deleted) * src/sans/models/SphereModel.py (deleted) * src/sans/models/SphereSLDModel.py (deleted) * src/sans/models/SquareWellStructure.py (deleted) * src/sans/models/StackedDisksModel.py (deleted) * src/sans/models/StarPolymer.py (deleted) * src/sans/models/StickyHSStructure.py (deleted) * src/sans/models/SurfaceFractalModel.py (deleted) * src/sans/models/TeubnerStreyModel.py (deleted) * src/sans/models/TriaxialEllipsoidModel.py (deleted) * src/sans/models/TwoYukawaModel.py (deleted) * src/sans/models/VesicleModel.py (deleted) * src/sans/models/c_extension/c_models/c_models.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CBCCrystalModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CBarBellModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CBinaryHSModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CCSParallelepipedModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CCappedCylinderModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CCore2ndMomentModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CCoreFourShellModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CCoreShellBicelleModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CCoreShellCylinderModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CCoreShellEllipsoidModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CCoreShellEllipsoidXTModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CCoreShellModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CCylinderModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CDABModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CDiamCylFunc.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CDiamEllipFunc.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CEllipsoidModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CEllipticalCylinderModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CFCCrystalModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CFlexCylEllipXModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CFlexibleCylinderModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CFractalModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CFractalO_Z.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CFuzzySphereModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CGaussian.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CGelFitModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CHardsphereStructure.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CHayterMSAStructure.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CHollowCylinderModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CLamellarFFHGModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CLamellarModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CLamellarPCrystalModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CLamellarPSHGModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CLamellarPSModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CLinearPearlsModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CLogNormal.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CLorentzian.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CMassFractalModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CMassSurfaceFractal.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CMicelleSphCoreModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CMultiShellModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/COnionModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CParallelepipedModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CPearlNecklaceModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CPoly_GaussCoil.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CPringlesModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CRPAModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CRaspBerryModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CRectangularHollowPrismInfThinWallsModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CRectangularHollowPrismModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CRectangularPrismModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CReflAdvModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CReflModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CSCCrystalModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CSLDCalFunc.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CSchulz.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CSphereModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CSphereSLDModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CSquareWellStructure.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CStackedDisksModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CStarPolymer.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CStickyHSStructure.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CSurfaceFractalModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CTeubnerStreyModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CTriaxialEllipsoidModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CTwoYukawaModel.cpp (deleted) * src/sans/models/c_extension/python_wrapper/generated/CVesicleModel.cpp (deleted) * src/sas/guiframe/documentation_window.py (modified) * src/sas/guiframe/gui_manager.py (modified) * src/sas/models/media/model_functions.rst (modified) Merge branch 'master' of https://github.com/SasView/sasview.git Tue, 17 Feb 2015 15:16:51 GMT smk78 [cd06a5f] * src/sas/models/media/model_functions.rst (modified) Change to top level menu formatting Tue, 17 Feb 2015 15:09:40 GMT butler [0c4bca6] * build.txt (added) * docs/README-BUILD-TIPS.TXT (moved) * docs/pre-sphinx-docs/Graph_help_v0.html (moved) * docs/pre-sphinx-docs/NIST_IGOR_SANS_Model_Docs_v4.10.pdf (moved) * docs/pre-sphinx-docs/README-OLD-DOCS.TXT (added) * docs/pre-sphinx-docs/averaging_help_v0.html (moved) * docs/pre-sphinx-docs/batch_help_v0.html (moved) * docs/pre-sphinx-docs/category_manager_help_v0.html (moved) * docs/pre-sphinx-docs/change_scale_help_v0.html (moved) * docs/pre-sphinx-docs/data_explorer_help_v0.html (moved) * docs/pre-sphinx-docs/data_operator_help_v0.html (moved) * docs/pre-sphinx-docs/density_calculator_help_v0.html (moved) * docs/pre-sphinx-docs/fitting_key_help_v0.html (moved) * docs/pre-sphinx-docs/glossaryhelp_v0.html (moved) * docs/pre-sphinx-docs/graph_key_help_v0.html (moved) * docs/pre-sphinx-docs/help_v0.html (moved) * docs/pre-sphinx-docs/invariant_help_v0.html (moved) * docs/pre-sphinx-docs/kiessig_calculator_help_v0.html (moved) * docs/pre-sphinx-docs/load_data_help_v0.html (moved) * docs/pre-sphinx-docs/load_image_help_v0.html (moved) * docs/pre-sphinx-docs/model_documentation.docx (moved) * docs/pre-sphinx-docs/model_editor_help_v0.html (moved) * docs/pre-sphinx-docs/model_use_help_v0.html (moved) * docs/pre-sphinx-docs/pd_help_v0.html (moved) * docs/pre-sphinx-docs/polar_mag_help_v0.html (moved) * docs/pre-sphinx-docs/pycrust_help_v0.html (moved) * docs/pre-sphinx-docs/report_template_v0.html (added) * docs/pre-sphinx-docs/resolution_calculator_help_v0.html (moved) * docs/pre-sphinx-docs/simultaneous_fit_help_v0.html (moved) * docs/pre-sphinx-docs/single_fit_help_v0.html (moved) * docs/pre-sphinx-docs/sld_calculator_help_v0.html (moved) * docs/pre-sphinx-docs/slit_calculator_help_v0.html (moved) * docs/pre-sphinx-docs/smear_computation_v0.html (moved) * docs/pre-sphinx-docs/status_bar_help_v0.html (moved) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/source/user/user.rst (modified) * install.txt (added) * setup.py (modified) * src/sas/calculator/media/density_calculator_help.rst (deleted) * src/sas/calculator/media/kiessig_calculator_help.rst (deleted) * src/sas/calculator/media/resolution_calculator_help.rst (deleted) * src/sas/calculator/media/sas_calculator_help.rst (deleted) * src/sas/calculator/media/sld_calculator.rst (deleted) * src/sas/calculator/media/slit_calculator_help.rst (deleted) * src/sas/data_util/media/data_operator_help.rst (deleted) * src/sas/dataloader/data_info.py (modified) * src/sas/dataloader/manipulations.py (modified) * src/sas/dataloader/readers/associations.py (modified) * src/sas/dataloader/readers/defaults.json (added) * src/sas/dataloader/readers/defaults.xml (deleted) * src/sas/fit/media/fitting_help.rst (deleted) * src/sas/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) * src/sas/guiframe/media/data_explorer_help.rst (modified) * src/sas/guiframe/media/graph_help.rst (modified) * src/sas/invariant/media/invariant_help.rst (deleted) * src/sas/invariant/media/pr_help.rst (deleted) * src/sas/models/c_extension/python_wrapper/modelTemplate.txt (modified) * src/sas/models/include/cylinder.h (modified) * src/sas/models/media/model_functions.rst (modified) * src/sas/models/media/readme.txt (deleted) * src/sas/perspectives/calculator/data_editor.py (modified) * src/sas/perspectives/calculator/media/data_operator_help.rst (added) * src/sas/perspectives/calculator/media/density_calculator_help.rst (added) * src/sas/perspectives/calculator/media/image_viewer_help.rst (added) * src/sas/perspectives/calculator/media/kiessig_calculator_help.rst (added) * src/sas/perspectives/calculator/media/python_shell_help.rst (added) * src/sas/perspectives/calculator/media/resolution_calculator_help.rst (added) * src/sas/perspectives/calculator/media/sas_calculator_help.rst (added) * src/sas/perspectives/calculator/media/sld_calculator_help.rst (added) * src/sas/perspectives/calculator/media/slit_calculator_help.rst (added) * src/sas/perspectives/fitting/fitpage.py (modified) * src/sas/perspectives/fitting/media/M_angles_pic.bmp (added) * src/sas/perspectives/fitting/media/dm_eq.gif (added) * src/sas/perspectives/fitting/media/fitting_help.html (added) * src/sas/perspectives/fitting/media/fitting_help.rst (added) * src/sas/perspectives/fitting/media/m0x_eq.gif (added) * src/sas/perspectives/fitting/media/m0y_eq.gif (added) * src/sas/perspectives/fitting/media/m0z_eq.gif (added) * src/sas/perspectives/fitting/media/mag_vector.bmp (added) * src/sas/perspectives/fitting/media/mqx.gif (added) * src/sas/perspectives/fitting/media/mqy.gif (added) * src/sas/perspectives/fitting/media/mxp.gif (added) * src/sas/perspectives/fitting/media/myp.gif (added) * src/sas/perspectives/fitting/media/mzp.gif (added) * src/sas/perspectives/fitting/media/pd_image001.png (added) * src/sas/perspectives/fitting/media/pd_image002.png (added) * src/sas/perspectives/fitting/media/pd_image003.png (added) * src/sas/perspectives/fitting/media/pd_image004.jpg (added) * src/sas/perspectives/fitting/media/pd_image005.png (added) * src/sas/perspectives/fitting/media/pd_image006.jpg (added) * src/sas/perspectives/fitting/media/pd_image007.png (added) * src/sas/perspectives/fitting/media/pd_image008.png (added) * src/sas/perspectives/fitting/media/pd_image009.png (added) * src/sas/perspectives/fitting/media/pd_image010.jpg (added) * src/sas/perspectives/fitting/media/pd_image011.png (added) * src/sas/perspectives/fitting/media/pd_image012.png (added) * src/sas/perspectives/fitting/media/pd_image013.jpg (added) * src/sas/perspectives/fitting/media/sld1.gif (added) * src/sas/perspectives/fitting/media/sld2.gif (added) * src/sas/perspectives/fitting/media/sm_image002.gif (added) * src/sas/perspectives/fitting/media/sm_image003.gif (added) * src/sas/perspectives/fitting/media/sm_image004.gif (added) * src/sas/perspectives/fitting/media/sm_image005.gif (added) * src/sas/perspectives/fitting/media/sm_image006.gif (added) * src/sas/perspectives/fitting/media/sm_image007.gif (added) * src/sas/perspectives/fitting/media/sm_image008.gif (added) * src/sas/perspectives/fitting/media/sm_image009.gif (added) * src/sas/perspectives/fitting/media/sm_image010.gif (added) * src/sas/perspectives/fitting/media/sm_image011.gif (added) * src/sas/perspectives/fitting/media/sm_image012.gif (added) * src/sas/perspectives/fitting/media/sm_image013.gif (added) * src/sas/perspectives/fitting/media/sm_image016.gif (added) * src/sas/perspectives/fitting/media/sm_image017.gif (added) * src/sas/perspectives/fitting/media/sm_image018.gif (added) * src/sas/perspectives/fitting/media/sm_image019.gif (added) * src/sas/perspectives/fitting/media/sm_image020.gif (added) * src/sas/perspectives/fitting/media/sm_image021.gif (added) * src/sas/perspectives/fitting/media/sm_image022.gif (added) * src/sas/perspectives/fitting/media/sm_image023.gif (added) * src/sas/perspectives/fitting/media/sm_image024.gif (added) * src/sas/perspectives/fitting/media/sm_image025.gif (added) * src/sas/perspectives/fitting/media/sm_image026.gif (added) * src/sas/perspectives/fitting/media/sm_image027.gif (added) * src/sas/perspectives/fitting/media/sm_image028.gif (added) * src/sas/perspectives/invariant/media/invariant_help.rst (added) * src/sas/perspectives/invariant/media/report_template.html (modified) * src/sas/perspectives/pr/media/pr_help.rst (added) * test/pr_inversion/test/test_output.txt (added) * test/sasdataloader/test/isis_1_0_write_test.xml (added) * test/sasdataloader/test/isis_1_1_write_test.xml (added) * test/sasdataloader/test/ring_testdata.txt (modified) * test/sasdataloader/test/write_test.xml (added) * src/sas/guiframe/documentation_window.py (modified) * src/sas/guiframe/gui_manager.py (modified) Merge branch 'master' of https://github.com/SasView/sasview.git Tue, 17 Feb 2015 15:01:09 GMT butler [a4340d1] * src/sas/guiframe/documentation_window.py (modified) * src/sas/guiframe/gui_manager.py (modified) Restructure the way the new help documentation gets displayed 1) Make ... Tue, 17 Feb 2015 14:13:57 GMT smk78 [54b9ad2] * docs/README.TXT (deleted) * docs/pre-sphinx-docs/Graph_help_v0.html (moved) * docs/pre-sphinx-docs/NIST_IGOR_SANS_Model_Docs_v4.10.pdf (moved) * docs/pre-sphinx-docs/averaging_help_v0.html (moved) * docs/pre-sphinx-docs/batch_help_v0.html (moved) * docs/pre-sphinx-docs/category_manager_help_v0.html (moved) * docs/pre-sphinx-docs/change_scale_help_v0.html (moved) * docs/pre-sphinx-docs/data_explorer_help_v0.html (moved) * docs/pre-sphinx-docs/data_operator_help_v0.html (moved) * docs/pre-sphinx-docs/density_calculator_help_v0.html (moved) * docs/pre-sphinx-docs/fitting_key_help_v0.html (moved) * docs/pre-sphinx-docs/glossaryhelp_v0.html (moved) * docs/pre-sphinx-docs/graph_key_help_v0.html (moved) * docs/pre-sphinx-docs/help_v0.html (moved) * docs/pre-sphinx-docs/invariant_help_v0.html (moved) * docs/pre-sphinx-docs/kiessig_calculator_help_v0.html (moved) * docs/pre-sphinx-docs/load_data_help_v0.html (moved) * docs/pre-sphinx-docs/load_image_help_v0.html (moved) * docs/pre-sphinx-docs/model_documentation.docx (moved) * docs/pre-sphinx-docs/model_editor_help_v0.html (moved) * docs/pre-sphinx-docs/model_use_help_v0.html (moved) * docs/pre-sphinx-docs/pd_help_v0.html (moved) * docs/pre-sphinx-docs/polar_mag_help_v0.html (moved) * docs/pre-sphinx-docs/pycrust_help_v0.html (moved) * docs/pre-sphinx-docs/report_template_v0.html (moved) * docs/pre-sphinx-docs/resolution_calculator_help_v0.html (moved) * docs/pre-sphinx-docs/simultaneous_fit_help_v0.html (moved) * docs/pre-sphinx-docs/single_fit_help_v0.html (moved) * docs/pre-sphinx-docs/sld_calculator_help_v0.html (moved) * docs/pre-sphinx-docs/slit_calculator_help_v0.html (moved) * docs/pre-sphinx-docs/smear_computation_v0.html (moved) * docs/pre-sphinx-docs/status_bar_help_v0.html (moved) * src/sas/models/media/readme.txt (deleted) All pre-Sphinx, pre-ReST (ie, html) help files now moved to ... Tue, 17 Feb 2015 13:45:34 GMT smk78 [5d63ea0] * build.txt (added) * install.txt (added) * src/sans/models/BCCrystalModel.py (added) * src/sans/models/BarBellModel.py (added) * src/sans/models/BinaryHSModel.py (added) * src/sans/models/CSParallelepipedModel.py (added) * src/sans/models/CappedCylinderModel.py (added) * src/sans/models/Core2ndMomentModel.py (added) * src/sans/models/CoreFourShellModel.py (added) * src/sans/models/CoreShellBicelleModel.py (added) * src/sans/models/CoreShellCylinderModel.py (added) * src/sans/models/CoreShellEllipsoidModel.py (added) * src/sans/models/CoreShellEllipsoidXTModel.py (added) * src/sans/models/CoreShellModel.py (added) * src/sans/models/CylinderModel.py (added) * src/sans/models/DABModel.py (added) * src/sans/models/DiamCylFunc.py (added) * src/sans/models/DiamEllipFunc.py (added) * src/sans/models/EllipsoidModel.py (added) * src/sans/models/EllipticalCylinderModel.py (added) * src/sans/models/FCCrystalModel.py (added) * src/sans/models/FlexCylEllipXModel.py (added) * src/sans/models/FlexibleCylinderModel.py (added) * src/sans/models/FractalModel.py (added) * src/sans/models/FractalO_Z.py (added) * src/sans/models/FuzzySphereModel.py (added) * src/sans/models/Gaussian.py (added) * src/sans/models/GelFitModel.py (added) * src/sans/models/HardsphereStructure.py (added) * src/sans/models/HayterMSAStructure.py (added) * src/sans/models/HollowCylinderModel.py (added) * src/sans/models/LamellarFFHGModel.py (added) * src/sans/models/LamellarModel.py (added) * src/sans/models/LamellarPCrystalModel.py (added) * src/sans/models/LamellarPSHGModel.py (added) * src/sans/models/LamellarPSModel.py (added) * src/sans/models/LinearPearlsModel.py (added) * src/sans/models/LogNormal.py (added) * src/sans/models/Lorentzian.py (added) * src/sans/models/MassFractalModel.py (added) * src/sans/models/MassSurfaceFractal.py (added) * src/sans/models/MicelleSphCoreModel.py (added) * src/sans/models/MultiShellModel.py (added) * src/sans/models/OnionModel.py (added) * src/sans/models/ParallelepipedModel.py (added) * src/sans/models/PearlNecklaceModel.py (added) * src/sans/models/Poly_GaussCoil.py (added) * src/sans/models/PringlesModel.py (added) * src/sans/models/RPAModel.py (added) * src/sans/models/RaspBerryModel.py (added) * src/sans/models/RectangularHollowPrismInfThinWallsModel.py (added) * src/sans/models/RectangularHollowPrismModel.py (added) * src/sans/models/RectangularPrismModel.py (added) * src/sans/models/ReflAdvModel.py (added) * src/sans/models/ReflModel.py (added) * src/sans/models/SCCrystalModel.py (added) * src/sans/models/SLDCalFunc.py (added) * src/sans/models/Schulz.py (added) * src/sans/models/SchulzHuber.py (added) * src/sans/models/SphereModel.py (added) * src/sans/models/SphereSLDModel.py (added) * src/sans/models/SquareWellStructure.py (added) * src/sans/models/StackedDisksModel.py (added) * src/sans/models/StarPolymer.py (added) * src/sans/models/StickyHSStructure.py (added) * src/sans/models/SurfaceFractalModel.py (added) * src/sans/models/TeubnerStreyModel.py (added) * src/sans/models/TriaxialEllipsoidModel.py (added) * src/sans/models/TwoYukawaModel.py (added) * src/sans/models/VesicleModel.py (added) * src/sans/models/c_extension/c_models/c_models.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CBCCrystalModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CBarBellModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CBinaryHSModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCSParallelepipedModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCappedCylinderModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCore2ndMomentModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCoreFourShellModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCoreShellBicelleModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCoreShellCylinderModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCoreShellEllipsoidModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCoreShellEllipsoidXTModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCoreShellModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCylinderModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CDABModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CDiamCylFunc.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CDiamEllipFunc.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CEllipsoidModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CEllipticalCylinderModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CFCCrystalModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CFlexCylEllipXModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CFlexibleCylinderModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CFractalModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CFractalO_Z.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CFuzzySphereModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CGaussian.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CGelFitModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CHardsphereStructure.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CHayterMSAStructure.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CHollowCylinderModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CLamellarFFHGModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CLamellarModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CLamellarPCrystalModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CLamellarPSHGModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CLamellarPSModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CLinearPearlsModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CLogNormal.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CLorentzian.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CMassFractalModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CMassSurfaceFractal.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CMicelleSphCoreModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CMultiShellModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/COnionModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CParallelepipedModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CPearlNecklaceModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CPoly_GaussCoil.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CPringlesModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CRPAModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CRaspBerryModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CRectangularHollowPrismInfThinWallsModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CRectangularHollowPrismModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CRectangularPrismModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CReflAdvModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CReflModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CSCCrystalModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CSLDCalFunc.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CSchulz.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CSphereModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CSphereSLDModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CSquareWellStructure.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CStackedDisksModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CStarPolymer.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CStickyHSStructure.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CSurfaceFractalModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CTeubnerStreyModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CTriaxialEllipsoidModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CTwoYukawaModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CVesicleModel.cpp (added) * src/sas/dataloader/data_info.py (modified) * src/sas/dataloader/manipulations.py (modified) * src/sas/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) * src/sas/perspectives/calculator/data_editor.py (modified) * test/pr_inversion/test/test_output.txt (added) * test/sasdataloader/test/isis_1_0_write_test.xml (added) * test/sasdataloader/test/isis_1_1_write_test.xml (added) * test/sasdataloader/test/ring_testdata.txt (modified) * test/sasdataloader/test/write_test.xml (added) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/source/user/user.rst (modified) * src/sas/calculator/media/density_calculator_help.rst (deleted) * src/sas/calculator/media/kiessig_calculator_help.rst (deleted) * src/sas/calculator/media/resolution_calculator_help.rst (deleted) * src/sas/calculator/media/sas_calculator_help.rst (deleted) * src/sas/calculator/media/sld_calculator.rst (deleted) * src/sas/calculator/media/slit_calculator_help.rst (deleted) * src/sas/data_util/media/data_operator_help.rst (deleted) * src/sas/fit/media/fitting_help.rst (deleted) * src/sas/guiframe/media/Graph_help_v0.html (moved) * src/sas/guiframe/media/averaging_help_v0.html (moved) * src/sas/guiframe/media/change_scale_help_v0.html (moved) * src/sas/guiframe/media/data_explorer_help.rst (modified) * src/sas/guiframe/media/data_explorer_help_v0.html (moved) * src/sas/guiframe/media/graph_help.rst (modified) * src/sas/guiframe/media/key_help_v0.html (moved) * src/sas/invariant/media/invariant_help.rst (deleted) * src/sas/invariant/media/pr_help.rst (deleted) * src/sas/models/media/model_functions.rst (modified) * src/sas/models/media/pd_help_v0.html (moved) * src/sas/models/media/polar_mag_help_v0.html (moved) * src/sas/models/media/smear_computation_v0.html (moved) * src/sas/perspectives/calculator/media/data_operator_help.rst (added) * src/sas/perspectives/calculator/media/data_operator_help_v0.html (moved) * src/sas/perspectives/calculator/media/density_calculator_help.rst (added) * src/sas/perspectives/calculator/media/density_calculator_help_v0.html (moved) * src/sas/perspectives/calculator/media/image_viewer_help.rst (added) * src/sas/perspectives/calculator/media/kiessig_calculator_help.rst (added) * src/sas/perspectives/calculator/media/kiessig_calculator_help_v0.html (moved) * src/sas/perspectives/calculator/media/load_image_help_v0.html (moved) * src/sas/perspectives/calculator/media/pycrust_help_v0.html (moved) * src/sas/perspectives/calculator/media/python_shell_help.rst (added) * src/sas/perspectives/calculator/media/resolution_calculator_help.rst (added) * src/sas/perspectives/calculator/media/resolution_calculator_help_v0.html (moved) * src/sas/perspectives/calculator/media/sas_calculator_help.rst (added) * src/sas/perspectives/calculator/media/sld_calculator_help.rst (added) * src/sas/perspectives/calculator/media/sld_calculator_help_v0.html (moved) * src/sas/perspectives/calculator/media/slit_calculator_help.rst (added) * src/sas/perspectives/calculator/media/slit_calculator_help_v0.html (moved) * src/sas/perspectives/fitting/media/M_angles_pic.bmp (added) * src/sas/perspectives/fitting/media/batch_help_v0.html (moved) * src/sas/perspectives/fitting/media/category_manager_help_v0.html (moved) * src/sas/perspectives/fitting/media/dm_eq.gif (added) * src/sas/perspectives/fitting/media/fitting_help.html (added) * src/sas/perspectives/fitting/media/fitting_help.rst (added) * src/sas/perspectives/fitting/media/glossaryhelp_v0.html (moved) * src/sas/perspectives/fitting/media/help_v0.html (moved) * src/sas/perspectives/fitting/media/key_help_v0.html (moved) * src/sas/perspectives/fitting/media/load_data_help_v0.html (moved) * src/sas/perspectives/fitting/media/m0x_eq.gif (added) * src/sas/perspectives/fitting/media/m0y_eq.gif (added) * src/sas/perspectives/fitting/media/m0z_eq.gif (added) * src/sas/perspectives/fitting/media/mag_vector.bmp (added) * src/sas/perspectives/fitting/media/model_editor_help_v0.html (moved) * src/sas/perspectives/fitting/media/model_use_help_v0.html (moved) * src/sas/perspectives/fitting/media/mqx.gif (added) * src/sas/perspectives/fitting/media/mqy.gif (added) * src/sas/perspectives/fitting/media/mxp.gif (added) * src/sas/perspectives/fitting/media/myp.gif (added) * src/sas/perspectives/fitting/media/mzp.gif (added) * src/sas/perspectives/fitting/media/pd_image001.png (added) * src/sas/perspectives/fitting/media/pd_image002.png (added) * src/sas/perspectives/fitting/media/pd_image003.png (added) * src/sas/perspectives/fitting/media/pd_image004.jpg (added) * src/sas/perspectives/fitting/media/pd_image005.png (added) * src/sas/perspectives/fitting/media/pd_image006.jpg (added) * src/sas/perspectives/fitting/media/pd_image007.png (added) * src/sas/perspectives/fitting/media/pd_image008.png (added) * src/sas/perspectives/fitting/media/pd_image009.png (added) * src/sas/perspectives/fitting/media/pd_image010.jpg (added) * src/sas/perspectives/fitting/media/pd_image011.png (added) * src/sas/perspectives/fitting/media/pd_image012.png (added) * src/sas/perspectives/fitting/media/pd_image013.jpg (added) * src/sas/perspectives/fitting/media/simultaneous_fit_help_v0.html (moved) * src/sas/perspectives/fitting/media/single_fit_help_v0.html (moved) * src/sas/perspectives/fitting/media/sld1.gif (added) * src/sas/perspectives/fitting/media/sld2.gif (added) * src/sas/perspectives/fitting/media/sm_image002.gif (added) * src/sas/perspectives/fitting/media/sm_image003.gif (added) * src/sas/perspectives/fitting/media/sm_image004.gif (added) * src/sas/perspectives/fitting/media/sm_image005.gif (added) * src/sas/perspectives/fitting/media/sm_image006.gif (added) * src/sas/perspectives/fitting/media/sm_image007.gif (added) * src/sas/perspectives/fitting/media/sm_image008.gif (added) * src/sas/perspectives/fitting/media/sm_image009.gif (added) * src/sas/perspectives/fitting/media/sm_image010.gif (added) * src/sas/perspectives/fitting/media/sm_image011.gif (added) * src/sas/perspectives/fitting/media/sm_image012.gif (added) * src/sas/perspectives/fitting/media/sm_image013.gif (added) * src/sas/perspectives/fitting/media/sm_image016.gif (added) * src/sas/perspectives/fitting/media/sm_image017.gif (added) * src/sas/perspectives/fitting/media/sm_image018.gif (added) * src/sas/perspectives/fitting/media/sm_image019.gif (added) * src/sas/perspectives/fitting/media/sm_image020.gif (added) * src/sas/perspectives/fitting/media/sm_image021.gif (added) * src/sas/perspectives/fitting/media/sm_image022.gif (added) * src/sas/perspectives/fitting/media/sm_image023.gif (added) * src/sas/perspectives/fitting/media/sm_image024.gif (added) * src/sas/perspectives/fitting/media/sm_image025.gif (added) * src/sas/perspectives/fitting/media/sm_image026.gif (added) * src/sas/perspectives/fitting/media/sm_image027.gif (added) * src/sas/perspectives/fitting/media/sm_image028.gif (added) * src/sas/perspectives/fitting/media/status_bar_help_v0.html (moved) * src/sas/perspectives/invariant/media/invariant_help.rst (added) * src/sas/perspectives/invariant/media/invariant_help_v0.html (moved) * src/sas/perspectives/invariant/media/report_template.html (modified) * src/sas/perspectives/invariant/media/report_template_v0.html (added) * src/sas/perspectives/pr/media/pr_help.rst (added) Merge branch 'master' of https://github.com/SasView/sasview.git Tue, 17 Feb 2015 13:44:11 GMT smk78 [66e579f] * src/sas/perspectives/invariant/media/report_template.html (added) Fudge to allow Sphinx to fully build docs (the contents of this file are ... Tue, 17 Feb 2015 13:42:17 GMT smk78 [a235729e] * src/sas/perspectives/fitting/media/M_angles_pic.bmp (added) * src/sas/perspectives/fitting/media/dm_eq.gif (added) * src/sas/perspectives/fitting/media/fitting_help.html (added) * src/sas/perspectives/fitting/media/m0x_eq.gif (added) * src/sas/perspectives/fitting/media/m0y_eq.gif (added) * src/sas/perspectives/fitting/media/m0z_eq.gif (added) * src/sas/perspectives/fitting/media/mag_vector.bmp (added) * src/sas/perspectives/fitting/media/mqx.gif (added) * src/sas/perspectives/fitting/media/mqy.gif (added) * src/sas/perspectives/fitting/media/mxp.gif (added) * src/sas/perspectives/fitting/media/myp.gif (added) * src/sas/perspectives/fitting/media/mzp.gif (added) * src/sas/perspectives/fitting/media/pd_image001.png (added) * src/sas/perspectives/fitting/media/pd_image002.png (added) * src/sas/perspectives/fitting/media/pd_image003.png (added) * src/sas/perspectives/fitting/media/pd_image004.jpg (added) * src/sas/perspectives/fitting/media/pd_image005.png (added) * src/sas/perspectives/fitting/media/pd_image006.jpg (added) * src/sas/perspectives/fitting/media/pd_image007.png (added) * src/sas/perspectives/fitting/media/pd_image008.png (added) * src/sas/perspectives/fitting/media/pd_image009.png (added) * src/sas/perspectives/fitting/media/pd_image010.jpg (added) * src/sas/perspectives/fitting/media/pd_image011.png (added) * src/sas/perspectives/fitting/media/pd_image012.png (added) * src/sas/perspectives/fitting/media/pd_image013.jpg (added) * src/sas/perspectives/fitting/media/sld1.gif (added) * src/sas/perspectives/fitting/media/sld2.gif (added) * src/sas/perspectives/fitting/media/sm_image002.gif (added) * src/sas/perspectives/fitting/media/sm_image003.gif (added) * src/sas/perspectives/fitting/media/sm_image004.gif (added) * src/sas/perspectives/fitting/media/sm_image005.gif (added) * src/sas/perspectives/fitting/media/sm_image006.gif (added) * src/sas/perspectives/fitting/media/sm_image007.gif (added) * src/sas/perspectives/fitting/media/sm_image008.gif (added) * src/sas/perspectives/fitting/media/sm_image009.gif (added) * src/sas/perspectives/fitting/media/sm_image010.gif (added) * src/sas/perspectives/fitting/media/sm_image011.gif (added) * src/sas/perspectives/fitting/media/sm_image012.gif (added) * src/sas/perspectives/fitting/media/sm_image013.gif (added) * src/sas/perspectives/fitting/media/sm_image016.gif (added) * src/sas/perspectives/fitting/media/sm_image017.gif (added) * src/sas/perspectives/fitting/media/sm_image018.gif (added) * src/sas/perspectives/fitting/media/sm_image019.gif (added) * src/sas/perspectives/fitting/media/sm_image020.gif (added) * src/sas/perspectives/fitting/media/sm_image021.gif (added) * src/sas/perspectives/fitting/media/sm_image022.gif (added) * src/sas/perspectives/fitting/media/sm_image023.gif (added) * src/sas/perspectives/fitting/media/sm_image024.gif (added) * src/sas/perspectives/fitting/media/sm_image025.gif (added) * src/sas/perspectives/fitting/media/sm_image026.gif (added) * src/sas/perspectives/fitting/media/sm_image027.gif (added) * src/sas/perspectives/fitting/media/sm_image028.gif (added) Provide Sphinx build with missing images Tue, 17 Feb 2015 13:35:07 GMT smk78 [98b30b4] * src/sas/guiframe/media/graph_help.rst (modified) * src/sas/models/media/model_functions.rst (modified) * src/sas/perspectives/calculator/media/data_operator_help.rst (added) * src/sas/perspectives/fitting/media/fitting_help.rst (modified) Dupilicate links resolved Tue, 17 Feb 2015 13:32:42 GMT smk78 [a37b4e6] * src/sas/data_util/media/data_operator_help.rst (deleted) * src/sas/perspectives/invariant/media/pr_help.rst (deleted) Location change Tue, 17 Feb 2015 13:30:56 GMT smk78 [b532aa1] * src/sas/guiframe/media/Graph_help_v0.html (moved) * src/sas/guiframe/media/averaging_help_v0.html (moved) * src/sas/guiframe/media/change_scale_help_v0.html (moved) * src/sas/guiframe/media/data_explorer_help_v0.html (moved) * src/sas/guiframe/media/key_help_v0.html (moved) * src/sas/models/media/pd_help_v0.html (moved) * src/sas/models/media/polar_mag_help_v0.html (moved) * src/sas/models/media/smear_computation_v0.html (moved) More original html help files renamed to _v0 to differentiate from those ... Tue, 17 Feb 2015 13:20:48 GMT gonzalezm [400155b] * build.txt (added) * install.txt (added) * src/sans/models/BCCrystalModel.py (added) * src/sans/models/BarBellModel.py (added) * src/sans/models/BinaryHSModel.py (added) * src/sans/models/CSParallelepipedModel.py (added) * src/sans/models/CappedCylinderModel.py (added) * src/sans/models/Core2ndMomentModel.py (added) * src/sans/models/CoreFourShellModel.py (added) * src/sans/models/CoreShellBicelleModel.py (added) * src/sans/models/CoreShellCylinderModel.py (added) * src/sans/models/CoreShellEllipsoidModel.py (added) * src/sans/models/CoreShellEllipsoidXTModel.py (added) * src/sans/models/CoreShellModel.py (added) * src/sans/models/CylinderModel.py (added) * src/sans/models/DABModel.py (added) * src/sans/models/DiamCylFunc.py (added) * src/sans/models/DiamEllipFunc.py (added) * src/sans/models/EllipsoidModel.py (added) * src/sans/models/EllipticalCylinderModel.py (added) * src/sans/models/FCCrystalModel.py (added) * src/sans/models/FlexCylEllipXModel.py (added) * src/sans/models/FlexibleCylinderModel.py (added) * src/sans/models/FractalModel.py (added) * src/sans/models/FractalO_Z.py (added) * src/sans/models/FuzzySphereModel.py (added) * src/sans/models/Gaussian.py (added) * src/sans/models/GelFitModel.py (added) * src/sans/models/HardsphereStructure.py (added) * src/sans/models/HayterMSAStructure.py (added) * src/sans/models/HollowCylinderModel.py (added) * src/sans/models/LamellarFFHGModel.py (added) * src/sans/models/LamellarModel.py (added) * src/sans/models/LamellarPCrystalModel.py (added) * src/sans/models/LamellarPSHGModel.py (added) * src/sans/models/LamellarPSModel.py (added) * src/sans/models/LinearPearlsModel.py (added) * src/sans/models/LogNormal.py (added) * src/sans/models/Lorentzian.py (added) * src/sans/models/MassFractalModel.py (added) * src/sans/models/MassSurfaceFractal.py (added) * src/sans/models/MicelleSphCoreModel.py (added) * src/sans/models/MultiShellModel.py (added) * src/sans/models/OnionModel.py (added) * src/sans/models/ParallelepipedModel.py (added) * src/sans/models/PearlNecklaceModel.py (added) * src/sans/models/Poly_GaussCoil.py (added) * src/sans/models/PringlesModel.py (added) * src/sans/models/RPAModel.py (added) * src/sans/models/RaspBerryModel.py (added) * src/sans/models/RectangularHollowPrismInfThinWallsModel.py (added) * src/sans/models/RectangularHollowPrismModel.py (added) * src/sans/models/RectangularPrismModel.py (added) * src/sans/models/ReflAdvModel.py (added) * src/sans/models/ReflModel.py (added) * src/sans/models/SCCrystalModel.py (added) * src/sans/models/SLDCalFunc.py (added) * src/sans/models/Schulz.py (added) * src/sans/models/SchulzHuber.py (added) * src/sans/models/SphereModel.py (added) * src/sans/models/SphereSLDModel.py (added) * src/sans/models/SquareWellStructure.py (added) * src/sans/models/StackedDisksModel.py (added) * src/sans/models/StarPolymer.py (added) * src/sans/models/StickyHSStructure.py (added) * src/sans/models/SurfaceFractalModel.py (added) * src/sans/models/TeubnerStreyModel.py (added) * src/sans/models/TriaxialEllipsoidModel.py (added) * src/sans/models/TwoYukawaModel.py (added) * src/sans/models/VesicleModel.py (added) * src/sans/models/c_extension/c_models/c_models.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CBCCrystalModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CBarBellModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CBinaryHSModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCSParallelepipedModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCappedCylinderModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCore2ndMomentModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCoreFourShellModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCoreShellBicelleModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCoreShellCylinderModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCoreShellEllipsoidModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCoreShellEllipsoidXTModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCoreShellModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CCylinderModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CDABModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CDiamCylFunc.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CDiamEllipFunc.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CEllipsoidModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CEllipticalCylinderModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CFCCrystalModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CFlexCylEllipXModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CFlexibleCylinderModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CFractalModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CFractalO_Z.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CFuzzySphereModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CGaussian.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CGelFitModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CHardsphereStructure.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CHayterMSAStructure.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CHollowCylinderModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CLamellarFFHGModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CLamellarModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CLamellarPCrystalModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CLamellarPSHGModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CLamellarPSModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CLinearPearlsModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CLogNormal.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CLorentzian.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CMassFractalModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CMassSurfaceFractal.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CMicelleSphCoreModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CMultiShellModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/COnionModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CParallelepipedModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CPearlNecklaceModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CPoly_GaussCoil.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CPringlesModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CRPAModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CRaspBerryModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CRectangularHollowPrismInfThinWallsModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CRectangularHollowPrismModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CRectangularPrismModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CReflAdvModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CReflModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CSCCrystalModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CSLDCalFunc.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CSchulz.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CSphereModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CSphereSLDModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CSquareWellStructure.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CStackedDisksModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CStarPolymer.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CStickyHSStructure.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CSurfaceFractalModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CTeubnerStreyModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CTriaxialEllipsoidModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CTwoYukawaModel.cpp (added) * src/sans/models/c_extension/python_wrapper/generated/CVesicleModel.cpp (added) * src/sas/dataloader/manipulations.py (modified) * src/sas/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) * test/pr_inversion/test/test_output.txt (added) * test/sasdataloader/test/isis_1_0_write_test.xml (added) * test/sasdataloader/test/isis_1_1_write_test.xml (added) * test/sasdataloader/test/ring_testdata.txt (modified) * test/sasdataloader/test/write_test.xml (added) Implementing request from ticket 261 - default number of bins in Annulus ... Tue, 17 Feb 2015 10:31:43 GMT smk78 [ec392464] * src/sas/perspectives/calculator/media/density_calculator_help.rst (added) * src/sas/perspectives/calculator/media/kiessig_calculator_help.rst (added) * src/sas/perspectives/calculator/media/resolution_calculator_help.rst (added) * src/sas/perspectives/calculator/media/sas_calculator_help.rst (added) * src/sas/perspectives/calculator/media/sld_calculator_help.rst (added) * src/sas/perspectives/calculator/media/slit_calculator_help.rst (added) * src/sas/perspectives/fitting/media/fitting_help.rst (added) * src/sas/perspectives/invariant/media/invariant_help.rst (added) * src/sas/perspectives/invariant/media/pr_help.rst (added) * src/sas/perspectives/pr/media/pr_help.rst (added) New ReST help files location for perspective help Tue, 17 Feb 2015 10:29:06 GMT smk78 [d16339c] * src/sas/calculator/media/density_calculator_help.rst (deleted) * src/sas/calculator/media/kiessig_calculator_help.rst (deleted) * src/sas/calculator/media/resolution_calculator_help.rst (deleted) * src/sas/calculator/media/sas_calculator_help.rst (deleted) * src/sas/calculator/media/sld_calculator_help.rst (deleted) * src/sas/calculator/media/slit_calculator_help.rst (deleted) * src/sas/fit/media/fitting_help.rst (deleted) * src/sas/invariant/media/invariant_help.rst (deleted) * src/sas/invariant/media/pr_help.rst (deleted) New ReST help files for operations that are properly part of a ... Tue, 17 Feb 2015 10:26:40 GMT smk78 [36c5910] * src/sas/perspectives/calculator/media/data_operator_help_v0.html (moved) * src/sas/perspectives/calculator/media/density_calculator_help_v0.html (moved) * src/sas/perspectives/calculator/media/kiessig_calculator_help_v0.html (moved) * src/sas/perspectives/calculator/media/load_image_help_v0.html (moved) * src/sas/perspectives/calculator/media/pycrust_help_v0.html (moved) * src/sas/perspectives/calculator/media/resolution_calculator_help_v0.html (moved) * src/sas/perspectives/calculator/media/sld_calculator_help_v0.html (moved) * src/sas/perspectives/calculator/media/slit_calculator_help_v0.html (moved) * src/sas/perspectives/fitting/media/batch_help_v0.html (moved) * src/sas/perspectives/fitting/media/category_manager_help_v0.html (moved) * src/sas/perspectives/fitting/media/glossaryhelp_v0.html (moved) * src/sas/perspectives/fitting/media/help_v0.html (moved) * src/sas/perspectives/fitting/media/key_help_v0.html (moved) * src/sas/perspectives/fitting/media/load_data_help_v0.html (moved) * src/sas/perspectives/fitting/media/model_editor_help_v0.html (moved) * src/sas/perspectives/fitting/media/model_use_help_v0.html (moved) * src/sas/perspectives/fitting/media/simultaneous_fit_help_v0.html (moved) * src/sas/perspectives/fitting/media/single_fit_help_v0.html (moved) * src/sas/perspectives/fitting/media/status_bar_help_v0.html (moved) * src/sas/perspectives/invariant/media/invariant_help_v0.html (moved) * src/sas/perspectives/invariant/media/report_template_v0.html (moved) Old html help renamed to _v0 Tue, 17 Feb 2015 10:21:25 GMT krzywon [7eaf9f2] * src/sas/dataloader/data_info.py (modified) Fixed an error associated with the dataloader created when adding the ... Tue, 17 Feb 2015 10:17:42 GMT krzywon [b45cde3] * src/sas/dataloader/data_info.py (modified) * src/sas/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/perspectives/calculator/data_editor.py (modified) Added the base SESANS data objects to the dataloader/data_info.py that ... Tue, 17 Feb 2015 08:46:30 GMT smk78 [48153283] * build_tools/conda/README.md (added) * build_tools/conda/appdirs/bld.bat (added) * build_tools/conda/appdirs/build.sh (added) * build_tools/conda/appdirs/meta.yaml (added) * build_tools/conda/bumps/meta.yaml (modified) * build_tools/conda/mako/bld.bat (added) * build_tools/conda/mako/build.sh (added) * build_tools/conda/mako/meta.yaml (added) * build_tools/conda/periodictable/meta.yaml (modified) * build_tools/conda/py2exe/bld.bat (added) * build_tools/conda/py2exe/build.sh (added) * build_tools/conda/py2exe/meta.yaml (added) * build_tools/conda/pyopencl/bld.bat (added) * build_tools/conda/pyopencl/build.sh (added) * build_tools/conda/pyopencl/meta.yaml (added) * build_tools/conda/pypdf2/bld.bat (added) * build_tools/conda/pypdf2/build.sh (added) * build_tools/conda/pypdf2/meta.yaml (added) * build_tools/conda/pytools/bld.bat (added) * build_tools/conda/pytools/build.sh (added) * build_tools/conda/pytools/meta.yaml (added) * build_tools/conda/unittest-xml-reporting/meta.yaml (modified) * build_tools/conda/xhtml2pdf/bld.bat (added) * build_tools/conda/xhtml2pdf/build.sh (added) * build_tools/conda/xhtml2pdf/meta.yaml (added) * docs/sphinx-docs/build_sphinx.py (modified) * sasview/setup_exe.py (modified) * setup.py (modified) * src/sas/data_util/nxsunit.py (modified) * src/sas/dataloader/data_info.py (modified) * src/sas/dataloader/readers/associations.py (modified) * src/sas/dataloader/readers/cansas_reader.py (modified) * src/sas/dataloader/readers/defaults.json (added) * src/sas/dataloader/readers/defaults.xml (deleted) * src/sas/guiframe/gui_manager.py (modified) * src/sas/guiframe/gui_statusbar.py (modified) * src/sas/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/models/c_extension/python_wrapper/modelTemplate.txt (modified) * src/sas/models/include/cylinder.h (modified) * src/sas/models/media/model_functions_v0.rest (deleted) * src/sas/perspectives/fitting/fitpage.py (modified) * src/sas/perspectives/fitting/pagestate.py (modified) * src/sas/perspectives/fitting/report_dialog.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * docs/sphinx-docs/source/user/user.rst (modified) * src/sas/calculator/media/density_calculator_help.rst (modified) * src/sas/calculator/media/kiessig_calculator_help.rst (modified) * src/sas/calculator/media/resolution_calculator_help.rst (modified) * src/sas/calculator/media/sas_calculator_help.rst (modified) * src/sas/calculator/media/sld_calculator.rst (deleted) * src/sas/calculator/media/sld_calculator_help.rst (added) * src/sas/calculator/media/slit_calculator_help.rst (modified) * src/sas/data_util/media/data_operator_help.rst (modified) * src/sas/fit/media/fitting_help.rst (modified) * src/sas/guiframe/media/data_explorer_help.rst (modified) * src/sas/guiframe/media/graph_help.rst (modified) * src/sas/invariant/media/invariant_help.rst (modified) * src/sas/invariant/media/pr_help.rst (modified) * src/sas/perspectives/calculator/media/image_viewer_help.rst (added) * src/sas/perspectives/calculator/media/python_shell_help.rst (added) Merge branch 'master' of https://github.com/SasView/sasview.git Mon, 16 Feb 2015 17:27:41 GMT krzywon [5dfdfa7] * src/sas/dataloader/readers/associations.py (modified) * src/sas/dataloader/readers/defaults.json (added) * src/sas/dataloader/readers/defaults.xml (deleted) Changed the default dataloader association file from xml to json to ... Sun, 15 Feb 2015 18:29:59 GMT pkienzle [8836849] * src/sas/models/c_extension/python_wrapper/modelTemplate.txt (modified) * src/sas/models/include/cylinder.h (modified) Allow inf for default parameter bounds (closes #330) Sun, 15 Feb 2015 17:53:12 GMT pkienzle [22ae2f7] * src/sas/models/include/cylinder.h (modified) * src/sas/perspectives/fitting/fitpage.py (modified) set default bounds from model in UI (closes #229) Sun, 15 Feb 2015 15:45:23 GMT smk78 [920928f] * src/sas/calculator/media/density_calculator_help.rst (modified) * src/sas/calculator/media/kiessig_calculator_help.rst (modified) * src/sas/calculator/media/resolution_calculator_help.rst (modified) * src/sas/calculator/media/sas_calculator_help.rst (modified) * src/sas/calculator/media/sld_calculator_help.rst (modified) * src/sas/calculator/media/slit_calculator_help.rst (modified) * src/sas/data_util/media/data_operator_help.rst (modified) * src/sas/fit/media/fitting_help.rst (modified) * src/sas/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/perspectives/calculator/media/python_shell_help.rst (modified) Fixed rst errors. Sphinx docs now build in a useable form. Require ... Sun, 15 Feb 2015 15:09:34 GMT smk78 [23a9beb] * src/sas/calculator/media/sld_calculator_help.rst (modified) * src/sas/data_util/media/data_operator_help.rst (modified) * src/sas/fit/media/fitting_help.rst (modified) * src/sas/guiframe/media/data_explorer_help.rst (modified) * src/sas/guiframe/media/graph_help.rst (modified) * src/sas/invariant/media/invariant_help.rst (modified) * src/sas/invariant/media/pr_help.rst (modified) Fixed rst errors Sat, 14 Feb 2015 17:32:13 GMT smk78 [898a8b9] * src/sas/fit/media/fitting_help.rst (modified) Correcting malformed links Sat, 14 Feb 2015 17:27:53 GMT gonzalezm [827484cf] * build_tools/conda/README.md (added) * build_tools/conda/appdirs/bld.bat (added) * build_tools/conda/appdirs/build.sh (added) * build_tools/conda/appdirs/meta.yaml (added) * build_tools/conda/bumps/meta.yaml (modified) * build_tools/conda/mako/bld.bat (added) * build_tools/conda/mako/build.sh (added) * build_tools/conda/mako/meta.yaml (added) * build_tools/conda/periodictable/meta.yaml (modified) * build_tools/conda/py2exe/bld.bat (added) * build_tools/conda/py2exe/build.sh (added) * build_tools/conda/py2exe/meta.yaml (added) * build_tools/conda/pyopencl/bld.bat (added) * build_tools/conda/pyopencl/build.sh (added) * build_tools/conda/pyopencl/meta.yaml (added) * build_tools/conda/pypdf2/bld.bat (added) * build_tools/conda/pypdf2/build.sh (added) * build_tools/conda/pypdf2/meta.yaml (added) * build_tools/conda/pytools/bld.bat (added) * build_tools/conda/pytools/build.sh (added) * build_tools/conda/pytools/meta.yaml (added) * build_tools/conda/unittest-xml-reporting/meta.yaml (modified) * build_tools/conda/xhtml2pdf/bld.bat (added) * build_tools/conda/xhtml2pdf/build.sh (added) * build_tools/conda/xhtml2pdf/meta.yaml (added) * docs/sphinx-docs/build_sphinx.py (modified) * sasview/setup_exe.py (modified) * src/sas/data_util/nxsunit.py (modified) * src/sas/dataloader/data_info.py (modified) * src/sas/dataloader/readers/cansas_reader.py (modified) * src/sas/guiframe/gui_manager.py (modified) * src/sas/guiframe/gui_statusbar.py (modified) * src/sas/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/models/media/model_functions_v0.rest (deleted) * test/sasdataloader/test/utest_abs_reader.py (modified) * src/sas/perspectives/fitting/fitpage.py (modified) Merge branch 'master' of https://github.com/SasView/sasview Sat, 14 Feb 2015 17:25:14 GMT gonzalezm [9e11cf5] * src/sas/perspectives/fitting/fitpage.py (modified) Bug fix for ticket 320 - NaN errors are now displayed in the error boxes ...