# # ChangeLog for src/sas in sasview # # Generated by Trac 1.0.1 # Dec 26, 2024 2:41:27 PM Wed, 04 Mar 2015 18:02:23 GMT Doucet, Mathieu [b6627d9] * build_tools/pylint.rc (modified) * src/sas/calculator/instrument.py (modified) * src/sas/calculator/resolution_calculator.py (modified) * src/sas/calculator/sas_gen.py (modified) * src/sas/calculator/slit_length_calculator.py (modified) pylint fixes Wed, 04 Mar 2015 17:45:24 GMT Doucet, Mathieu [5a7d933] * src/sas/pr/invertor.py (modified) The way the Invertor interacts with its C component should be cleaned up Wed, 04 Mar 2015 17:39:36 GMT Doucet, Mathieu [bc3e38c] * src/sas/pr/invertor.py (modified) The way the Invertor interacts with its C component should be cleaned up Wed, 04 Mar 2015 17:36:56 GMT Doucet, Mathieu [ab13d33] * src/sas/pr/invertor.py (modified) pylint fixes Wed, 04 Mar 2015 17:30:43 GMT Doucet, Mathieu [c76bdc3] * src/sas/invariant/invariant.py (modified) * src/sas/pr/invertor.py (modified) pylint fixes Wed, 04 Mar 2015 17:09:19 GMT Doucet, Mathieu [5f8fc78] * src/sas/pr/invertor.py (modified) * src/sas/pr/num_term.py (modified) pylint fixes Wed, 04 Mar 2015 16:56:03 GMT Doucet, Mathieu [3350ad6] * src/sas/pr/invertor.py (modified) pylint fixes Wed, 04 Mar 2015 16:41:18 GMT Doucet, Mathieu [091e71a2] * src/sas/guiframe/gui_manager.py (modified) Every time I look at this code I want to cry... Wed, 04 Mar 2015 15:19:27 GMT Doucet, Mathieu [1128bd31] * build_tools/pylint.rc (modified) * src/sas/perspectives/invariant/invariant_panel.py (modified) pylint fixes Tue, 03 Mar 2015 20:27:22 GMT Doucet, Mathieu [26500ec] * src/sas/calculator/instrument.py (modified) pylint fixes Tue, 03 Mar 2015 19:20:19 GMT Doucet, Mathieu [121f72c] * src/sas/plottools/PlotPanel.py (modified) pylint fixes Tue, 03 Mar 2015 17:42:20 GMT Doucet, Mathieu [9dedf40] * src/sas/dataloader/readers/cansas_reader.py (modified) Fix issue do to misleading use of exec Tue, 03 Mar 2015 17:35:18 GMT Doucet, Mathieu [226ce0b] * src/sas/dataloader/readers/cansas_reader.py (modified) Fix issue do to misleading use of exec Tue, 03 Mar 2015 17:26:26 GMT Doucet, Mathieu [aa720c4] * src/sas/dataloader/readers/cansas_reader.py (modified) pylint fixes Tue, 03 Mar 2015 16:17:47 GMT Doucet, Mathieu [3c3a440] * build_tools/pylint.rc (modified) * src/sas/dataloader/manipulations.py (modified) pylint fixes Tue, 03 Mar 2015 15:28:02 GMT Doucet, Mathieu [c8a6c3d7] * src/sas/dataloader/manipulations.py (modified) pylint fixes Tue, 03 Mar 2015 14:59:47 GMT Doucet, Mathieu [f06d7fc] * src/sas/dataloader/loader.py (modified) Pylint fixes Mon, 02 Mar 2015 21:38:00 GMT Doucet, Mathieu [038c00cf] * src/sas/pr/distance_explorer.py (modified) * src/sas/pr/num_term.py (modified) more pylint clean up Mon, 02 Mar 2015 21:29:01 GMT Doucet, Mathieu [13e46abe] * src/sas/models/c_extension/python_wrapper/WrapperGenerator.py (modified) Clean up pylint Mon, 02 Mar 2015 21:09:46 GMT Doucet, Mathieu [6bd3a8d1] * src/sas/calculator/instrument.py (modified) * src/sas/calculator/kiessig_calculator.py (modified) * src/sas/calculator/resolution_calculator.py (modified) * src/sas/calculator/slit_length_calculator.py (modified) Remove extra white spaces Mon, 02 Mar 2015 20:46:50 GMT Doucet, Mathieu [c93122e] * src/sas/models/c_extension/python_wrapper/modelTemplate.txt (modified) Pylint for model template Mon, 02 Mar 2015 20:31:50 GMT Doucet, Mathieu [e3f77d8b] * build_tools/pylint.rc (modified) * src/sas/calculator/sas_gen.py (modified) More pylint fixes. Ignore bumpy since it's know not to behave well with ... Mon, 02 Mar 2015 19:55:36 GMT Doucet, Mathieu [e4f421c] * src/sas/dataloader/data_info.py (modified) pylint fixes Mon, 02 Mar 2015 19:26:45 GMT Doucet, Mathieu [c43e875] * src/sas/dataloader/readers/cansas_constants.py (modified) cleaned pylint Mon, 02 Mar 2015 18:25:50 GMT Doucet, Mathieu [788d4c3] * src/sas/dataloader/readers/cansas_constants.py (modified) Fix pylint issues Mon, 02 Mar 2015 18:04:44 GMT Doucet, Mathieu [26d2d88] * src/sas/perspectives/calculator/kiessig_calculator_panel.py (modified) Fix pylint complaints Sun, 01 Mar 2015 08:06:24 GMT butler [18d58a6e] * src/sas/perspectives/calculator/resolution_calculator_panel.py (modified) add help button to resolution calculator panel and do a few adjustments Sun, 01 Mar 2015 07:46:02 GMT butler [9654baf] * src/sas/perspectives/calculator/kiessig_calculator_panel.py (modified) * src/sas/perspectives/calculator/slit_length_calculator_panel.py (modified) * Add help to Kiessig calculator plus some sizing/positioning panel * ... Sun, 01 Mar 2015 07:23:04 GMT butler [491e916] * src/sas/perspectives/calculator/slit_length_calculator_panel.py (modified) Added help button to slit size calculator and adjusted sizing Sun, 01 Mar 2015 06:55:51 GMT butler [58c125d] * src/sas/perspectives/calculator/density_panel.py (modified) * src/sas/perspectives/calculator/media/density_tutor.gif (modified) Added Help button to density/Volume calculator panel and replace screen ... Sun, 01 Mar 2015 06:33:02 GMT butler [33f551f] * src/sas/perspectives/calculator/sld_panel.py (modified) minor fix on help button Sun, 01 Mar 2015 05:40:34 GMT butler [de69095] * src/sas/perspectives/calculator/data_operator.py (modified) Fix default position of data operations page and fix developer ... Sun, 01 Mar 2015 05:38:10 GMT butler [fc8f132] * src/sas/perspectives/calculator/sld_panel.py (modified) Add Help button to SLD panel and change default placement. Sun, 01 Mar 2015 05:16:32 GMT butler [c558b47] * src/sas/perspectives/calculator/data_operator.py (modified) * src/sas/perspectives/calculator/media/data_oper_pic.png (modified) added Help button to Data Operator Tool Panel and updated Help file with ... Sun, 01 Mar 2015 04:13:30 GMT butler [f1e80df] * src/sas/perspectives/calculator/calculator.py (modified) Removed old help function code that is no longer used Sun, 01 Mar 2015 04:12:57 GMT butler [3f5d75b] * src/sas/perspectives/calculator/gen_scatter_panel.py (modified) Fixed General Scattering Panel * Removed abandoned menu bar code * ... Sat, 28 Feb 2015 03:33:57 GMT butler [cfe472e] * build_tools/get_version.py (deleted) * build_tools/jenkins_linux_build.sh (modified) * build_tools/rpm/create_rpm_spec.py (deleted) * build_tools/rpm/sasview.spec.template (deleted) * sasview/__init__.py (modified) * src/sas/perspectives/fitting/fitting.py (modified) * src/sas/models/media/model_functions.rst (modified) Merge branch 'master' of https://github.com/SasView/sasview.git Sat, 28 Feb 2015 03:24:44 GMT butler [906a325] * src/sas/models/media/model_functions.rst (modified) Edited documentation to make clear that HPMSA model is the RMSA pursuant ... Wed, 25 Feb 2015 15:32:43 GMT Doucet, Mathieu [39356b5] * src/sas/perspectives/fitting/fitting.py (modified) The mechanism using set_default_perspective in plugins is broken. 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