# # ChangeLog for src/sas in sasview # # Generated by Trac 1.0.1 # Nov 8, 2024 8:10:43 PM Mon, 17 Apr 2017 20:00:40 GMT GitHub [481476c] * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) Merge pull request #91 from SasView/fitting-plugin-doc-typo fix typo in ... Fri, 14 Apr 2017 12:37:51 GMT Paul Kienzle [72100ee] * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) typo in fitting/plugin.rst Thu, 13 Apr 2017 14:45:01 GMT krzywon [2f22db9] * src/sas/sasgui/guiframe/gui_manager.py (modified) Add carraige return to SAS_OPENCL config line. Tue, 11 Apr 2017 12:01:57 GMT GitHub [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 Mon, 10 Apr 2017 09:14:32 GMT Tim Snow [2d220dd] * check_packages.py (modified) * sasview/local_config.py (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/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) Merge branch 'master' into sld-calculator-mod Mon, 10 Apr 2017 09:14:22 GMT Tim Snow [fe09e9b] * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) Minor enhancement The text label next to the x-ray input box now ... Mon, 10 Apr 2017 09:04:56 GMT Tim Snow [bd8411d5] * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) Implementation finished Code the underpins the GUI created yesterday is ... 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:31:52 GMT Tim Snow [8963a55] * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) GUI elements drawn Build the relevant GUI elements and started work on ... 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 [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:41:14 GMT GitHub [861f1880] * setup.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sasgui/perspectives/pr/explore_dialog.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * test/fileconverter/test/export2d.h5 (modified) * test/sasdataloader/test/testplugings.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * 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/plottools/PlotPanel.py (modified) Merge pull request #64 from andyfaff/has_key MAINT: remove has_key ... Fri, 07 Apr 2017 05:33:11 GMT GitHub [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'. Fri, 07 Apr 2017 04:03:53 GMT andyfaff [6435594] * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * test/fileconverter/test/export2d.h5 (modified) MAINT: improving dict access Fri, 07 Apr 2017 02:15:08 GMT andyfaff [f3bf622] * setup.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sasgui/perspectives/pr/explore_dialog.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * test/fileconverter/test/export2d.h5 (modified) * test/sasdataloader/test/testplugings.py (modified) MAINT: remove has_key occurences Thu, 06 Apr 2017 13:11:37 GMT smk78 [ec8886e] * src/sas/sasgui/plottools/LineModel.py (modified) Attempt to rectify some docstring errors 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 ... Thu, 06 Apr 2017 09:52:01 GMT Adam Washington [c44baf97] * src/sas/sascalc/dataloader/data_info.py (modified) Change default yacceptance and zacceptance This fixes a possible crash ... Thu, 06 Apr 2017 08:40:32 GMT Adam Washington [63d773c] * 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) Add yacceptance Needed to correspond to zacceptance for 2D sesans Wed, 05 Apr 2017 16:56:22 GMT GitHub [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 [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 17:10:30 GMT Ricardo Ferraz Leal [f2940c4] * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * .gitignore (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) Merge branch 'master' of github.com:SasView/sasview into logger Tue, 04 Apr 2017 17:00:50 GMT ajj [dd11014] * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) Fixing PR #55 broken merge Tue, 04 Apr 2017 16:50:04 GMT Ricardo Ferraz Leal [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 [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 [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 16:00:18 GMT GitHub [ed2276f] * check_packages.py (modified) * mac_setup_homebrew.sh (added) * setup.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.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/pagestate.py (modified) * test/corfunc/test/utest_corfunc.py (modified) * test/sasdataloader/test/utest_abs_reader.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/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/model_thread.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_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) Merge branch 'master' into numpy_import 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 Tue, 04 Apr 2017 15:41:31 GMT GitHub [a8d79fd] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * check_packages.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * test/corfunc/test/utest_corfunc.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) Merge pull request #33 from SasView/ticket-854 no ticket: remove ... Tue, 04 Apr 2017 15:25:55 GMT GitHub [ba22344] * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * sasview/README.txt (modified) * sasview/local_config.py (modified) * setup.py (modified) * src/sas/sascalc/calculator/slit_length_calculator.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sasgui/guiframe/acknowledgebox.py (modified) * src/sas/sasgui/guiframe/config.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * test/corfunc/test/utest_corfunc.py (modified) Merge pull request #48 from andyfaff/numpy_igor_reader BUG: IgorReader Fri, 31 Mar 2017 09:20:15 GMT wojciech [5156918] * INSTALL.txt (moved) * LICENSE.TXT (modified) * sasview/README.txt (modified) * sasview/local_config.py (modified) * sasview/test/sesans_data/sphere2micron.ses (added) * sasview/test/sesans_data/spheres2micron.ses (deleted) * setup.py (modified) * src/sas/sascalc/calculator/slit_length_calculator.py (modified) * 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/cansas_reader_HDF5.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/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/acknowledgebox.py (modified) * src/sas/sasgui/guiframe/config.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/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/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) Merge branch 'master' of https://github.com/SasView/sasview into ... Thu, 30 Mar 2017 13:41:12 GMT GitHub [4c5098c] * src/sas/sasgui/perspectives/fitting/fitting.py (modified) Fixes #741 Remove P(Q), S(Q) feature Mon, 27 Mar 2017 16:10:36 GMT krzywon [8434365] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) Remove writing transmission spectrum to XML data files. Mon, 27 Mar 2017 14:24:57 GMT krzywon [27109e5] * setup.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Setup includes all folders in the test data directory and pagestate ... 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 [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, 24 Mar 2017 19:27:46 GMT andyfaff [bfba720] * src/sas/sascalc/calculator/slit_length_calculator.py (modified) MAINT: SlitlengthCalculator - removed float indexing Fri, 24 Mar 2017 01:38:25 GMT andyfaff [36d69e1] * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) MAINT: refactor IgorReader.py Thu, 23 Mar 2017 00:10:15 GMT Paul Kienzle [1a30720] * src/sas/sascalc/fit/BumpsFitting.py (modified) fit error reporting was using traceback.traceback.format_exc rather than ... Tue, 21 Mar 2017 15:15:20 GMT Paul Kienzle [29adb33] * INSTALL.txt (moved) * LICENSE.TXT (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Merge branch 'master' into ticket-830 Thu, 09 Mar 2017 20:25:56 GMT krzywon [c94280c] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Further down PEP 8. Thu, 09 Mar 2017 15:59:25 GMT krzywon [b301db9] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) Correct the calculation for dx_percent. Thu, 09 Mar 2017 15:43:25 GMT krzywon [54544637] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) PEP 8 cleanup as Paul K suggested. Thu, 09 Mar 2017 15:06:46 GMT Paul Kienzle [984f3fc] * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) sasmodels doc: add note that parameter limits in the model truncate the ... Wed, 08 Mar 2017 21:27:44 GMT krzywon [082239e] * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Modify the cansas HDF5 reader to comply with the NXcanSAS-1.0 release ... Wed, 08 Mar 2017 14:03:25 GMT krzywon [d5aff7f] * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Small code cleanup to only fetch dx_min from save state a single time. Tue, 07 Mar 2017 20:47:21 GMT krzywon [096181d] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Coerce old custom pinhole smeared loaded from save states to ... Tue, 07 Mar 2017 20:15:13 GMT krzywon [d85f1d8a] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Saving and then loading in same save state working with custom pinhole ... Tue, 07 Mar 2017 16:50:13 GMT krzywon [7e98655] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Custom pinhole smearing accepts a constant %Q and applies it across ... 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 [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 [66aeb15] * src/sas/sasgui/guiframe/data_panel.py (modified) data panel: put the data/theory label in the tree root so it is visible ... Thu, 02 Mar 2017 20:44:58 GMT Paul Kienzle [a97aebd] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) Merge branch 'master' into expandable-de-688 Thu, 02 Mar 2017 16:40:28 GMT krzywon [8c0d9eb] * 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/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.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) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) Merge branch 'master' into ticket-844-part2 Thu, 02 Mar 2017 16:40:13 GMT krzywon [2d568f6] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Change which method is called to only update params, but not calculate ... Thu, 02 Mar 2017 14:12:51 GMT krzywon [fdaf2b1] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Force a redraw of the model every time a new one is selected. #862 Wed, 01 Mar 2017 18:39:46 GMT krzywon [c1c9929] * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) Set smearer model before entering the smearing calculation. #844 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 21:29:52 GMT Paul Kienzle [775e0b7] * src/sas/sascalc/data_util/qsmearing.py (modified) use relative import for local files 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 Tue, 28 Feb 2017 16:33:01 GMT krzywon [27ba79c] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Simplify and fix _on_select_data method. Mon, 27 Feb 2017 16:58:17 GMT krzywon [c221349] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) Split unit axis and label on "|" and then strip whitespace. Mon, 27 Feb 2017 15:18:44 GMT krzywon [e64a03e] * setup.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * 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/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/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Merge branch 'ticket-756' of https://github.com/SasView/sasview into ... Mon, 27 Feb 2017 15:18:31 GMT krzywon [71601312] * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Put the category name change in the right place. Mon, 27 Feb 2017 15:10:28 GMT krzywon [7a5aedd] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Move 'Custom Models' to 'Plugin Models' to name conversion. Mon, 27 Feb 2017 14:58:22 GMT krzywon [be36447] * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Set dxl & dxw values when sending data to fitting and small cleanup of ... 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 Mon, 27 Feb 2017 03:23:04 GMT butler [5295cf5] * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) update documentation for plugin vs customized (and a few spelling ... Sat, 25 Feb 2017 20:33:43 GMT butler [ef2cdb3] * setup.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.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) Merge remote-tracking branch 'origin/master' into ticket-756 Fri, 24 Feb 2017 14:39:00 GMT GitHub [7caf3e5] * setup.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.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/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 Fri, 24 Feb 2017 14:29:18 GMT Paul Kienzle [9525358] * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) sesans reader: fix xaxis/yaxis labels so that they don't break the ... Wed, 22 Feb 2017 20:29:41 GMT krzywon [3d55219] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Check for slit smearing as well as pinhole, more pythonic truth checking ... Tue, 21 Feb 2017 21:22:47 GMT krzywon [03137f1] * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) Default dQ is now None. dQ from data is selected automatically if dta ... Tue, 21 Feb 2017 20:40:52 GMT krzywon [4387385] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Save states with 'Customized Models' category now load as 'Plugin ... Sun, 19 Feb 2017 23:02:07 GMT butler [11b094f] * 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) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) Merge remote-tracking branch 'origin/master' into ticket-756 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:45:01 GMT Paul Kienzle [1a8e13f0] * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) remove unnecessary sleep Tue, 14 Feb 2017 20:27:46 GMT GitHub [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 [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 18:29:56 GMT krzywon [bcabf4e] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) 2D masking loaded properly and mask is now saved as 1s and 0s as per ... Tue, 07 Feb 2017 16:39:39 GMT krzywon [5e6df0e] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) Simplified the check for data error bars. Tue, 07 Feb 2017 16:05:25 GMT krzywon [6d2b50b] * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Change the elif block to a dictionary search to minimize the number of ... Tue, 07 Feb 2017 15:33:53 GMT krzywon [eb2dc13] * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) Be sure 2D error data exists before trying to save it in projects and ... 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. Mon, 06 Feb 2017 22:02:46 GMT Paul Kienzle [157b716] * src/sas/sascalc/data_util/qsmearing.py (modified) simplify interface to sesans transform