# # ChangeLog for / in sasview # # Generated by Trac 1.0.1 # Jun 5, 2024 6:12:09 AM Fri, 20 Feb 2015 10:23:52 GMT pkienzle [476d4e3] * docs/pre-sphinx-docs/fitting_key_help_v0.html (modified) * docs/pre-sphinx-docs/single_fit_help_v0.html (modified) * docs/sphinx-docs/source/conf.py (modified) * docs/sphinx-docs/source/dev/dev.rst (modified) remove references to park/scipy from docs Fri, 20 Feb 2015 10:03:32 GMT pkienzle [cda1cf8] * test/park_integration/test/utest_multiplicative_model.py (added) mulitplicative model fit test 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 Fri, 20 Feb 2015 09:23:15 GMT Peter Parker [018582f] * sasview/setup_mac.py (modified) Fix capitalisation bug. Fri, 20 Feb 2015 09:14:59 GMT Peter Parker [59b1b92] * sasview/setup_mac.py (modified) Fix mac installer script, which was looking for old version of file. Fri, 20 Feb 2015 08:40:19 GMT Peter Parker [a8d882a] * sasview/setup_mac.py (modified) Let's see if this pulls in documentation to the Mac installer. 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:49 GMT smk78 [aba7b40] * .gitignore (modified) * Vagrantfile (added) * Vagrantprovision.sh (added) * 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 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 14:03:42 GMT Tobias Richter [96032b3] * Vagrantfile (modified) add some documentation what vagrant is Thu, 19 Feb 2015 13:56:51 GMT Tobias Richter [e0a50be] * sasview/license.txt (modified) * src/sas/dataloader/loader.py (modified) * src/sas/guiframe/local_perspectives/plotting/slicerpanel.py (modified) * src/sas/perspectives/calculator/media/image_viewer_help.rst (modified) * src/sas/perspectives/calculator/media/python_shell_help.rst (modified) * .gitignore (modified) * Vagrantfile (added) * Vagrantprovision.sh (added) Merge branch 'master' of github.com:SasView/sasview 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:44:03 GMT Tobias Richter [795ea6a2] * Vagrantprovision.sh (modified) specifically set CTYPE seems the Mac is passing in unrecognised CYTPE ... Thu, 19 Feb 2015 13:33:59 GMT Tobias Richter [a97c51e] * .gitignore (modified) * Vagrantfile (added) * Vagrantprovision.sh (added) initial test of vagrant Thu, 19 Feb 2015 13:13:24 GMT krzywon [fa6a8d1] * sasview/license.txt (modified) * src/sas/dataloader/loader.py (modified) * src/sas/guiframe/local_perspectives/plotting/slicerpanel.py (modified) Merge branch 'master' of https://github.com/SasView/sasview/ 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:10:29 GMT smk78 [98f6916] * sasview/license.txt (modified) License text updated to remove reference to SourceForge and replace with ... 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 16:09:28 GMT Peter Parker [0037131] * build_tools/conda/pyopencl/meta.yaml (modified) Update meta.yaml Setup tools is needed at run time since pkg_resources ... 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 14:48:58 GMT Peter Parker [e5b1f17] * src/sas/fit/ScipyFitting.py (modified) * test/park_integration/test/utest_fit_cylinder.py (modified) * test/sasdataloader/test/utest_averaging.py (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) Merge branch 'master' of github.com:SasView/sasview Wed, 18 Feb 2015 14:43:13 GMT Peter Parker [bd66f66d] * build_tools/conda/macholib/meta.yaml (modified) Conda made a bad job of this one, too. Remove broken bits. Wed, 18 Feb 2015 14:41:58 GMT Peter Parker [58f75b4] * build_tools/conda/macholib/bld.bat (added) * build_tools/conda/macholib/build.sh (added) * build_tools/conda/macholib/meta.yaml (added) First pass of macholib, dependancy of py2app, using conda skeleton. Wed, 18 Feb 2015 14:36:03 GMT Peter Parker [22475e6] * build_tools/conda/modulegraph/meta.yaml (modified) Conda made a bad job of this one. Remove broken bits. Wed, 18 Feb 2015 13:53:38 GMT Peter Parker [951e4ae] * build_tools/conda/modulegraph/bld.bat (added) * build_tools/conda/modulegraph/build.sh (added) * build_tools/conda/modulegraph/meta.yaml (added) First pass of modulegraph, dependancy of py2app, using conda skeleton. 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:41:52 GMT Peter Parker [2b9f7c2] * build_tools/conda/altgraph/meta.yaml (modified) Add dependency for required for test. Wed, 18 Feb 2015 13:25:23 GMT Peter Parker [50040a0] * build_tools/conda/altgraph/bld.bat (added) * build_tools/conda/altgraph/build.sh (added) * build_tools/conda/altgraph/meta.yaml (added) First pass of altgraph, dependancy of py2app, using conda skeleton. Wed, 18 Feb 2015 13:18:21 GMT Peter Parker [42b65f4] * build_tools/conda/py2app/bld.bat (added) * build_tools/conda/py2app/build.sh (added) * build_tools/conda/py2app/meta.yaml (added) First pass of py2app using conda skeleton. 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 12:41:53 GMT trnielsen [9398f7b] * 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) * sasview/setup_exe.py (modified) Merge branch 'master' of https://github.com/SasView/sasview Wed, 18 Feb 2015 12:41:32 GMT trnielsen [42811b8] * sasview/setup_exe.py (modified) Make sure that lxml is properly included in the installer. This has ... 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:22:15 GMT Peter Parker [25ab07c] * src/sas/models/media/list-of-links.txt (added) * build_tools/conda/README.md (modified) * build_tools/conda/pyopencl/bld.bat (modified) * sasview/setup_exe.py (modified) Merge branch 'master' of github.com:SasView/sasview Wed, 18 Feb 2015 10:21:55 GMT Peter Parker [b9fc674] * sasview/setup_exe.py (modified) Make sure documentation is included in installer. 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:39:21 GMT Peter Parker [66b63ee] * build.txt (added) * check_packages.py (modified) * 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) * sasview/installer.iss (modified) * sasview/setup_exe.py (modified) * 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/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/data_formats_help.rst (added) * 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/basepage.py (modified) * 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/fitting/pagestate.py (modified) * src/sas/perspectives/fitting/report_dialog.py (modified) * src/sas/perspectives/invariant/invariant_panel.py (modified) * src/sas/perspectives/invariant/media/invariant_help.rst (added) * src/sas/perspectives/invariant/media/report_template.html (modified) * src/sas/perspectives/invariant/report_dialog.py (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) * build_tools/conda/README.md (modified) * build_tools/conda/pyopencl/bld.bat (modified) Merge branch 'master' of github.com:SasView/sasview 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:33:24 GMT mathieu [3ef5b2f] * 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) * sasview/installer.iss (modified) * setup.py (modified) Merge pull request #1 from SasView/ticket302_pisa Ticket302 pisa 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:23:46 GMT smk78 [e6e4af7] * sasview/installer.iss (modified) * setup.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: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 16:07:10 GMT Mathieu Doucet [61c93b3] * check_packages.py (modified) * sasview/setup_exe.py (modified) Updated requirements