#
# ChangeLog for src/sas/sasgui/guiframe in sasview
#
# Generated by Trac 1.0.1
# Jan 10, 2025 2:08:28 AM

Tue, 11 Apr 2017 12:01:57 GMT GitHub <noreply@…> [b854587]
	* Vagrantfile (modified)
	* Vagrantprovision.sh (modified)
	* check_packages.py (modified)
	* docs/sasview/Tutorial.pdf (modified)
	* docs/sasview/Tutorial.pptx (modified)
	* docs/sasview/Tutorial_SV2.pdf (moved)
	* docs/sasview/Tutorial_SV2.pptx (moved)
	* docs/sasview/Tutorial_SV3.pdf (added)
	* docs/sasview/Tutorial_SV3.pptx (added)
	* docs/sphinx-docs/build_sphinx.py (modified)
	* docs/sphinx-docs/source/user/tutorial.rst (modified)
	* docs/sphinx-docs/source/user/working.rst (modified)
	* sasview/local_config.py (modified)
	* sasview/media/README.txt (modified)
	* sasview/media/Tutorial.pdf (modified)
	* sasview/media/getting_started_with_sasview.pdf (added)
	* sasview/setup_mac.py (modified)
	* sasview/welcome_panel.py (modified)
	* setup.py (modified)
	* src/sas/sascalc/calculator/kiessig_calculator.py (modified)
	* src/sas/sascalc/calculator/resolution_calculator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/file_converter/cansas_writer.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/fit/MultiplicationModel.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sascalc/realspace/VolumeCanvas.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_processor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified)
	* src/sas/sasgui/guiframe/panel_base.py (modified)
	* src/sas/sasgui/guiframe/plugin_base.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/guiframe/utils.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_operator.py (modified)
	* src/sas/sasgui/perspectives/calculator/density_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/sld_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/pr/pr_thread.py (modified)
	* src/sas/sasgui/perspectives/simulation/simulation.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/TextDialog.py (modified)
	* src/sas/sasgui/plottools/arrow3d.py (modified)
	* src/sas/sasgui/plottools/canvas.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/fittings.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasgui/plottools/transform.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasrealspace/test/sim_validation.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)
	* run.py (modified)
	* sasview/logger_config.py (added)
	* sasview/logging.ini (modified)
	* sasview/sasview.py (modified)
	* sasview/setup_exe.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)

	Merge branch 'master' into pytest


Sun, 09 Apr 2017 12:48:35 GMT ajj [d26f025]
	* check_packages.py (modified)
	* docs/pandoc-docs/Makefile (added)
	* docs/pandoc-docs/build_pandoc.py (added)
	* docs/pandoc-docs/source/README.txt (added)
	* sasview/media/README.txt (modified)
	* sasview/setup_mac.py (modified)
	* sasview/welcome_panel.py (modified)
	* src/sas/sascalc/calculator/kiessig_calculator.py (modified)
	* src/sas/sascalc/calculator/resolution_calculator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/file_converter/cansas_writer.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/fit/MultiplicationModel.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sascalc/realspace/VolumeCanvas.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_processor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified)
	* src/sas/sasgui/guiframe/panel_base.py (modified)
	* src/sas/sasgui/guiframe/plugin_base.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/guiframe/utils.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_operator.py (modified)
	* src/sas/sasgui/perspectives/calculator/density_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/sld_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/pr/pr_thread.py (modified)
	* src/sas/sasgui/perspectives/simulation/simulation.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/TextDialog.py (modified)
	* src/sas/sasgui/plottools/arrow3d.py (modified)
	* src/sas/sasgui/plottools/canvas.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/fittings.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasgui/plottools/transform.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasrealspace/test/sim_validation.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)
	* sasview/local_config.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)

	Merge branch 'master' of https://www.github.com/sasview/sasview


Sun, 09 Apr 2017 12:47:21 GMT ajj [ea45bfe]
	* sasview/local_config.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)

	Changing link for list of contributors to point to website.

	Website ...


Sun, 09 Apr 2017 10:30:10 GMT andyfaff [45dffa69]
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)

	MAINT: more 'not x is None' fixes


Sun, 09 Apr 2017 10:11:31 GMT andyfaff [7432acb]
	* sasview/welcome_panel.py (modified)
	* src/sas/sascalc/calculator/resolution_calculator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/file_converter/cansas_writer.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/MultiplicationModel.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_processor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified)
	* src/sas/sasgui/guiframe/plugin_base.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/guiframe/utils.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_operator.py (modified)
	* src/sas/sasgui/perspectives/calculator/density_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/sld_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/simulation/simulation.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/TextDialog.py (modified)
	* src/sas/sasgui/plottools/arrow3d.py (modified)
	* src/sas/sasgui/plottools/canvas.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasgui/plottools/transform.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)

	MAINT: search+replace '!= None' by 'is not None'


Sun, 09 Apr 2017 10:08:43 GMT andyfaff [ac07a3a]
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sasgui/guiframe/data_processor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/pr/pr_thread.py (modified)
	* src/sas/sasgui/plottools/fittings.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sasrealspace/test/sim_validation.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)

	MAINT: replace 'not x is None' by 'x is not None'


Sun, 09 Apr 2017 09:46:10 GMT andyfaff [235f514]
	* check_packages.py (modified)
	* sasview/setup_mac.py (modified)
	* src/sas/sascalc/calculator/kiessig_calculator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/file_converter/cansas_writer.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/fit/MultiplicationModel.py (modified)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sascalc/realspace/VolumeCanvas.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_processor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified)
	* src/sas/sasgui/guiframe/panel_base.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_operator.py (modified)
	* src/sas/sasgui/perspectives/calculator/density_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/pr/pr_thread.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/fittings.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasgui/plottools/transform.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sasrealspace/test/sim_validation.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)

	MAINT: replace '== None' by 'is None'


Sun, 09 Apr 2017 08:58:36 GMT wojciech [e645bbb]
	* src/sas/sasgui/guiframe/data_processor.py (modified)

	Fixed order of imports


Sun, 09 Apr 2017 07:45:49 GMT Ricardo Ferraz Leal <ricleal@…> [38beeab]
	* run.py (modified)
	* sasview/logger_config.py (added)
	* sasview/logging.ini (modified)
	* sasview/sasview.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)

	Logger is now a separate file


Sat, 08 Apr 2017 11:38:12 GMT wojciech [686279d]
	* src/sas/sasgui/guiframe/data_processor.py (modified)

	Quick fix for numpy that caused problems in batch fitting


Sat, 08 Apr 2017 08:37:19 GMT ajj [959eb01]
	* docs/sphinx-docs/source/conf.py (modified)
	* docs/sphinx-docs/source/dev/dev.rst (modified)
	* docs/sphinx-docs/source/user/analysis.rst (modified)
	* docs/sphinx-docs/source/user/marketplace.rst (modified)
	* docs/sphinx-docs/source/user/menu_bar.rst (modified)
	* docs/sphinx-docs/source/user/tools.rst (modified)
	* docs/sphinx-docs/source/user/tutorial.rst (modified)
	* docs/sphinx-docs/source/user/user.rst (modified)
	* docs/sphinx-docs/source/user/working.rst (modified)
	* sasview/custom_config.py (modified)
	* sasview/installer_generator.py (modified)
	* sasview/setup_mac.py (modified)
	* sasview/welcome_panel.py (modified)
	* src/examples/data_generator/test_transfo.py (modified)
	* src/examples/data_generator/testdata_generator.py (modified)
	* src/examples/test_chisq_panel.py (modified)
	* src/examples/test_copy_print.py (modified)
	* src/examples/test_text_panel.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/IgorReader.py (modified)
	* src/sas/sascalc/dataloader/readers/__init__.py (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/hfir1d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/nexus_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/red2d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/tiff_reader.py (modified)
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/invariant/invariant_mapper.py (modified)
	* src/sas/sascalc/pr/__init__.py (modified)
	* src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified)
	* src/sas/sascalc/pr/c_extensions/__init__.py (modified)
	* src/sas/sascalc/pr/c_extensions/invertor.c (modified)
	* src/sas/sascalc/pr/c_extensions/invertor.h (modified)
	* src/sas/sascalc/pr/distance_explorer.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sascalc/realspace/VolumeCanvas.py (modified)
	* src/sas/sascalc/realspace/__init__.py (modified)
	* src/sas/sascalc/simulation/geoshapespy/libgeoshapespy/minmax.h (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/test2dui.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testcomplexmodel.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testlores.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testlores2d.py (modified)
	* src/sas/sascalc/simulation/pointsmodelpy/tests/testnegativepr.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/__init__.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/custom_pstats.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/data_state.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/dummyapp.py (modified)
	* src/sas/sasgui/guiframe/events.py (modified)
	* src/sas/sasgui/guiframe/gui_style.py (modified)
	* src/sas/sasgui/guiframe/gui_toolbar.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/__init__.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/BaseInteractor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/__init__.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified)
	* src/sas/sasgui/guiframe/media/data_formats_help.rst (modified)
	* src/sas/sasgui/guiframe/panel_base.py (modified)
	* src/sas/sasgui/guiframe/pdfview.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/guiframe/utils.py (modified)
	* src/sas/sasgui/perspectives/calculator/__init__.py (modified)
	* src/sas/sasgui/perspectives/calculator/aperture_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator_widgets.py (modified)
	* src/sas/sasgui/perspectives/calculator/collimation_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/console.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_operator.py (modified)
	* src/sas/sasgui/perspectives/calculator/density_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/detector_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/load_thread.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/sample_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/sld_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/source_editor.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (modified)
	* src/sas/sasgui/perspectives/fitting/__init__.py (modified)
	* src/sas/sasgui/perspectives/fitting/console.py (modified)
	* src/sas/sasgui/perspectives/fitting/fit_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitproblem.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting_widgets.py (modified)
	* src/sas/sasgui/perspectives/fitting/hint_fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/fitting/resultpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/utils.py (modified)
	* src/sas/sasgui/perspectives/invariant/__init__.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_details.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_widgets.py (modified)
	* src/sas/sasgui/perspectives/invariant/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/__init__.py (modified)
	* src/sas/sasgui/perspectives/pr/explore_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/pr/pr_thread.py (modified)
	* src/sas/sasgui/perspectives/pr/pr_widgets.py (modified)
	* src/sas/sasgui/perspectives/simulation/ShapeAdapter.py (modified)
	* src/sas/sasgui/perspectives/simulation/SimCanvas.py (modified)
	* src/sas/sasgui/perspectives/simulation/__init__.py (modified)
	* src/sas/sasgui/perspectives/simulation/simulation.py (modified)
	* src/sas/sasgui/plottools/BaseInteractor.py (modified)
	* src/sas/sasgui/plottools/LabelDialog.py (modified)
	* src/sas/sasgui/plottools/LineModel.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/PropertyDialog.py (modified)
	* src/sas/sasgui/plottools/SizeDialog.py (modified)
	* src/sas/sasgui/plottools/TextDialog.py (modified)
	* src/sas/sasgui/plottools/arrow3d.py (modified)
	* src/sas/sasgui/plottools/convert_units.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/fittings.py (modified)
	* src/sas/sasgui/plottools/plottable_interactor.py (modified)
	* src/sas/sasgui/plottools/toolbar.py (modified)
	* src/sas/sasgui/plottools/transform.py (modified)
	* test/README.rst (modified)
	* test/calculatorview/test/utest_gui_sld.py (modified)
	* test/calculatorview/test/utest_sld.py (modified)
	* test/pr_inversion/test/utest_explorer.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sascalculator/test/utest_resolution_calculator.py (modified)
	* test/sascalculator/test/utest_sas_gen.py (modified)
	* test/sascalculator/test/utest_slit_length_calculator.py (modified)
	* test/sasdataloader/plugins/test_reader.py (modified)
	* test/sasdataloader/test/error_conditions.py (modified)
	* test/sasdataloader/test/sequence_tests.py (modified)
	* test/sasdataloader/test/testLoad.py (modified)
	* test/sasdataloader/test/testplugings.py (modified)
	* test/sasdataloader/test/utest_ascii.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasdataloader/test/utest_red2d_reader.py (modified)
	* test/sasguiframe/test/utest_manipulations.py (modified)
	* test/sasinvariant/test/utest_use_cases.py (modified)
	* test/sasrealspace/test/early_test.py (modified)
	* test/sasrealspace/test/sim_validation.py (modified)
	* test/sasrealspace/test/utest_oriented.py (modified)
	* test/sasrealspace/test/utest_realspace.py (modified)
	* test/utest_sasview.py (modified)

	normalising line endings


Fri, 07 Apr 2017 05:33:11 GMT GitHub <noreply@…> [bb81385]
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)

	Merge pull request #65 from andyfaff/not_is

	MAINT: use 'x is not None', ...


Fri, 07 Apr 2017 04:25:27 GMT andyfaff [49165488]
	* src/sas/sasgui/guiframe/gui_manager.py (modified)

	MAINT: None is a default argument to dict.get


Fri, 07 Apr 2017 04:13:51 GMT andyfaff [c1d5aea]
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)

	MAINT: use 'x is not None', instead of 'not x is None'.


Thu, 06 Apr 2017 13:10:22 GMT smk78 [76c4469]
	* src/sas/sasgui/guiframe/media/data_formats_help.rst (modified)

	Fixed some failing superscripts in SESANS section of ...


Wed, 05 Apr 2017 16:56:22 GMT GitHub <noreply@…> [5e2f36c]
	* .gitignore (modified)
	* run.py (modified)
	* sasview/__init__.py (modified)
	* sasview/local_config.py (modified)
	* sasview/logging.ini (added)
	* sasview/sasview.py (modified)
	* src/sas/sascalc/calculator/resolution_calculator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sascalc/dataloader/loader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/tiff_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/CategoryManager.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/gui_statusbar.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified)
	* src/sas/sasgui/guiframe/proxy.py (modified)
	* src/sas/sasgui/guiframe/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/file_converter/file_converter.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/invariant/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/explore_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/simulation/simulation.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/binder.py (modified)
	* src/sas/sasgui/plottools/canvas.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasgui/plottools/toolbar.py (modified)
	* test/fileconverter/test/export2d.h5 (modified)
	* test/logging.ini (added)
	* test/run_one.py (modified)
	* test/sasdataloader/test/isis_1_0_write_test.xml (modified)
	* test/sasdataloader/test/isis_1_1_write_test.xml (modified)
	* test/sasdataloader/test/testLoad.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasdataloader/test/write_test.xml (modified)
	* test/utest_sasview.py (modified)
	* .travis.yml (modified)
	* src/sas/sasgui/guiframe/media/data_formats_help.rst (modified)

	Merge pull request #61 from SasView/logger

	Logger fixes #916


Wed, 05 Apr 2017 15:09:53 GMT smk78 [98c44f3]
	* src/sas/sasgui/guiframe/media/data_formats_help.rst (modified)

	Replacing data_formats_help.rst with version updated by Wim.


Wed, 05 Apr 2017 11:24:44 GMT Ricardo Ferraz Leal <ricleal@…> [64ca561]
	* run.py (modified)
	* sasview/logging.ini (modified)
	* sasview/sasview.py (modified)
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* test/logging.ini (modified)
	* test/run_one.py (modified)

	Log not repeated any longer


Tue, 04 Apr 2017 16:50:04 GMT Ricardo Ferraz Leal <ricleal@…> [9c0f3c17]
	* check_packages.py (modified)
	* mac_setup_homebrew.sh (added)
	* run.py (modified)
	* sasview/local_config.py (modified)
	* sasview/logging.ini (modified)
	* setup.py (modified)
	* src/examples/test_chisq_panel.py (modified)
	* src/examples/test_copy_print.py (modified)
	* src/examples/test_panel.py (modified)
	* src/examples/test_panel2D.py (modified)
	* src/sas/sascalc/calculator/BaseComponent.py (modified)
	* src/sas/sascalc/calculator/instrument.py (modified)
	* src/sas/sascalc/calculator/resolution_calculator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/err1d.py (modified)
	* src/sas/sascalc/data_util/formatnum.py (modified)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/data_util/uncertainty.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/IgorReader.py (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/hfir1d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/red2d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/tiff_reader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/fit/MultiplicationModel.py (modified)
	* src/sas/sascalc/fit/expression.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/fit/BumpsFitting.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/fit/expression.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_processor.py (modified)
	* src/sas/sasgui/guiframe/images/dls_logo.png (added)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_operator.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.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)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/utils.py (modified)
	* src/sas/sasgui/perspectives/pr/explore_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/simulation/simulation.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* test/corfunc/test/utest_corfunc.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sascalculator/test/utest_sas_gen.py (modified)
	* test/sasdataloader/plugins/test_reader.py (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/sasdataloader/test/utest_averaging.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasguiframe/test/utest_manipulations.py (modified)
	* test/sasinvariant/test/utest_data_handling.py (modified)
	* test/sasinvariant/test/utest_use_cases.py (modified)
	* .gitignore (modified)
	* sasview/__init__.py (modified)
	* sasview/sasview.py (modified)
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sascalc/dataloader/loader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/CategoryManager.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/gui_statusbar.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified)
	* src/sas/sasgui/guiframe/proxy.py (modified)
	* src/sas/sasgui/guiframe/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/file_converter/file_converter.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/invariant/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/plottools/binder.py (modified)
	* src/sas/sasgui/plottools/canvas.py (modified)
	* src/sas/sasgui/plottools/toolbar.py (modified)
	* test/fileconverter/test/export2d.h5 (modified)
	* test/logging.ini (added)
	* test/run_one.py (modified)
	* test/sasdataloader/test/isis_1_0_write_test.xml (modified)
	* test/sasdataloader/test/isis_1_1_write_test.xml (modified)
	* test/sasdataloader/test/testLoad.py (modified)
	* test/sasdataloader/test/write_test.xml (modified)
	* test/utest_sasview.py (modified)

	After merge conflict


Tue, 04 Apr 2017 16:39:42 GMT Ricardo Ferraz Leal <ricleal@…> [463e7ffc]
	* sasview/__init__.py (modified)
	* sasview/local_config.py (modified)
	* sasview/logging.ini (modified)
	* sasview/sasview.py (modified)
	* src/sas/sascalc/calculator/resolution_calculator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sascalc/dataloader/loader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/tiff_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/CategoryManager.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/gui_statusbar.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified)
	* src/sas/sasgui/guiframe/proxy.py (modified)
	* src/sas/sasgui/guiframe/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/file_converter/file_converter.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/invariant/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/explore_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/simulation/simulation.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/binder.py (modified)
	* src/sas/sasgui/plottools/canvas.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasgui/plottools/toolbar.py (modified)
	* test/run_one.py (modified)
	* test/sasdataloader/test/testLoad.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/utest_sasview.py (modified)

	getLogger with module name


Tue, 04 Apr 2017 16:27:56 GMT smk78 [1779e72]
	* sasview/local_config.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)

	Incorporated DLS logo and URL, and added DLS to list of institutional ...


Tue, 04 Apr 2017 16:26:11 GMT smk78 [7b7ec05]
	* mac_setup_homebrew.sh (added)
	* run.py (modified)
	* setup.py (modified)
	* src/examples/test_chisq_panel.py (modified)
	* src/examples/test_copy_print.py (modified)
	* src/examples/test_panel.py (modified)
	* src/examples/test_panel2D.py (modified)
	* src/sas/sascalc/calculator/BaseComponent.py (modified)
	* src/sas/sascalc/calculator/instrument.py (modified)
	* src/sas/sascalc/calculator/resolution_calculator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/err1d.py (modified)
	* src/sas/sascalc/data_util/formatnum.py (modified)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/data_util/uncertainty.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/IgorReader.py (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/hfir1d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/red2d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/tiff_reader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/fit/MultiplicationModel.py (modified)
	* src/sas/sascalc/fit/expression.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/fit/BumpsFitting.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/fit/expression.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_processor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_operator.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.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)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/utils.py (modified)
	* src/sas/sasgui/perspectives/pr/explore_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/simulation/simulation.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sascalculator/test/utest_sas_gen.py (modified)
	* test/sasdataloader/plugins/test_reader.py (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/sasdataloader/test/utest_averaging.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasguiframe/test/utest_manipulations.py (modified)
	* test/sasinvariant/test/utest_data_handling.py (modified)
	* test/sasinvariant/test/utest_use_cases.py (modified)
	* src/sas/sasgui/guiframe/images/dls_logo.png (added)

	Merge branch 'master' of https://github.com/SasView/sasview.git


Tue, 04 Apr 2017 16:06:27 GMT Ricardo Ferraz Leal <ricleal@…> [c155a16]
	* .gitignore (modified)
	* sasview/__init__.py (modified)
	* sasview/local_config.py (modified)
	* sasview/logging.ini (modified)
	* src/sas/sascalc/calculator/resolution_calculator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/calcthread.py (modified)
	* src/sas/sascalc/dataloader/loader.py (modified)
	* src/sas/sascalc/dataloader/readers/associations.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/tiff_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/CategoryManager.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/guiframe/documentation_window.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/gui_statusbar.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified)
	* src/sas/sasgui/guiframe/proxy.py (modified)
	* src/sas/sasgui/guiframe/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/file_converter/file_converter.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/invariant/report_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/explore_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_state.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/simulation/simulation.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/binder.py (modified)
	* src/sas/sasgui/plottools/canvas.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* src/sas/sasgui/plottools/toolbar.py (modified)
	* test/fileconverter/test/export2d.h5 (modified)
	* test/logging.ini (added)
	* test/run_one.py (modified)
	* test/sasdataloader/test/isis_1_0_write_test.xml (modified)
	* test/sasdataloader/test/isis_1_1_write_test.xml (modified)
	* test/sasdataloader/test/testLoad.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasdataloader/test/write_test.xml (modified)
	* test/utest_sasview.py (modified)

	Logging is now logger


Tue, 04 Apr 2017 15:59:38 GMT smk78 [ce9e0b5]
	* src/sas/sasgui/guiframe/images/dls_logo.png (added)

	Added DLS logo to guiframe images (for About box). Addresses #913


Mon, 27 Mar 2017 03:33:16 GMT andyfaff [9a5097c]
	* setup.py (modified)
	* src/examples/test_chisq_panel.py (modified)
	* src/examples/test_copy_print.py (modified)
	* src/examples/test_panel.py (modified)
	* src/examples/test_panel2D.py (modified)
	* src/sas/sascalc/calculator/BaseComponent.py (modified)
	* src/sas/sascalc/calculator/instrument.py (modified)
	* src/sas/sascalc/calculator/resolution_calculator.py (modified)
	* src/sas/sascalc/calculator/sas_gen.py (modified)
	* src/sas/sascalc/data_util/err1d.py (modified)
	* src/sas/sascalc/data_util/formatnum.py (modified)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/data_util/uncertainty.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/IgorReader.py (modified)
	* src/sas/sascalc/dataloader/readers/abs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/danse_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/hfir1d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/red2d_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/tiff_reader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sascalc/fit/Loader.py (modified)
	* src/sas/sascalc/fit/MultiplicationModel.py (modified)
	* src/sas/sascalc/fit/expression.py (modified)
	* src/sas/sascalc/invariant/invariant.py (modified)
	* src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/pr/fit/BumpsFitting.py (modified)
	* src/sas/sascalc/pr/fit/Loader.py (modified)
	* src/sas/sascalc/pr/fit/expression.py (modified)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sascalc/pr/num_term.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_processor.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_operator.py (modified)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.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)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/utils.py (modified)
	* src/sas/sasgui/perspectives/pr/explore_dialog.py (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/perspectives/simulation/simulation.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/fitDialog.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* test/pr_inversion/test/utest_invertor.py (modified)
	* test/sascalculator/test/utest_sas_gen.py (modified)
	* test/sasdataloader/plugins/test_reader.py (modified)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/sasdataloader/test/utest_averaging.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* test/sasguiframe/test/utest_manipulations.py (modified)
	* test/sasinvariant/test/utest_data_handling.py (modified)
	* test/sasinvariant/test/utest_use_cases.py (modified)

	MAINT: import numpy as np


Sat, 25 Mar 2017 23:50:06 GMT ajj [74c8cd0]
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)

	Fettling sizes. Calling this done.


Sat, 25 Mar 2017 23:33:18 GMT ajj [f9d1f60]
	* sasview/local_config.py (modified)
	* src/sas/sasgui/guiframe/config.py (modified)

	Updating as per @pkienzle and @butlerpd comments.
	- replicating config ...


Sat, 25 Mar 2017 22:53:34 GMT Paul Kienzle <pkienzle@…> [e11ee1d]
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)

	make acknowledgements box fit in windows dialog box


Sat, 25 Mar 2017 21:56:07 GMT ajj [d8161f2]
	* sasview/local_config.py (modified)
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)

	Fixing up the acknowledgment box


Fri, 03 Mar 2017 16:08:28 GMT krzywon [a45a298]
	* src/sas/sasgui/guiframe/data_panel.py (modified)

	Auto expand data and theory trees once data is in list.


Thu, 02 Mar 2017 21:12:59 GMT Paul Kienzle <pkienzle@…> [4afe1ba]
	* src/sas/sasgui/guiframe/data_panel.py (modified)

	data panel: mark root as visible on both mac and windows


Thu, 02 Mar 2017 20:48:43 GMT Paul Kienzle <pkienzle@…> [66aeb15]
	* src/sas/sasgui/guiframe/data_panel.py (modified)

	data panel: put the data/theory label in the tree root so it is
	visible ...


Wed, 01 Mar 2017 14:46:54 GMT butler [8fa3fb8]
	* .gitignore (modified)
	* build_tools/jenkins_linux_build.sh (modified)
	* build_tools/jenkins_osx_build.sh (modified)
	* build_tools/jenkins_win64_build.bat (modified)
	* build_tools/jenkins_win_build.bat (modified)
	* docs/sphinx-docs/source/conf.py (modified)
	* sasview/README.txt (modified)
	* sasview/__init__.py (modified)
	* sasview/custom_config.py (modified)
	* sasview/local_config.py (modified)
	* sasview/sasview.spec (added)
	* sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (added)
	* sasview/test/save_states/fit_pr_and_invariant_project.svs (added)
	* sasview/test/save_states/fit_pr_and_inversion_project.svs (deleted)
	* sasview/test/save_states/fitstate.fitv (modified)
	* sasview/test/sesans_data/sphere2micron.ses (added)
	* sasview/test/sesans_data/spheres2micron.ses (deleted)
	* sasview/version.txt (added)
	* setup.py (modified)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_constants.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/corfunc/plot_labels.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/gpu_options.py (added)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified)
	* src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* test/sasdataloader/test/utest_ascii.py (modified)
	* src/sas/sasgui/guiframe/data_panel.py (modified)

	Merge remote-tracking branch 'origin/master' into expandable-de-688


Tue, 28 Feb 2017 18:22:40 GMT krzywon [53f0402]
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* sasview/test/sesans_data/sphere2micron.ses (added)
	* sasview/test/sesans_data/spheres2micron.ses (deleted)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_constants.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)

	Merge branch 'master' into sesans41


Mon, 27 Feb 2017 04:20:48 GMT butler [ddbac66]
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)

	Fix remaining custom/customized to plugin conversion


Tue, 14 Feb 2017 21:28:07 GMT krzywon [2ffe241]
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)

	Fix issues with loading 2D data in the SESANS branch and always set ...


Tue, 14 Feb 2017 20:27:46 GMT GitHub <noreply@…> [b5e9ce26]
	* .gitignore (modified)
	* docs/sphinx-docs/source/conf.py (modified)
	* sasview/README.txt (modified)
	* sasview/__init__.py (modified)
	* sasview/test/save_states/fit_pr_and_invariant_project.svs (added)
	* sasview/test/save_states/fit_pr_and_inversion_project.svs (deleted)
	* sasview/test/save_states/fitstate.fitv (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (modified)
	* src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.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/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified)
	* sasview/test/sesans_data/sphere2micron.ses (added)
	* sasview/test/sesans_data/spheres2micron.ses (deleted)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_constants.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)

	Merge branch 'master' into sesans41


Tue, 07 Feb 2017 19:05:10 GMT GitHub <noreply@…> [2510b9b]
	* sasview/test/save_states/fit_pr_and_invariant_project.svs (added)
	* sasview/test/save_states/fit_pr_and_inversion_project.svs (deleted)
	* sasview/test/save_states/fitstate.fitv (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.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/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* .gitignore (modified)
	* docs/sphinx-docs/source/conf.py (modified)
	* sasview/README.txt (modified)
	* sasview/__init__.py (modified)
	* sasview/custom_config.py (modified)
	* sasview/local_config.py (modified)
	* src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified)
	* src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/gpu_options.py (added)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified)
	* src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified)

	Merge pull request #30 from SasView/ticket-827

	Fixes #795, #819, #827, ...


Tue, 07 Feb 2017 14:03:45 GMT krzywon [68adf86]
	* src/sas/sasgui/guiframe/dataFitting.py (modified)

	Apply a linear transform for SESANS data as default.


Fri, 20 Jan 2017 10:45:03 GMT jhbakker [20522e1]
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Fixes based on Jeff's comments (20170119). Tested with 1D SESANS data
	on ...


Tue, 17 Jan 2017 19:34:45 GMT jhbakker [aad41bb]
	* src/sas/sasgui/guiframe/dataFitting.py (modified)

	small bugfix


Tue, 17 Jan 2017 19:18:58 GMT jhbakker [a9f579c]
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)

	Manually added in all the SESANS modifications from Jurtest


Fri, 13 Jan 2017 11:58:05 GMT Piotr Rozyczko <piotr.rozyczko@…> [73cbeec]
	* sasview/custom_config.py (modified)
	* sasview/local_config.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/startup_configuration.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/gpu_options.py (added)

	Opencl dialog (#29)

	Merged OpenCL dialog prototype branch

	* Support ...


Wed, 21 Dec 2016 15:48:31 GMT krzywon [a6fccd7]
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.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)
	* sasview/test/save_states/fit_pr_and_invariant_project.svs (added)
	* sasview/test/save_states/fit_pr_and_inversion_project.svs (deleted)
	* sasview/test/save_states/fitstate.fitv (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)

	Merge branch 'master' into ticket-795


Tue, 20 Dec 2016 12:59:08 GMT Paul Kienzle <pkienzle@…> [505706a]
	* build_tools/jenkins_linux_build.sh (modified)
	* build_tools/jenkins_osx_build.sh (modified)
	* build_tools/jenkins_win64_build.bat (modified)
	* build_tools/jenkins_win_build.bat (modified)
	* sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (added)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.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/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)

	Merge branch 'master' into ticket-811


Tue, 20 Dec 2016 12:45:00 GMT Paul Kienzle <pkienzle@…> [d3911e3]
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)

	Reproduce sasview smear 2D wrapper so 2D fits work.  Fixes #811,
	#825.


Mon, 19 Dec 2016 21:09:08 GMT krzywon [ca224b1]
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)

	Delete all plots when resetting state.


Mon, 19 Dec 2016 12:23:36 GMT GitHub <noreply@…> [345e7e4]
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)

	Revert "Jurtest2"


Mon, 19 Dec 2016 09:40:37 GMT jhbakker [55bc5a7f]
	* build_tools/jenkins_osx_build.sh (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)

	Merge branch 'master' into Jurtest2


Fri, 16 Dec 2016 15:40:27 GMT krzywon [67b0a99]
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)

	#761: Constrained fit pages are now deleted if they no longer have
	any ...


Thu, 15 Dec 2016 09:16:17 GMT jhbakker [e1e41de]
	* build_tools/jenkins_linux_build.sh (modified)
	* build_tools/jenkins_osx_build.sh (modified)
	* build_tools/jenkins_win64_build.bat (modified)
	* build_tools/jenkins_win_build.bat (modified)
	* sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (added)
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)

	Merge branch 'master' into Jurtest


Wed, 07 Dec 2016 21:06:16 GMT krzywon [b2b36932]
	* src/sas/sascalc/dataloader/manipulations.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)

	#824: 2D data without detector information can now use the slicers,
	and ...


Wed, 07 Dec 2016 14:16:33 GMT jhbakker [f668101]
	* .pydevproject (modified)
	* sasview/images/tudelft_logo.png (added)
	* sasview/sasview.spec (added)
	* sasview/setup_exe.py (modified)
	* sasview/version.txt (added)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.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/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified)
	* src/sas/sasgui/perspectives/pr/pr.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)
	* test/sasdataloader/test/utest_ascii.py (modified)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)

	Merge branch 'master' into Jurtest


Wed, 09 Nov 2016 10:11:15 GMT Piotr Rozyczko <rozyczko@…> [cb1e9a5]
	* src/sas/sasgui/guiframe/data_panel.py (modified)

	code review from WP


Wed, 09 Nov 2016 09:38:31 GMT Piotr Rozyczko <rozyczko@…> [29e872e]
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)

	Zoomed charts now retain their zoom factor. Fixes #800


Wed, 09 Nov 2016 08:11:54 GMT Piotr Rozyczko <rozyczko@…> [8fa53f7]
	* src/sas/sasgui/guiframe/data_panel.py (modified)

	Added a horizontal splitter to enable control of Data/Theory boxes


Thu, 20 Oct 2016 19:54:06 GMT krzywon [c8e1996]
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.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/pagestate.py (modified)

	Fixes #738: No errors are thrown on loading projects with fits, plus ...


Tue, 11 Oct 2016 15:09:47 GMT jhbakker [9087214]
	* build_tools/requirements.txt (modified)
	* check_packages.py (modified)
	* docs/sphinx-docs/source/dev/dev.rst (modified)
	* docs/sphinx-docs/source/index.old (deleted)
	* docs/sphinx-docs/source/user/analysis.rst (modified)
	* docs/sphinx-docs/source/user/marketplace.rst (added)
	* docs/sphinx-docs/source/user/menu_bar.rst (modified)
	* docs/sphinx-docs/source/user/tools.rst (modified)
	* docs/sphinx-docs/source/user/tutorial.rst (modified)
	* docs/sphinx-docs/source/user/user.rst (modified)
	* docs/sphinx-docs/source/user/working.rst (modified)
	* sasview/local_config.py (modified)
	* src/sas/sascalc/fit/MultiplicationModel.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/images/tudelft_logo.png (added)
	* src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/new_pycrust_example.png (added)
	* src/sas/sasgui/perspectives/calculator/media/new_pycrust_example_2.png (added)
	* src/sas/sasgui/perspectives/calculator/media/old_pycrust_example.png (moved)
	* src/sas/sasgui/perspectives/calculator/media/python_shell_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/model_editor.py (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/Fibre_Diffraction_Review_1994_3_25-29.pdf (added)
	* src/sas/sasgui/perspectives/corfunc/media/Fibre_Diffraction_Review_2004_12_24.pdf (added)
	* src/sas/sasgui/perspectives/corfunc/media/Fibre_Diffraction_Review_2005_13_19-22.pdf (added)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)
	* src/sas/sasgui/perspectives/corfunc/media/fdr-pdfs.rst (added)
	* src/sas/sasgui/perspectives/corfunc/media/profile1.png (added)
	* src/sas/sasgui/perspectives/corfunc/media/profile2.png (added)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/edit_model_menu.bmp (deleted)
	* src/sas/sasgui/perspectives/fitting/media/edit_model_menu.png (added)
	* src/sas/sasgui/perspectives/fitting/media/fitting.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)

	Merge branch 'master' into Jurrian1D, fingers crossed!


Mon, 10 Oct 2016 22:43:16 GMT smk78 [49e000b]
	* sasview/local_config.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/images/tudelft_logo.png (added)

	Added TU Delft logo to About box aswell, and Acknowledgement. Closes ...


Mon, 10 Oct 2016 20:32:09 GMT jhbakker [1fac6c0]
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_manager.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)

	SESANS is almost working, but this is NOT a stable version!


Sat, 08 Oct 2016 19:33:04 GMT jhbakker [51a4d78]
	* .gitignore (modified)
	* .travis.yml (modified)
	* build_tools/requirements.txt (modified)
	* docs/pre-sphinx-docs/Graph_help_v0.html (deleted)
	* docs/pre-sphinx-docs/NIST_IGOR_SANS_Model_Docs_v4.10.pdf (deleted)
	* docs/pre-sphinx-docs/README-OLD-DOCS.TXT (deleted)
	* docs/pre-sphinx-docs/averaging_help_v0.html (deleted)
	* docs/pre-sphinx-docs/batch_help_v0.html (deleted)
	* docs/pre-sphinx-docs/category_manager_help_v0.html (deleted)
	* docs/pre-sphinx-docs/change_scale_help_v0.html (deleted)
	* docs/pre-sphinx-docs/data_explorer_help_v0.html (deleted)
	* docs/pre-sphinx-docs/data_operator_help_v0.html (deleted)
	* docs/pre-sphinx-docs/density_calculator_help_v0.html (deleted)
	* docs/pre-sphinx-docs/fitting_help_v0.html (deleted)
	* docs/pre-sphinx-docs/fitting_key_help_v0.html (deleted)
	* docs/pre-sphinx-docs/glossaryhelp_v0.html (deleted)
	* docs/pre-sphinx-docs/graph_key_help_v0.html (deleted)
	* docs/pre-sphinx-docs/help_v0.html (deleted)
	* docs/pre-sphinx-docs/invariant_help_v0.html (deleted)
	* docs/pre-sphinx-docs/kiessig_calculator_help_v0.html (deleted)
	* docs/pre-sphinx-docs/load_data_help_v0.html (deleted)
	* docs/pre-sphinx-docs/load_image_help_v0.html (deleted)
	* docs/pre-sphinx-docs/model_documentation.docx (deleted)
	* docs/pre-sphinx-docs/model_editor_help_v0.html (deleted)
	* docs/pre-sphinx-docs/model_use_help_v0.html (deleted)
	* docs/pre-sphinx-docs/pd_help_v0.html (deleted)
	* docs/pre-sphinx-docs/polar_mag_help_v0.html (deleted)
	* docs/pre-sphinx-docs/pycrust_help_v0.html (deleted)
	* docs/pre-sphinx-docs/report_template_v0.html (deleted)
	* docs/pre-sphinx-docs/resolution_calculator_help_v0.html (deleted)
	* docs/pre-sphinx-docs/simultaneous_fit_help_v0.html (deleted)
	* docs/pre-sphinx-docs/single_fit_help_v0.html (deleted)
	* docs/pre-sphinx-docs/sld_calculator_help_v0.html (deleted)
	* docs/pre-sphinx-docs/slit_calculator_help_v0.html (deleted)
	* docs/pre-sphinx-docs/smear_computation_v0.html (deleted)
	* docs/pre-sphinx-docs/status_bar_help_v0.html (deleted)
	* docs/sphinx-docs/build_sphinx.py (modified)
	* docs/sphinx-docs/source/test/testdata_help.rst (deleted)
	* docs/sphinx-docs/source/user/README-ABOUT-TOCTREE-FILES.TXT (modified)
	* docs/sphinx-docs/source/user/gpu_computations.rst (deleted)
	* docs/sphinx-docs/source/user/opencl_installation.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/guiframe/BatchGridClassLayout.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/guiframe/M_angles_pic.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/guiframe/data_explorer_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/guiframe/data_formats_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/guiframe/graph_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/guiframe/guinier_fit.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/guiframe/hand_menu.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/data_oper_pic.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/data_operator_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/density_calculator_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/density_tutor.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/dm_eq.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_debye_eq.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_gui_help.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_i.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_mag_pic.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/gen_sas_help.html (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/image_viewer_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/kiessig_calculator_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/load_image.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mag_vector.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mqx.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mqy.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mxp.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/myp.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/mzp.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/pdb_combo.jpg (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/pic_convert.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/pic_plot.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/pycrust_example.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/python_shell_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/q.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/resolution_calculator_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/resolution_tutor.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sas_calculator_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sigma_q.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sigma_table.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sld1.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sld2.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sld_calculator_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/slit_calculator_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/v_j.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/corfunc_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/M_angles_pic.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/ball.ico (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/batch_button_area.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/cat_fig0.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/cat_fig1.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/cat_fig2.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/dm_eq.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/dream-complete.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/dream-incomplete.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/edit_menu.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/edit_model_menu.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/file_menu.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fit-amoeba.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fit-de.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fit-dream.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fit-lm.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fit-newton.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fitting.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fitting_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/m0x_eq.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/m0y_eq.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/m0z_eq.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mag_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mag_vector.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mqx.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mqy.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mxp.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/myp.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mzp.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/new_model.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/optimizer.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image001.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image002.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image003.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image004.jpg (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image005.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image006.jpg (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image007.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image008.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image009.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image010.jpg (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image011.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image012.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_image013.jpg (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/plot_button.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/residuals_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/restore_batch_window.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sld1.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sld2.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image002.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image003.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image004.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image005.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image006.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image007.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image008.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image009.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image010.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image011.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image012.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image013.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image016.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image017.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image018.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image019.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image020.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image021.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image022.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image023.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image024.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image025.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image026.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image027.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_image028.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sum_model.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/view_button.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/view_data_model.bmp (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/bookmark.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/image001.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/image002.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/image003.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/image004.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/image005.gif (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/invariant_help.rst (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/redo.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/report.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/report_template.html (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/save.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/undo.png (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/pr/pr_help.rst (deleted)
	* docs/sphinx-docs/source/user/tools.rst (modified)
	* docs/sphinx-docs/source/user/working.rst (modified)
	* sasview/default_categories.json (deleted)
	* sasview/installer_generator.py (modified)
	* sasview/local_config.py (modified)
	* sasview/setup_exe.py (modified)
	* sasview/setup_mac.py (modified)
	* sasview/test/1d_data/Anton-Paar.pdh (moved)
	* sasview/test/README.txt (modified)
	* sasview/test/convertible_files/APS_X.TXT (moved)
	* sasview/test/convertible_files/APS_Y.TXT (moved)
	* sasview/test/convertible_files/FIT2D_I.TXT (moved)
	* sasview/test/convertible_files/FIT2D_Q.TXT (moved)
	* sasview/test/convertible_files/Z83000.I1D (moved)
	* sasview/test/convertible_files/Z83000.QAX (moved)
	* sasview/test/convertible_files/Z83001.I1D (moved)
	* sasview/test/convertible_files/Z83001.QAX (moved)
	* sasview/test/convertible_files/Z83002.I1D (moved)
	* sasview/test/convertible_files/Z98000.I1D (moved)
	* sasview/test/convertible_files/Z98000.QAX (moved)
	* sasview/test/convertible_files/Z98001.I1D (moved)
	* sasview/test/convertible_files/Z98001.QAX (moved)
	* sasview/test/convertible_files/Z98002.I1D (moved)
	* sasview/test/coordinate_data/sld_file.sld (moved)
	* sasview/test/media/testdata_help.rst (modified)
	* sasview/test/other_files/dist _THETA_weights.txt (moved)
	* sasview/test/other_files/phi_weights.txt (moved)
	* sasview/test/other_files/radius_dist.txt (moved)
	* sasview/test/other_files/theta_weights.txt (moved)
	* sasview/test/save_states/constrained_fit_project.svs (added)
	* sasview/test/save_states/fit_pr_and_inversion_project.svs (moved)
	* sasview/test/save_states/project_multiplicative_constraint.svs (added)
	* src/sas/sascalc/data_util/qsmearing.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/CategoryManager.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/media/data_formats_help.rst (modified)
	* src/sas/sasgui/guiframe/panel_base.py (modified)
	* src/sas/sasgui/perspectives/calculator/calculator.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_operator.py (modified)
	* src/sas/sasgui/perspectives/calculator/media/image_viewer_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst (modified)
	* src/sas/sasgui/perspectives/calculator/pyconsole.py (modified)
	* src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified)
	* src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified)
	* src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.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/models.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)
	* src/sas/sascalc/dataloader/readers/sesans_reader.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)

	Merge branch 'ajj_sesans' into Jurrian1D


Sat, 08 Oct 2016 18:34:03 GMT jhbakker [7988501]
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/fit/AbstractFitEngine.py (modified)
	* src/sas/sascalc/fit/BumpsFitting.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/plottools/plottables.py (modified)

	Data1D class changed to include SESANS Data format


Sat, 08 Oct 2016 16:46:40 GMT krzywon [a4c2445]
	* sasview/test/save_states/project_multiplicative_constraint.svs (added)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)

	Fixes #730: All data, theories, plots, and analyses in perspectives
	are ...


Fri, 07 Oct 2016 21:11:40 GMT mathieu [212bfc2]
	* sasview/default_categories.json (deleted)
	* src/sas/sasgui/guiframe/CategoryInstaller.py (modified)
	* src/sas/sasgui/guiframe/CategoryManager.py (modified)
	* src/sas/sasgui/guiframe/customdir.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/models.py (modified)

	Pull categories from models. Get rid of default categories. Fixes
	#535


Fri, 07 Oct 2016 21:07:07 GMT GitHub <noreply@…> [60df6c1]
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)
	* src/sas/sasgui/guiframe/panel_base.py (modified)
	* src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)

	Merge pull request No. 13 from SasView/wx_save_simfit

	wx Saving ...


Fri, 07 Oct 2016 20:26:18 GMT Piotr Rozyczko <rozyczko@…> [18b7ecb9]
	* src/sas/sasgui/guiframe/panel_base.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/pr/inversion_panel.py (modified)

	Save Analysis improvements. Fixed #629


Fri, 07 Oct 2016 20:05:57 GMT krzywon [95eef00]
	* docs/pre-sphinx-docs/Graph_help_v0.html (deleted)
	* docs/pre-sphinx-docs/NIST_IGOR_SANS_Model_Docs_v4.10.pdf (deleted)
	* docs/pre-sphinx-docs/README-OLD-DOCS.TXT (deleted)
	* docs/pre-sphinx-docs/averaging_help_v0.html (deleted)
	* docs/pre-sphinx-docs/batch_help_v0.html (deleted)
	* docs/pre-sphinx-docs/category_manager_help_v0.html (deleted)
	* docs/pre-sphinx-docs/change_scale_help_v0.html (deleted)
	* docs/pre-sphinx-docs/data_explorer_help_v0.html (deleted)
	* docs/pre-sphinx-docs/data_operator_help_v0.html (deleted)
	* docs/pre-sphinx-docs/density_calculator_help_v0.html (deleted)
	* docs/pre-sphinx-docs/fitting_help_v0.html (deleted)
	* docs/pre-sphinx-docs/fitting_key_help_v0.html (deleted)
	* docs/pre-sphinx-docs/glossaryhelp_v0.html (deleted)
	* docs/pre-sphinx-docs/graph_key_help_v0.html (deleted)
	* docs/pre-sphinx-docs/help_v0.html (deleted)
	* docs/pre-sphinx-docs/invariant_help_v0.html (deleted)
	* docs/pre-sphinx-docs/kiessig_calculator_help_v0.html (deleted)
	* docs/pre-sphinx-docs/load_data_help_v0.html (deleted)
	* docs/pre-sphinx-docs/load_image_help_v0.html (deleted)
	* docs/pre-sphinx-docs/model_documentation.docx (deleted)
	* docs/pre-sphinx-docs/model_editor_help_v0.html (deleted)
	* docs/pre-sphinx-docs/model_use_help_v0.html (deleted)
	* docs/pre-sphinx-docs/pd_help_v0.html (deleted)
	* docs/pre-sphinx-docs/polar_mag_help_v0.html (deleted)
	* docs/pre-sphinx-docs/pycrust_help_v0.html (deleted)
	* docs/pre-sphinx-docs/report_template_v0.html (deleted)
	* docs/pre-sphinx-docs/resolution_calculator_help_v0.html (deleted)
	* docs/pre-sphinx-docs/simultaneous_fit_help_v0.html (deleted)
	* docs/pre-sphinx-docs/single_fit_help_v0.html (deleted)
	* docs/pre-sphinx-docs/sld_calculator_help_v0.html (deleted)
	* docs/pre-sphinx-docs/slit_calculator_help_v0.html (deleted)
	* docs/pre-sphinx-docs/smear_computation_v0.html (deleted)
	* docs/pre-sphinx-docs/status_bar_help_v0.html (deleted)
	* docs/sphinx-docs/build_sphinx.py (modified)
	* docs/sphinx-docs/source/user/README-ABOUT-TOCTREE-FILES.TXT (modified)
	* docs/sphinx-docs/source/user/working.rst (modified)
	* sasview/local_config.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/media/data_formats_help.rst (modified)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)

	Merge branch 'master' into wx_save_simfit


Fri, 07 Oct 2016 20:03:49 GMT krzywon [e6de6b8]
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)

	Delinting and small structural changes.


Fri, 07 Oct 2016 19:49:07 GMT smk78 [48b8f6d]
	* src/sas/sasgui/guiframe/media/data_formats_help.rst (modified)

	Updated with SESANS format by Wim, then thoroughly edited by Steve. ...


Fri, 07 Oct 2016 17:05:25 GMT mathieu [adb0851]
	* sasview/local_config.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)

	Add link to marketplace. Fixes #656


Fri, 07 Oct 2016 16:31:19 GMT krzywon [ff3f5821]
	* docs/sphinx-docs/build_sphinx.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sasgui/guiframe/dataFitting.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_operator.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)

	Merge branch 'master' into wx_save_simfit


Fri, 07 Oct 2016 16:21:40 GMT krzywon [998ca90]
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpanel.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/fitting/simfitpage.py (modified)

	#189 #12 Saving and loading project now fully saves and loads a ...


Fri, 07 Oct 2016 13:10:55 GMT Mathieu Doucet <doucetm@…> [9b6d62d]
	* src/sas/sasgui/guiframe/dataFitting.py (modified)

	Remove duplicated code.


Thu, 06 Oct 2016 16:35:24 GMT GitHub <noreply@…> [8d3d20a]
	* docs/sphinx-docs/source/user/analysis.rst (modified)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/corfunc_help.rst (added)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (added)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (added)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (added)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (added)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (added)
	* sasview/local_config.py (modified)
	* sasview/sasview.py (modified)
	* src/sas/sascalc/corfunc/__init__.py (added)
	* src/sas/sascalc/corfunc/corfunc_calculator.py (added)
	* src/sas/sascalc/corfunc/transform_thread.py (added)
	* src/sas/sasgui/guiframe/events.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/perspectives/corfunc/__init__.py (added)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (added)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (added)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (added)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (added)
	* src/sas/sasgui/perspectives/corfunc/media/fig1.gif (added)
	* src/sas/sasgui/perspectives/corfunc/media/fig2.gif (added)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (added)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (added)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (added)
	* src/sas/sasgui/perspectives/corfunc/plot_labels.py (added)
	* test/corfunc/test/98929.txt (added)
	* test/corfunc/test/utest_corfunc.py (added)
	* .gitignore (modified)
	* .travis.yml (modified)
	* Vagrantfile (modified)
	* build_tools/sasview_deploy_test.au3 (modified)
	* build_tools/travis_build.sh (added)
	* docs/sphinx-docs/source/conf.py (modified)
	* docs/sphinx-docs/source/user/gpu_computations.rst (added)
	* docs/sphinx-docs/source/user/menu_bar.rst (added)
	* docs/sphinx-docs/source/user/opencl_installation.rst (added)
	* docs/sphinx-docs/source/user/sasgui/guiframe/data_formats_help.rst (modified)
	* docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (added)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mag_vector.bmp (modified)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/invariant_help.rst (modified)
	* docs/sphinx-docs/source/user/tools.rst (modified)
	* docs/sphinx-docs/source/user/tutorial.rst (modified)
	* docs/sphinx-docs/source/user/user.rst (modified)
	* docs/sphinx-docs/source/user/working.rst (modified)
	* run.py (modified)
	* sasview.latestversion (deleted)
	* sasview/README.txt (modified)
	* sasview/__init__.py (modified)
	* sasview/default_categories.json (modified)
	* sasview/images/ansto_logo.png (added)
	* sasview/images/ornl_logo.png (added)
	* sasview/setup_exe.py (modified)
	* sasview/test/1d_data/rpa_igor.txt (added)
	* sasview/test/image_data/ISIS_98940_greyscale_bmp.bmp (added)
	* sasview/test/image_data/ISIS_98940_greyscale_gif.gif (added)
	* sasview/test/image_data/ISIS_98940_greyscale_jpg.jpg (added)
	* sasview/test/image_data/ISIS_98940_greyscale_png.png (added)
	* sasview/test/image_data/ISIS_98940_greyscale_tif.tif (added)
	* setup.py (modified)
	* src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/ascii_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/dataloader/readers/xml_reader.py (modified)
	* src/sas/sascalc/file_converter/__init__.py (added)
	* src/sas/sascalc/file_converter/bsl_loader.py (added)
	* src/sas/sascalc/file_converter/c_ext/__init__.py (added)
	* src/sas/sascalc/file_converter/c_ext/bsl_loader.c (added)
	* src/sas/sascalc/file_converter/c_ext/bsl_loader.h (added)
	* src/sas/sascalc/file_converter/cansas_writer.py (added)
	* src/sas/sascalc/file_converter/nxcansas_writer.py (added)
	* src/sas/sascalc/file_converter/otoko_loader.py (added)
	* src/sas/sascalc/file_converter/red2d_writer.py (added)
	* src/sas/sascalc/pr/invertor.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)
	* src/sas/sasgui/guiframe/gui_manager.py (modified)
	* src/sas/sasgui/guiframe/gui_statusbar.py (modified)
	* src/sas/sasgui/guiframe/images/ansto_logo.png (added)
	* src/sas/sasgui/guiframe/images/ornl_logo.png (added)
	* src/sas/sasgui/guiframe/media/data_formats_help.rst (modified)
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)
	* src/sas/sasgui/guiframe/media/guinier_fit.png (modified)
	* src/sas/sasgui/guiframe/utils.py (modified)
	* src/sas/sasgui/perspectives/file_converter/__init__.py (added)
	* src/sas/sasgui/perspectives/file_converter/converter_panel.py (added)
	* src/sas/sasgui/perspectives/file_converter/converter_widgets.py (added)
	* src/sas/sasgui/perspectives/file_converter/file_converter.py (added)
	* src/sas/sasgui/perspectives/file_converter/frame_select_dialog.py (added)
	* src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (added)
	* src/sas/sasgui/perspectives/file_converter/meta_panels.py (added)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitpage.py (modified)
	* src/sas/sasgui/perspectives/fitting/fitting.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/plugin.rst (added)
	* src/sas/sasgui/perspectives/fitting/model_thread.py (modified)
	* src/sas/sasgui/perspectives/fitting/pagestate.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified)
	* src/sas/sasgui/perspectives/invariant/invariant_state.py (modified)
	* src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified)
	* test/fileconverter/test/cansas1d.xml (added)
	* test/fileconverter/test/exp18_14_igor_2dqxqy.dat (added)
	* test/fileconverter/test/export2d.h5 (added)
	* test/fileconverter/test/utest_nxcansas_writer.py (added)
	* test/sasdataloader/test/utest_ascii.py (modified)

	Merge pull request #11 from SasView/corfunc

	Implement Correlation ...


Thu, 06 Oct 2016 15:22:29 GMT Piotr Rozyczko <rozyczko@…> [3a22ce7]
	* src/sas/sasgui/guiframe/gui_statusbar.py (modified)

	Add timestamp to console messages. Fixes #637


Thu, 06 Oct 2016 02:41:59 GMT smk78 [280f929]
	* src/sas/sasgui/guiframe/media/data_formats_help.rst (modified)

	SESANS data format information added by Wim. Re-commit to the src ...


Wed, 05 Oct 2016 20:34:53 GMT ajj [3fac0df]
	* src/sas/sasgui/guiframe/gui_manager.py (modified)

	Changing wxID for about menu so it appears under Help. It seems that ...


Tue, 04 Oct 2016 20:13:07 GMT smk78 [c1fdf84]
	* sasview/local_config.py (modified)
	* src/sas/sasgui/guiframe/acknowledgebox.py (modified)

	Enlarged Acknowledgement box so text is no longer truncated


Tue, 04 Oct 2016 19:13:42 GMT smk78 [e0f28e6]
	* sasview/images/ansto_logo.png (moved)
	* sasview/images/ornl_logo.png (added)
	* sasview/local_config.py (modified)
	* src/sas/sasgui/guiframe/aboutbox.py (modified)
	* src/sas/sasgui/guiframe/images/ansto_logo.png (added)
	* src/sas/sasgui/guiframe/images/ornl_logo.png (added)

	Updated About box text and images. Changed SNS image to ORNL image
	(more ...


Tue, 27 Sep 2016 13:35:38 GMT Paul Kienzle <pkienzle@…> [a0373d5]
	* src/sas/sasgui/guiframe/utils.py (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)

	Reenable processing of Npts and Nsigs for polydispersity


Tue, 13 Sep 2016 16:16:17 GMT smk78 [e32e35a]
	* docs/sphinx-docs/source/user/sasgui/guiframe/graph_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/kiessig_calculator_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/resolution_calculator_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sas_calculator_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sld_calculator_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/slit_calculator_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fitting_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mag_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/residuals_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/invariant_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/pr/pr_help.copy (deleted)
	* src/sas/sasgui/guiframe/media/graph_help.copy (deleted)
	* src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.copy (deleted)
	* src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.copy (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.copy (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.copy (deleted)
	* src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.copy (deleted)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.copy (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mag_help.copy (deleted)
	* src/sas/sasgui/perspectives/fitting/media/pd_help.copy (deleted)
	* src/sas/sasgui/perspectives/fitting/media/residuals_help.copy (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_help.copy (deleted)
	* src/sas/sasgui/perspectives/invariant/media/invariant_help.copy (deleted)
	* src/sas/sasgui/perspectives/pr/media/pr_help.copy (deleted)

	Deleted *.copy doc files


Tue, 13 Sep 2016 16:15:10 GMT smk78 [af00478]
	* docs/sphinx-docs/source/user/sasgui/guiframe/graph_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/kiessig_calculator_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/resolution_calculator_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sas_calculator_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/sld_calculator_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/calculator/slit_calculator_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/fitting_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/mag_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/pd_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/residuals_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/fitting/sm_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/invariant/invariant_help.copy (deleted)
	* docs/sphinx-docs/source/user/sasgui/perspectives/pr/pr_help.copy (deleted)
	* src/sas/sasgui/guiframe/media/graph_help.copy (deleted)
	* src/sas/sasgui/perspectives/calculator/media/kiessig_calculator_help.copy (deleted)
	* src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.copy (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.copy (deleted)
	* src/sas/sasgui/perspectives/calculator/media/sld_calculator_help.copy (deleted)
	* src/sas/sasgui/perspectives/calculator/media/slit_calculator_help.copy (deleted)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.copy (deleted)
	* src/sas/sasgui/perspectives/fitting/media/mag_help.copy (deleted)
	* src/sas/sasgui/perspectives/fitting/media/pd_help.copy (deleted)
	* src/sas/sasgui/perspectives/fitting/media/residuals_help.copy (deleted)
	* src/sas/sasgui/perspectives/fitting/media/sm_help.copy (deleted)
	* src/sas/sasgui/perspectives/invariant/media/invariant_help.copy (deleted)
	* src/sas/sasgui/perspectives/pr/media/pr_help.copy (deleted)

	Deleted *.copy doc files


Tue, 06 Sep 2016 05:57:55 GMT butler [f9b0c81]
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)
	* src/sas/sasgui/guiframe/media/guinier_fit.png (modified)

	update the graph/plotting documentation with new set axis range
	option, ...


Mon, 22 Aug 2016 16:06:57 GMT lewis [245ae18]
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)

	Don't log coords on corfunc QRange plot, only on drag


Mon, 22 Aug 2016 15:17:33 GMT lewis [6ffa0dd]
	* src/sas/sasgui/guiframe/events.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (modified)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified)

	Plot entire extrapolation


Fri, 19 Aug 2016 15:02:55 GMT lewis [2387abc]
	* build_tools/deploy.bat (added)
	* build_tools/sasview_deploy_test.au3 (added)
	* build_tools/test_deployment.bat (added)
	* docs/sphinx-docs/build_sphinx.py (modified)
	* sasview/installer_generator.py (modified)
	* sasview/sasview.py (modified)
	* sasview/setup_exe.py (modified)
	* src/sas/sascalc/dataloader/data_info.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_constants.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader.py (modified)
	* src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid.xsd (deleted)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (added)
	* src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (added)
	* src/sas/sasgui/guiframe/data_panel.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/media/data_explorer_help.rst (modified)
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/basepage.py (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified)
	* src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified)
	* src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/RangeDialog.py (added)
	* test/sasdataloader/test/utest_abs_reader.py (modified)
	* test/sasdataloader/test/utest_cansas.py (modified)
	* docs/sphinx-docs/source/user/analysis.rst (modified)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/corfunc_help.rst (added)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (added)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (added)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (added)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (added)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (added)
	* src/sas/sascalc/corfunc/__init__.py (added)
	* src/sas/sascalc/corfunc/corfunc_calculator.py (added)
	* src/sas/sascalc/corfunc/transform_thread.py (added)
	* src/sas/sasgui/perspectives/corfunc/__init__.py (added)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (added)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (added)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (added)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (added)
	* src/sas/sasgui/perspectives/corfunc/media/fig1.gif (added)
	* src/sas/sasgui/perspectives/corfunc/media/fig2.gif (added)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (added)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (added)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (added)
	* src/sas/sasgui/perspectives/corfunc/plot_labels.py (added)
	* test/corfunc/test/98929.txt (added)
	* test/corfunc/test/utest_corfunc.py (added)

	Merge branch 'master' into corfunc


Wed, 17 Aug 2016 11:19:57 GMT lewis [e68c9bf]
	* sasview/sasview.py (modified)
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)

	Remove option to save plot as PGF format (closes #446)


Tue, 16 Aug 2016 16:29:10 GMT smk78 [e55e7a6]
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/plottools/RangeDialog.py (added)
	* src/sas/sasgui/guiframe/media/data_explorer_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified)
	* src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified)
	* src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified)

	Merge branch 'master' of https://github.com/SasView/sasview.git


Tue, 16 Aug 2016 16:28:53 GMT smk78 [b64b87c]
	* src/sas/sasgui/guiframe/media/data_explorer_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified)
	* src/sas/sasgui/perspectives/fitting/media/pd_help.rst (modified)
	* src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified)
	* src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified)

	Word 'perspective' removed as per #513


Tue, 16 Aug 2016 16:18:26 GMT lewis [8b138bd]
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/plottools/RangeDialog.py (added)

	Merge branch 'master' of https://github.com/SasView/sasview


Tue, 16 Aug 2016 16:18:11 GMT lewis [895c9cb]
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/plottools/RangeDialog.py (added)

	Allow user to set the range of a plot (closes #245)


Tue, 16 Aug 2016 15:33:07 GMT smk78 [318427a9]
	* src/sas/sasgui/guiframe/media/graph_help.rst (modified)

	Edits to the 'Saving a plot image' section in respect of the RAW/RGBA ...


Tue, 16 Aug 2016 15:00:05 GMT lewis [e63cf11]
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)

	Fix similar issue to #459 after clicking plot properties


Tue, 16 Aug 2016 11:46:41 GMT lewis [a674d0b]
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)

	Re-write error handling code in data_loader (fixes #614)


Tue, 16 Aug 2016 10:11:39 GMT lewis [e767897]
	* src/sas/sasgui/guiframe/data_panel.py (modified)

	Select/deselct children datasets when select/deselect all is clicked ...


Mon, 15 Aug 2016 14:01:36 GMT lewis [70308f6c]
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)

	Fix error message shown when loading folder fails (fixes #614)


Fri, 12 Aug 2016 15:27:38 GMT lewis [cba0c77]
	* src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified)

	Show more useful message when loading folder fails (closes #614)


Fri, 12 Aug 2016 14:38:12 GMT lewis [2eb3d18c]
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)

	Fix simillar issue to #459 after clicking hide/show error bars


Fri, 12 Aug 2016 14:26:05 GMT lewis [2f12acc]
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)

	Allow deletion of linear fits (closes #466)

	Also fixes bug where the ...


Fri, 12 Aug 2016 10:40:40 GMT lewis [a47d0c8]
	* build_tools/jenkins_win64_build.bat (modified)
	* sasview/setup_exe.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified)
	* src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified)
	* src/sas/sasgui/perspectives/calculator/data_operator.py (modified)
	* src/sas/sasgui/perspectives/calculator/image_viewer.py (modified)
	* src/sas/sasgui/plottools/PlotPanel.py (modified)
	* src/sas/sasgui/plottools/PropertyDialog.py (modified)
	* src/sas/sasgui/plottools/transform.py (modified)
	* docs/sphinx-docs/source/user/analysis.rst (modified)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/corfunc_help.rst (added)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig1.gif (added)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/fig2.gif (added)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial1.png (added)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial2.png (added)
	* docs/sphinx-docs/source/user/sasgui/perspectives/corfunc/tutorial3.png (added)
	* sasview/sasview.py (modified)
	* src/sas/sascalc/corfunc/__init__.py (added)
	* src/sas/sascalc/corfunc/corfunc_calculator.py (added)
	* src/sas/sascalc/corfunc/transform_thread.py (added)
	* src/sas/sasgui/perspectives/corfunc/__init__.py (added)
	* src/sas/sasgui/perspectives/corfunc/corfunc.py (added)
	* src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (added)
	* src/sas/sasgui/perspectives/corfunc/corfunc_state.py (added)
	* src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (added)
	* src/sas/sasgui/perspectives/corfunc/media/fig1.gif (added)
	* src/sas/sasgui/perspectives/corfunc/media/fig2.gif (added)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial1.png (added)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial2.png (added)
	* src/sas/sasgui/perspectives/corfunc/media/tutorial3.png (added)
	* src/sas/sasgui/perspectives/corfunc/plot_labels.py (added)
	* test/corfunc/test/98929.txt (added)
	* test/corfunc/test/utest_corfunc.py (added)

	Merge branch 'master' into corfunc