# # ChangeLog for / in sasview # # Generated by Trac 1.0.1 # Dec 21, 2024 8:39:18 AM Wed, 15 Jun 2016 14:32:29 GMT Gonzalez, Miguel [ec30905] * build_tools/Makefile_RHEL7 (added) * build_tools/requirements.txt (modified) * build_tools/sasview.spec (added) * check_packages.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * setup.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (added) * src/sas/sascalc/dataloader/readers/defaults.json (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) Merge branch 'master' of https://github.com/SasView/sasview Fri, 10 Jun 2016 19:51:23 GMT wojciech [91afd87] * build_tools/jenkins_osx_build.sh (modified) Removed path to hdf5 Fri, 10 Jun 2016 13:32:58 GMT wojciech [47f6050e] * build_tools/jenkins_osx_build.sh (modified) Path to hdf5 added to jenkinks script Fri, 10 Jun 2016 13:06:52 GMT wojciech [3d8e3c7] * sasview/setup_mac.py (modified) h5py update in setup_mac.py Fri, 10 Jun 2016 10:19:35 GMT wojciech [da1ba29] * sasview/setup_mac.py (modified) Small fix in setup_mac.py Fri, 10 Jun 2016 09:17:43 GMT wojciech [a929b6b] * sasview/setup_mac.py (modified) h5py added to mac packages in setup_mac.py Thu, 09 Jun 2016 12:49:11 GMT krzywon [2815471] * sasview/setup_exe.py (modified) * build_tools/requirements.txt (modified) * setup.py (modified) Merge remote-tracking branch 'origin/master' Thu, 09 Jun 2016 12:47:54 GMT krzywon [785cc657] * build_tools/requirements.txt (modified) * setup.py (modified) Force h5py v2.5. Thu, 09 Jun 2016 12:25:38 GMT Piotr Rozyczko [abb02db] * sasview/setup_exe.py (modified) Added h5py to the library Wed, 08 Jun 2016 12:59:19 GMT krzywon [8effabe] * build_tools/Makefile_RHEL7 (added) * build_tools/sasview.spec (added) * check_packages.py (modified) * setup.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (added) * src/sas/sascalc/dataloader/readers/defaults.json (modified) Merge branch 'master' of https://github.com/SasView/sasview Tue, 07 Jun 2016 19:15:58 GMT Mathieu Doucet [7235c57] * build_tools/Makefile_RHEL7 (modified) Add RHEL7 makefile Tue, 07 Jun 2016 19:14:54 GMT Mathieu Doucet [9586bf9] * build_tools/Makefile_RHEL7 (added) * build_tools/sasview.spec (added) Add RHEL7 makefile Tue, 07 Jun 2016 17:20:29 GMT krzywon [ae308a4] * setup.py (modified) Add the h5py requirement in setup.py Tue, 07 Jun 2016 14:18:19 GMT krzywon [68aa210] * check_packages.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (added) * src/sas/sascalc/dataloader/readers/defaults.json (modified) Added a reader for 1D and 2D CanSAS v2.0 data in HDF5 format. Added the ... Thu, 02 Jun 2016 14:14:35 GMT Gonzalez, Miguel [b768e92] * .gitignore (modified) * build_tools/conda/bumps/meta.yaml (modified) * build_tools/jenkins_linux_build.sh (modified) * build_tools/jenkins_linux_build_ver02.sh (deleted) * build_tools/jenkins_linux_pylint_ver02.sh (deleted) * build_tools/jenkins_osx_build.sh (modified) * build_tools/jenkins_rhel6_build.sh (modified) * build_tools/jenkins_win32_build.bat (deleted) * build_tools/jenkins_win32_py27_build.bat (deleted) * build_tools/jenkins_win_build.bat (modified) * build_tools/jenkins_win_pylint.bat (deleted) * build_tools/requirements.txt (modified) * check_packages.py (modified) * docs/sphinx-docs/Makefile (modified) * sasview/README.txt (modified) * sasview/installer.iss (deleted) * sasview/installer_generator.py (modified) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/upcoming_formats/33837rear_1D_1.75_16.5_CanSAS1D.xml (added) * sasview/test/upcoming_formats/33837rear_1D_1.75_16.5_NXcanSAS.h5 (added) * sasview/test/upcoming_formats/33837rear_2D_1.75_16.5_NIST.dat (added) * sasview/test/upcoming_formats/33837rear_2D_1.75_16.5_NXcanSAS.h5 (added) * setup.py (modified) * src/sas/sascalc/calculator/c_extensions/librefl.c (modified) * src/sas/sascalc/calculator/c_extensions/sld2i.cpp (modified) * src/sas/sascalc/calculator/c_extensions/sld2i.hh (modified) * src/sas/sascalc/calculator/c_extensions/sld2i_module.cpp (modified) * src/sas/sascalc/calculator/c_extensions/winFuncs.c (deleted) * src/sas/sascalc/calculator/c_extensions/winFuncs.h (deleted) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/plugin_models/__init__.py (added) * src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) Merge branch 'master' of https://github.com/SasView/sasview Sat, 28 May 2016 14:24:24 GMT smk78 [70305bd2] * src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified) Fixed inconsistent use of q & Q in invariant_help.rst as highlighted by ... Fri, 27 May 2016 21:20:34 GMT Piotr Rozyczko [bb841ef] * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) Fixed a typo in import names Fri, 27 May 2016 11:51:44 GMT piotr [b4994b7] * build_tools/jenkins_win_build.bat (modified) Added tinycc to the windows build Wed, 25 May 2016 08:51:03 GMT wojciech [1be5202] * sasview/sasview.py (modified) Added .sasview mkdir in sasview.py so the program doesn't complain about ... Tue, 24 May 2016 15:27:31 GMT Paul Kienzle [9528caa] * sasview/setup_exe.py (modified) include tinycc in build, if available; support 64-bit python Tue, 24 May 2016 11:56:32 GMT trnielsen [f225cc1] * build_tools/jenkins_linux_build_ver02.sh (deleted) * build_tools/jenkins_linux_pylint_ver02.sh (deleted) Removed jenkins_linux_build_ver02.sh and jenkins_linux_pylint_ver02.sh Tue, 24 May 2016 11:28:59 GMT trnielsen [bf3ca1e] * build_tools/jenkins_linux_build.sh (modified) Update linux build scripts. Pylint does not work. Tue, 24 May 2016 10:58:08 GMT trnielsen [b6f563b4] * build_tools/jenkins_linux_build.sh (modified) * build_tools/jenkins_win32_py27_build.bat (deleted) * build_tools/jenkins_win_pylint.bat (deleted) Update linux build script. Deleted jenkins_win32_py27_build.bat and ... Mon, 23 May 2016 22:48:46 GMT Paul Kienzle [934ce649] * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) make sure errors in compute get reported to user Mon, 23 May 2016 20:16:41 GMT wojciech [52b7fd9] * build_tools/jenkins_osx_build.sh (modified) PYTHONPATH modified in jenkins osx script, so proper version of six is ... Mon, 23 May 2016 13:16:32 GMT wojciech [7c752d0e] * sasview/setup_mac.py (modified) pyopencl package added to mac installer Sat, 21 May 2016 00:37:27 GMT Paul Kienzle [5dfbb24] * .gitignore (modified) * build_tools/jenkins_win32_build.bat (deleted) * sasview/installer.iss (deleted) * sasview/setup_exe.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) Merge branch 'master' of github.com:sasview/sasview Sat, 21 May 2016 00:37:21 GMT Paul Kienzle [26d6e045] * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) make sure compiler/test errors on custom models are reported to the user Fri, 20 May 2016 13:53:09 GMT piotr [230178b] * sasview/setup_exe.py (modified) added pyopencl include files Thu, 19 May 2016 09:33:08 GMT Piotr Rozyczko [0c10782] * sasview/setup_exe.py (modified) Exclude build machine specific opencl.dll Wed, 18 May 2016 14:44:30 GMT mathieu [faa3ae7] * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) Update data_loader.py Wed, 18 May 2016 14:42:29 GMT mathieu [af09f48] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) update cansas reader for better error handling Wed, 18 May 2016 10:02:45 GMT trnielsen [9194009] * build_tools/jenkins_win32_build.bat (deleted) Reemove jenkins_win32_build.bat. Not used Fri, 13 May 2016 06:40:14 GMT Piotr Rozyczko [e04f87b] * .gitignore (modified) * sasview/installer.iss (deleted) removed autogenerated installer.iss Wed, 11 May 2016 17:38:48 GMT Paul Kienzle [cd54205] * src/sas/sasgui/plottools/plottables.py (modified) don't fail even when transformed data is empty Wed, 11 May 2016 13:09:46 GMT smk78 [a9946e9] * sasview/test/upcoming_formats/33837rear_1D_1.75_16.5_CanSAS1D.xml (added) * sasview/test/upcoming_formats/33837rear_1D_1.75_16.5_NXcanSAS.h5 (added) * sasview/test/upcoming_formats/33837rear_2D_1.75_16.5_NIST.dat (added) * sasview/test/upcoming_formats/33837rear_2D_1.75_16.5_NXcanSAS.h5 (added) Added 1D & 2D NXcanSAS test data sets + same data in existing CanSAS and ... Wed, 11 May 2016 10:18:18 GMT trnielsen [9f441a9] * build_tools/jenkins_win_build.bat (modified) Update windows build script Tue, 10 May 2016 08:50:44 GMT wojciech [c5d1c37] * build_tools/jenkins_osx_build.sh (modified) Fixed commented tests Tue, 10 May 2016 07:10:35 GMT piotr [7e76afe] * sasview/setup_exe.py (modified) Minor syntax fixes. Mon, 09 May 2016 11:58:58 GMT wojciech [aa4a549] * sasview/setup_mac.py (modified) It points to __init__.py in sasmodels dir now Mon, 09 May 2016 10:59:33 GMT wojciech [3371d81] * check_packages.py (modified) * docs/sphinx-docs/Makefile (modified) * sasview/installer_generator.py (modified) * sasview/setup_exe.py (modified) * setup.py (modified) * src/sas/sascalc/calculator/c_extensions/librefl.c (modified) * src/sas/sascalc/calculator/c_extensions/sld2i.cpp (modified) * src/sas/sascalc/calculator/c_extensions/sld2i.hh (modified) * src/sas/sascalc/calculator/c_extensions/sld2i_module.cpp (modified) * src/sas/sascalc/calculator/c_extensions/winFuncs.c (deleted) * src/sas/sascalc/calculator/c_extensions/winFuncs.h (deleted) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * build_tools/jenkins_osx_build.sh (modified) * sasview/setup_mac.py (modified) setup.py fixed. Merged with Master Fri, 06 May 2016 20:37:54 GMT Paul Kienzle [1d5f5c2] * docs/sphinx-docs/Makefile (modified) protect against spaces in path to make command Fri, 06 May 2016 20:25:35 GMT Paul Kienzle [a24bd6e] * src/sas/sascalc/calculator/c_extensions/winFuncs.c (deleted) * src/sas/sascalc/calculator/c_extensions/winFuncs.h (deleted) winFuncs no longer needed; erf moved directly into librefl.c Fri, 06 May 2016 20:23:48 GMT Paul Kienzle [96e151f] * check_packages.py (modified) don't fail check_packages if PIL is not available Fri, 06 May 2016 20:23:08 GMT Paul Kienzle [e791cca] * setup.py (modified) remove numpy.distutils from the build Fri, 06 May 2016 20:22:36 GMT Paul Kienzle [f567f92f] * setup.py (modified) numpy not included in C code, so no need for numpy headers Fri, 06 May 2016 20:19:24 GMT Paul Kienzle [b523c0e] * src/sas/sascalc/calculator/c_extensions/sld2i.cpp (modified) * src/sas/sascalc/calculator/c_extensions/sld2i_module.cpp (modified) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) remove compiler warnings Fri, 06 May 2016 16:43:26 GMT Paul Kienzle [4c29e4d] * setup.py (modified) * src/sas/sascalc/calculator/c_extensions/librefl.c (modified) * src/sas/sascalc/calculator/c_extensions/sld2i.hh (modified) remove compiler warnings from mac build Fri, 06 May 2016 07:09:58 GMT Paul Kienzle [6a698c0] * sasview/installer_generator.py (modified) * sasview/setup_exe.py (modified) refactor support for precompiled models in windows Thu, 05 May 2016 18:39:28 GMT mathieu [5f6336f] * setup.py (modified) Update setup.py Tue, 03 May 2016 09:40:35 GMT Piotr Rozyczko [ddf571d] * sasview/installer_generator.py (modified) Copy precompiled models to user accessible location. Mon, 02 May 2016 14:39:08 GMT mathieu [775d06f] * setup.py (modified) Update setup.py with new name for PIL Thu, 28 Apr 2016 11:38:05 GMT wojciech [aff7904] * build_tools/conda/bumps/meta.yaml (modified) * build_tools/jenkins_linux_build.sh (modified) * build_tools/jenkins_linux_build_ver02.sh (modified) * build_tools/jenkins_osx_build.sh (modified) * build_tools/jenkins_rhel6_build.sh (modified) * build_tools/jenkins_win32_build.bat (modified) * build_tools/jenkins_win32_py27_build.bat (modified) * build_tools/requirements.txt (modified) * check_packages.py (modified) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/default_categories.json (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * setup.py (modified) * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/plugin_models/__init__.py (added) * src/sas/sasgui/plottools/PlotPanel.py (modified) Conflicts fixed, merged with master Thu, 28 Apr 2016 11:29:38 GMT wojciech [5881b17] * build_tools/jenkins_osx_build.sh (modified) * sasview/setup_mac.py (modified) * setup.py (modified) Setup changes to make mac running Tue, 26 Apr 2016 10:08:48 GMT trnielsen [259aaa0] * build_tools/jenkins_osx_build.sh (modified) Update OS_X build script Tue, 26 Apr 2016 09:44:05 GMT trnielsen [873e630] * build_tools/jenkins_osx_build.sh (modified) Update OS X build script Tue, 26 Apr 2016 09:19:52 GMT trnielsen [628acad] * sasview/setup_mac.py (modified) Updating inclusion of sasmodels.models to fit new sasview - sasmodels ... Tue, 26 Apr 2016 08:41:22 GMT trnielsen [a7c4ad2] * sasview/setup_exe.py (modified) * setup.py (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/plugin_models/__init__.py (added) Fixed some Windows issues for setupSasView.exe by reversing earlier ... Fri, 22 Apr 2016 20:27:10 GMT Paul Kienzle [243fbc0] * build_tools/conda/bumps/meta.yaml (modified) * build_tools/jenkins_linux_build.sh (modified) * build_tools/jenkins_linux_build_ver02.sh (modified) * build_tools/jenkins_rhel6_build.sh (modified) * build_tools/jenkins_win32_build.bat (modified) * build_tools/jenkins_win32_py27_build.bat (modified) * build_tools/requirements.txt (modified) * check_packages.py (modified) * sasview/README.txt (modified) * setup.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) move bumps version to 0.7.5.9 Fri, 22 Apr 2016 19:55:08 GMT Paul Kienzle [05228b0] * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) use the new bumps fitter changed event to update the active fitter ... Tue, 19 Apr 2016 21:40:36 GMT Paul Kienzle [4188da8] * check_packages.py (modified) update bumps dependency to 0.7.5.8 Mon, 18 Apr 2016 16:02:01 GMT gonzalezm [6afc14b] * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/default_categories.json (modified) * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) Merge branch 'master' of https://github.com/SasView/sasview Sat, 16 Apr 2016 20:28:15 GMT butler [42585bf] * sasview/default_categories.json (modified) oops ..renabled by default. should now be ready for alpha release. ... Sat, 16 Apr 2016 20:17:47 GMT butler [a724bfb] * sasview/default_categories.json (modified) add all models to original default categories for alpha release Sat, 16 Apr 2016 16:40:41 GMT butler [16b769b] * src/sas/sasgui/plottools/PlotPanel.py (modified) Fixes - copy plot to clipboard was silently failing since July 2015 ... Wed, 13 Apr 2016 13:23:07 GMT Paul Kienzle [cb4ef58] * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) remove references to internal _model_info attribute from sasview Tue, 12 Apr 2016 20:13:13 GMT krzywon [fa4ea80] * sasview/README.txt (modified) * sasview/__init__.py (modified) Updated version number for alpha release and added release notes. Tue, 12 Apr 2016 09:23:39 GMT wojciech [70be725] * build_tools/jenkins_osx_build.sh (modified) * sasview/setup_mac.py (modified) Build script fixes Fri, 08 Apr 2016 08:58:38 GMT gonzalezm [70e5f97] * build_tools/jenkins_osx_build.sh (modified) * check_packages.py (modified) * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/optimizer.rst (modified) * docs/sphinx-docs/source/user/shape-sphere.rst (modified) * setup.py (modified) * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sascalc/calculator/c_extensions/libfunc.c (modified) * src/sas/sascalc/calculator/c_extensions/libfunc.h (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (modified) * src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (modified) * src/sas/sasgui/perspectives/fitting/media/mag_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (modified) * src/sas/sasgui/perspectives/fitting/media/new_model.bmp (modified) * src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (modified) * src/sas/sasgui/perspectives/fitting/media/view_button.bmp (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) Merge branch 'master' of https://github.com/SasView/sasview Fri, 08 Apr 2016 07:44:36 GMT trnielsen [1780d8b] * build_tools/jenkins_osx_build.sh (modified) Update OS_X build script to the new code structure Tue, 05 Apr 2016 14:33:17 GMT Paul Kienzle [dcdca68] * src/sas/sasgui/perspectives/fitting/models.py (modified) adjust to new sasmodels interface Tue, 29 Mar 2016 15:27:51 GMT smk78 [eca66a1] * src/sas/sasgui/perspectives/fitting/media/mag_help.rst (modified) Updated names of models in mag_help.rst for which magnetic contribution ... Tue, 29 Mar 2016 08:31:12 GMT wojciech [b6c8abe] * src/sas/sascalc/calculator/c_extensions/libfunc.c (modified) * src/sas/sascalc/calculator/c_extensions/libfunc.h (modified) Removed dead-end functions from libfunc Tue, 29 Mar 2016 07:53:15 GMT wojciech [c31dcdb1] * check_packages.py (modified) * setup.py (modified) * src/sas/sascalc/calculator/c_extensions/libfunc.c (modified) Merge branch 'master' of https://github.com/SasView/sasview Thu, 24 Mar 2016 18:48:02 GMT krzywon [8e7044c] * check_packages.py (modified) Changed check_packages to include latest version of bumps. Thu, 24 Mar 2016 17:20:08 GMT smk78 [c8843be] * setup.py (modified) Modified setup.py to force it to remove the sasview build directory ... Thu, 24 Mar 2016 07:38:02 GMT wojciech [273a6d7] * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/optimizer.rst (modified) * docs/sphinx-docs/source/user/shape-sphere.rst (modified) * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (modified) * src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (modified) * src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (modified) * src/sas/sasgui/perspectives/fitting/media/new_model.bmp (modified) * src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (modified) * src/sas/sasgui/perspectives/fitting/media/view_button.bmp (modified) * src/sas/sascalc/calculator/c_extensions/libfunc.c (modified) Merge branch 'master' of https://github.com/SasView/sasview Thu, 24 Mar 2016 07:37:55 GMT wojciech [197260f] * src/sas/sascalc/calculator/c_extensions/libfunc.c (modified) Libfunc cleaned up Wed, 23 Mar 2016 12:38:33 GMT smk78 [e81f6dd] * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/optimizer.rst (modified) Label optimizer-burn added (by someone, not me!) Wed, 23 Mar 2016 12:31:59 GMT smk78 [5e15bca] * docs/sphinx-docs/source/user/shape-sphere.rst (modified) * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (added) * src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (added) * src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (added) * src/sas/sasgui/perspectives/fitting/media/new_model.bmp (added) * src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (added) * src/sas/sasgui/perspectives/fitting/media/view_button.bmp (added) Restore uncorrupted image files Wed, 23 Mar 2016 12:24:26 GMT smk78 [96b5f8de] * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (deleted) * src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/new_model.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (deleted) * src/sas/sasgui/perspectives/fitting/media/view_button.bmp (deleted) Removing corrupt image files Tue, 22 Mar 2016 17:52:34 GMT butler [468c253] * src/sas/sasgui/guiframe/data_processor.py (modified) Fixes image not loading in dev docs. Problem is all images are slurped ... Tue, 22 Mar 2016 13:58:06 GMT butler [3a71472] * src/sas/sasgui/guiframe/data_processor.py (modified) still cannot load image but fixed "note" directive. relates #318 Tue, 22 Mar 2016 13:57:13 GMT butler [53aa66d] * src/sas/sascalc/calculator/BaseComponent.py (modified) This should fix problems Steve King saw in doc building (point 1 and 2 ... Tue, 22 Mar 2016 13:55:49 GMT butler [6de5e10] * docs/sphinx-docs/build_sphinx.py (modified) Fixes a couple of instances of not creating source directories -- may be ... Tue, 22 Mar 2016 10:54:13 GMT wojciech [75898d4] * src/sas/sascalc/calculator/c_extensions/libfunc.c (modified) Removing gammap function Mon, 21 Mar 2016 20:37:11 GMT gonzalezm [be2775f] * docs/sphinx-docs/build_sphinx.py (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_gui_help.bmp (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mag_vector.bmp (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mag_vector.bmp (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/new_model.bmp (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/plot_button.bmp (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/view_button.bmp (modified) * docs/sphinx-docs/source/user/shape-sphere.rst (modified) * docs/sphinx-docs/source/user/user.rst (modified) * setup.py (modified) * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) Merge branch 'master' of https://github.com/SasView/sasview Mon, 21 Mar 2016 18:18:30 GMT smk78 [a8787f9] * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_gui_help.bmp (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mag_vector.bmp (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mag_vector.bmp (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/new_model.bmp (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/plot_button.bmp (modified) * docs/sphinx-docs/source/user/sasgui/perspectives/fitting/view_button.bmp (modified) Not sure these need to be checked in but doing so wont hurt - not sure ... Mon, 21 Mar 2016 18:17:11 GMT smk78 [61991ed] * docs/sphinx-docs/source/user/shape-sphere.rst (modified) Updated Mon, 21 Mar 2016 18:05:36 GMT smk78 [74c5521] * src/sas/sascalc/calculator/BaseComponent.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) Fixing docstring errors Mon, 21 Mar 2016 18:04:34 GMT smk78 [5a71761] * docs/sphinx-docs/source/user/user.rst (modified) Removed (4.x.x) annotation from link to model documentation Mon, 21 Mar 2016 18:03:30 GMT smk78 [5420ef6] * docs/sphinx-docs/build_sphinx.py (modified) Fix to docs build errors resulting from reorganisation of image file ... Mon, 21 Mar 2016 17:33:44 GMT krzywon [9274711] * setup.py (modified) Remove call to add sas.models directory from build script after moving ... Mon, 21 Mar 2016 17:15:51 GMT gonzalezm [d85b0c7] * src/sas/sasgui/perspectives/fitting/models.py (modified) Do not force recompilation of python files in plugin_models folder to ... Mon, 21 Mar 2016 16:07:25 GMT krzywon [f60251f] * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) Resolves #434 - Display the active fit optimizer on the fit panel. Mon, 21 Mar 2016 15:01:57 GMT smk78 [f603bec] * docs/sphinx-docs/build_sphinx.py (modified) Accommodate change of folders for imgs Mon, 21 Mar 2016 14:57:29 GMT gonzalezm [aa03e0d] * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) Fix call to make_class in template for sum of 2 models Mon, 21 Mar 2016 14:52:33 GMT ajj [6b1b1cc] * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) Fixing easy sum/multi to work with new code layout Mon, 21 Mar 2016 14:44:14 GMT smk78 [65dfa99] * src/sas/sasgui/guiframe/media/graph_help.copy (added) * src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.copy (added) * src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.copy (added) * src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.copy (added) * src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.copy (added) * src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.copy (added) * src/sas/sasgui/perspectives/fitting/media/fitting_help.copy (added) * src/sas/sasgui/perspectives/fitting/media/mag_help.copy (added) * src/sas/sasgui/perspectives/fitting/media/pd_help.copy (added) * src/sas/sasgui/perspectives/fitting/media/residuals_help.copy (added) * src/sas/sasgui/perspectives/fitting/media/sm_help.copy (added) * src/sas/sasgui/perspectives/invariant/media/invariant_help.copy (added) * src/sas/sasgui/perspectives/pr/media/pr_help.copy (added) Restore accidentally deleted files - 2 Mon, 21 Mar 2016 14:43:27 GMT smk78 [0020ba4] * src/sas/sasgui/perspectives/calculator/media/gen_gui_help.bmp (modified) * src/sas/sasgui/perspectives/calculator/media/mag_vector.bmp (modified) * src/sas/sasgui/perspectives/fitting/media/mag_vector.bmp (modified) * src/sas/sasgui/perspectives/fitting/media/new_model.bmp (modified) * src/sas/sasgui/perspectives/fitting/media/plot_button.bmp (modified) * src/sas/sasgui/perspectives/fitting/media/view_button.bmp (modified) Restore accidentally deleted files