# # ChangeLog for / in sasview # # Generated by Trac 1.0.1 # May 20, 2024 12:59:02 AM Thu, 05 Mar 2015 17:38:29 GMT Mathieu Doucet [3477478] * src/sas/plottools/PlotPanel.py (modified) * src/sas/plottools/PropertyDialog.py (modified) * src/sas/plottools/SimpleFont.py (modified) * src/sas/plottools/SizeDialog.py (modified) * src/sas/plottools/TextDialog.py (modified) * src/sas/plottools/convert_units.py (added) * src/sas/plottools/plottable_interactor.py (modified) * src/sas/plottools/plottables.py (modified) * src/sas/plottools/toolbar.py (modified) * src/sas/plottools/transform.py (modified) * src/sas/plottools/unitConverter.py (deleted) pylint fixes Thu, 05 Mar 2015 16:17:05 GMT Mathieu Doucet [2df0b74] * build_tools/pylint.rc (modified) * src/sas/plottools/BaseInteractor.py (modified) * src/sas/plottools/LabelDialog.py (modified) * src/sas/plottools/LineModel.py (modified) * src/sas/plottools/arrow3d.py (modified) * src/sas/plottools/binder.py (modified) * src/sas/plottools/canvas.py (modified) * src/sas/plottools/fitDialog.py (modified) * src/sas/plottools/fittings.py (modified) pylint fixes Thu, 05 Mar 2015 15:46:18 GMT Mathieu Doucet [dca6188] * build_tools/pylint.rc (modified) Turn off too-many-args warning since it doesn't make sense for a wx app. Thu, 05 Mar 2015 15:29:42 GMT Mathieu Doucet [78a205a] * src/sas/perspectives/invariant/help_panel.py (modified) * src/sas/perspectives/invariant/invariant.py (modified) * src/sas/perspectives/invariant/invariant_details.py (modified) * src/sas/perspectives/invariant/invariant_state.py (modified) * src/sas/perspectives/invariant/invariant_widgets.py (modified) * src/sas/perspectives/invariant/report_dialog.py (modified) pylint fixes Wed, 04 Mar 2015 20:47:21 GMT Doucet, Mathieu [74f419d] * build_tools/pylint.rc (modified) Ignore "lazy logging" warning. Wed, 04 Mar 2015 20:39:45 GMT Doucet, Mathieu [2f4b430] * src/sas/perspectives/fitting/batchfitpage.py (modified) * src/sas/perspectives/fitting/console.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/fitproblem.py (modified) * src/sas/perspectives/fitting/fitting.py (modified) * src/sas/perspectives/fitting/fitting_widgets.py (modified) * src/sas/perspectives/fitting/hint_fitpage.py (modified) * src/sas/perspectives/fitting/model_thread.py (modified) * src/sas/perspectives/fitting/models.py (modified) * src/sas/perspectives/fitting/pagestate.py (modified) * src/sas/perspectives/fitting/report_dialog.py (modified) * src/sas/perspectives/fitting/resultpanel.py (modified) * src/sas/perspectives/fitting/simfitpage.py (modified) Take care of white spaces (pylint) Wed, 04 Mar 2015 20:37:14 GMT Doucet, Mathieu [2f732b0] * src/sas/perspectives/calculator/aperture_editor.py (modified) pylint fixes Wed, 04 Mar 2015 20:28:39 GMT Doucet, Mathieu [49ab5d7] * src/sas/perspectives/calculator/aperture_editor.py (modified) * src/sas/perspectives/calculator/calculator.py (modified) * src/sas/perspectives/calculator/calculator_widgets.py (modified) * src/sas/perspectives/calculator/collimation_editor.py (modified) * src/sas/perspectives/calculator/console.py (modified) * src/sas/perspectives/calculator/data_editor.py (modified) * src/sas/perspectives/calculator/data_operator.py (modified) * src/sas/perspectives/calculator/density_panel.py (modified) * src/sas/perspectives/calculator/detector_editor.py (modified) * src/sas/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/perspectives/calculator/image_viewer.py (modified) * src/sas/perspectives/calculator/load_thread.py (modified) * src/sas/perspectives/calculator/model_editor.py (modified) * src/sas/perspectives/calculator/pyconsole.py (modified) * src/sas/perspectives/calculator/resolcal_thread.py (modified) * src/sas/perspectives/calculator/sample_editor.py (modified) * src/sas/perspectives/calculator/sld_panel.py (modified) * src/sas/perspectives/calculator/slit_length_calculator_panel.py (modified) * src/sas/perspectives/calculator/source_editor.py (modified) Take care of white spaces (pylint) Wed, 04 Mar 2015 19:20:18 GMT Doucet, Mathieu [76aed53] * src/sas/guiframe/data_processor.py (modified) pylint fixes Wed, 04 Mar 2015 18:50:03 GMT Doucet, Mathieu [af6b53c] * src/sas/perspectives/calculator/resolution_calculator_panel.py (modified) pylint fixes Wed, 04 Mar 2015 18:18:11 GMT Doucet, Mathieu [7cd87c2] * src/sas/perspectives/fitting/basepage.py (modified) pylint fixes and remove except followed by pass 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 21:07:08 GMT Doucet, Mathieu [e46cbc5] * build_tools/pylint.rc (modified) Update pylint.rc 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 18:59:43 GMT Doucet, Mathieu [d00294b] * build_tools/pylint.rc (modified) Update pylint.rc Tue, 03 Mar 2015 18:33:12 GMT Doucet, Mathieu [d176f9c] * build_tools/pylint.rc (modified) Update pylint.rc (was form an older version) 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:48:01 GMT Doucet, Mathieu [7425bcf] * sasview/welcome_panel.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 Mon, 02 Mar 2015 17:45:42 GMT Doucet, Mathieu [460f5f2] * build_tools/jenkins_osx_build.sh (modified) Tweak osx build Mon, 02 Mar 2015 17:35:11 GMT Doucet, Mathieu [9621a97] * build_tools/jenkins_linux_pylint.sh (modified) Make sure pylint works correctly Mon, 02 Mar 2015 17:09:07 GMT Doucet, Mathieu [e57a0ec] * build_tools/jenkins_osx_build.sh (modified) Run pylint Mon, 02 Mar 2015 16:38:11 GMT mathieu [a4974fa] * .travis.yml (modified) Testing github-jenkins plugin Mon, 02 Mar 2015 16:29:25 GMT Doucet, Mathieu [8a2e317] * build_tools/jenkins_osx_build.sh (added) Create osx build script Mon, 02 Mar 2015 16:12:06 GMT Doucet, Mathieu [c6cfcdb] * build_tools/jenkins_win32_py27_installer.bat (deleted) Remove script we are not using. Mon, 02 Mar 2015 14:57:27 GMT Doucet, Mathieu [fe8c46a] * build_tools/jenkins_win32_py27_build.bat (modified) Add installer build Mon, 02 Mar 2015 14:51:50 GMT Doucet, Mathieu [f89fa84] * build_tools/jenkins_win32_py27_build.bat (added) * build_tools/jenkins_win32_py27_installer.bat (added) Add windows build scripts Mon, 02 Mar 2015 14:36:57 GMT Doucet, Mathieu [517f3d4] * sasview/sasview.py (modified) Write stderr to sasview.log 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 ... Fri, 27 Feb 2015 21:14:15 GMT mathieu [4ddf30e4] * build_tools/jenkins_linux_build.sh (modified) Update jenkins_linux_build.sh 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. Wed, 25 Feb 2015 15:08:56 GMT Doucet, Mathieu [ce15ce4] * build_tools/get_version.py (deleted) * build_tools/rpm/create_rpm_spec.py (deleted) * build_tools/rpm/sasview.spec.template (deleted) The old rpm build needs to be redone entirely. Removing it. Wed, 25 Feb 2015 14:53:21 GMT Doucet, Mathieu [d859737] * build_tools/get_version.py (modified) * sasview/__init__.py (modified) Remove svn rev code. Tue, 24 Feb 2015 19:33:03 GMT Mathieu Doucet [caf3baa6] * sasview/local_config.py (modified) * sasview/sasview.py (modified) Remove crud that prevented sasview from starting as an OSX app Mon, 23 Feb 2015 14:45:41 GMT mathieu [7a88adc] * README.md (modified) Update README.md Add Travis-CI build status Mon, 23 Feb 2015 14:37:27 GMT mathieu [769a422] * test/sasfit/test/utest_multiplicative_model.py (modified) Update utest_multiplicative_model.py Change test so it doesn't import ... Mon, 23 Feb 2015 14:24:45 GMT mathieu [9a055d88] * build_tools/requirements.txt (modified) Update requirements.txt The xhtml2pdf version that we require is wrong, ... Mon, 23 Feb 2015 14:19:53 GMT mathieu [ffb1f01] * build_tools/requirements.txt (modified) Update requirements.txt Tweak pip reqs Mon, 23 Feb 2015 14:15:00 GMT mathieu [b89a109] * build_tools/requirements.txt (modified) Update requirements.txt Fix typo Mon, 23 Feb 2015 14:09:04 GMT mathieu [637d76d] * .travis.yml (modified) Update .travis.yml Use requirements.txt in Travis script Mon, 23 Feb 2015 14:08:18 GMT mathieu [3ecb4bb] * build_tools/requirements.txt (added) Update and rename build_tools to build_tools/requirements.txt Add ... Mon, 23 Feb 2015 14:01:44 GMT mathieu [039a5be] * .travis.yml (modified) Update .travis.yml Make sure our build script knows where it's running. Mon, 23 Feb 2015 13:57:53 GMT mathieu [eadd373] * .travis.yml (modified) Update .travis.yml add unit test reporting Mon, 23 Feb 2015 13:53:46 GMT mathieu [83b2227] * .travis.yml (modified) Update .travis.yml add pylint dependency Mon, 23 Feb 2015 13:32:03 GMT mathieu [27f8dac] * .travis.yml (modified) Update .travis.yml Tweak for Travis-CL Fri, 20 Feb 2015 21:35:19 GMT mathieu [3654779] * .travis.yml (modified) Update .travis.yml Fri, 20 Feb 2015 21:29:52 GMT mathieu [b199493] * .travis.yml (added) Trying travis cl 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:34:58 GMT pkienzle [59cdb7b] * park-1.2.1/Makefile (deleted) * park-1.2.1/README.txt (deleted) * park-1.2.1/park.epydoc (deleted) * park-1.2.1/park/__init__.py (deleted) * park-1.2.1/park/assembly.py (deleted) * park-1.2.1/park/data.py (deleted) * park-1.2.1/park/deps.py (deleted) * park-1.2.1/park/diffev.py (deleted) * park-1.2.1/park/expression.py (deleted) * park-1.2.1/park/fit.py (deleted) * park-1.2.1/park/fitmc.py (deleted) * park-1.2.1/park/fitresult.py (deleted) * park-1.2.1/park/fitservice.py (deleted) * park-1.2.1/park/formatnum.py (deleted) * park-1.2.1/park/lib/modeling.cc (deleted) * park-1.2.1/park/lib/resolution.c (deleted) * park-1.2.1/park/message.py (deleted) * park-1.2.1/park/model.py (deleted) * park-1.2.1/park/monitor.py (deleted) * park-1.2.1/park/parameter.py (deleted) * park-1.2.1/park/parkde.py (deleted) * park-1.2.1/park/parksnob.py (deleted) * park-1.2.1/park/peaks.py (deleted) * park-1.2.1/park/pmap.py (deleted) * park-1.2.1/park/rangemap.py (deleted) * park-1.2.1/park/serial.py (deleted) * park-1.2.1/park/setup.py (deleted) * park-1.2.1/park/simplex.py (deleted) * park-1.2.1/park/version.py (deleted) * park-1.2.1/park/wxmonitor.py (deleted) * park-1.2.1/setup.py (deleted) removing park from the tree Fri, 20 Feb 2015 10:34:27 GMT pkienzle [8a428fc] * test/pr_inversion/test/test_output.txt (modified) rename park_integration to sasfit Fri, 20 Feb 2015 10:26:23 GMT pkienzle [f9393dc] * run.py (modified) * setup.py (modified) remove park refs from build/run Fri, 20 Feb 2015 10:25:15 GMT pkienzle [c3caa49] * test/sasfit/test/PolySpheres.txt (moved) * test/sasfit/test/SILIC010_noheader.DAT (moved) * test/sasfit/test/batch_fit.py (moved) * test/sasfit/test/beam profile.DAT (moved) * test/sasfit/test/cyl_400_20.txt (moved) * test/sasfit/test/cyl_400_20_disp5r.txt (moved) * test/sasfit/test/cyl_400_40.txt (moved) * test/sasfit/test/cyl_testdata.txt (moved) * test/sasfit/test/cyl_testdata1.txt (moved) * test/sasfit/test/cylinder_data.txt (moved) * test/sasfit/test/latex_qdev.txt (moved) * test/sasfit/test/latex_qdev2.txt (moved) * test/sasfit/test/latex_smeared.xml (moved) * test/sasfit/test/sphere_80.txt (moved) * test/sasfit/test/sphere_test_data.txt (moved) * test/sasfit/test/testdata_cst.txt (moved) * test/sasfit/test/testdata_line.txt (moved) * test/sasfit/test/testdata_line1.txt (moved) * test/sasfit/test/testdata_line3.txt (moved) * test/sasfit/test/utest_fit_cylinder.py (moved) * test/sasfit/test/utest_fit_line.py (moved) * test/sasfit/test/utest_fit_smeared.py (moved) * test/sasfit/test/utest_multiplicative_model.py (moved) * test/sasfit/test/utest_small_test.py (moved) rename park_integration tests to sasfit tests 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.