# # ChangeLog for src/sas/sasgui/guiframe in sasview # # Generated by Trac 1.0.1 # Nov 26, 2024 6:03:27 AM Sun, 17 Sep 2017 00:26:13 GMT butler [b01ac8f] * .pydevproject (modified) * README.md (modified) * docs/sphinx-docs/build_sphinx.py (modified) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/2d_data/Dec07031.ASC (deleted) * sasview/test/2d_data/HiResSAN14.ASC (deleted) * sasview/test/2d_data/MAR07262.ASC (deleted) * sasview/test/2d_data/SILIC009.ASC (deleted) * setup.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/IgorReader.py (deleted) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.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/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/defaults.json (deleted) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted) * src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/ascii2d_loader.py (added) * src/sas/sascalc/pr/c_extensions/Cinvertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.c (modified) * src/sas/sascalc/pr/c_extensions/invertor.h (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/combine_batch_grid.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_page.png (added) * src/sas/sasgui/perspectives/fitting/media/combine_batch_plot.png (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/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/simfitpage.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/media/pr_help.rst (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * test/fileconverter/test/cansas1d.xml (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/AR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.h5 (added) * test/sasdataloader/test/testLoad.py (deleted) * test/sasdataloader/test/testplugings.py (deleted) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_extension_registry.py (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) * test/sasdataloader/test/valid_cansas_xml.xml (added) * test/sasinvariant/test/utest_use_cases.py (modified) * test/utest_sasview.py (modified) * sasview/images/dls_logo.png (moved) * src/sas/sasgui/guiframe/images/angles.png (deleted) * src/sas/sasgui/guiframe/images/angles_flat.png (deleted) * src/sas/sasgui/guiframe/images/ansto_logo.png (deleted) * src/sas/sasgui/guiframe/images/danse_logo.png (deleted) * src/sas/sasgui/guiframe/images/ess_logo.png (deleted) * src/sas/sasgui/guiframe/images/ill_logo.png (deleted) * src/sas/sasgui/guiframe/images/isis_logo.png (deleted) * src/sas/sasgui/guiframe/images/nist_logo.png (deleted) * src/sas/sasgui/guiframe/images/nsf_logo.png (deleted) * src/sas/sasgui/guiframe/images/ornl_logo.png (deleted) * src/sas/sasgui/guiframe/images/sns_logo.png (deleted) * src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted) * src/sas/sasgui/guiframe/images/umd_logo.png (deleted) * src/sas/sasgui/guiframe/images/utlogo.gif (deleted) Merge remote-tracking branch 'origin/master' into 969_about_box_logo Mon, 11 Sep 2017 10:55:51 GMT lewis [729198e] * README.md (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/2d_data/Dec07031.ASC (deleted) * sasview/test/2d_data/HiResSAN14.ASC (deleted) * sasview/test/2d_data/MAR07262.ASC (deleted) * sasview/test/2d_data/SILIC009.ASC (deleted) * setup.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/IgorReader.py (deleted) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.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/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/defaults.json (deleted) * src/sas/sascalc/dataloader/readers/hfir1d_reader.py (deleted) * src/sas/sascalc/dataloader/readers/nexus_reader.py (deleted) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/ascii2d_loader.py (added) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (modified) * test/fileconverter/test/cansas1d.xml (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/AR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.ASC (deleted) * test/sasdataloader/test/MAR07232_rest.h5 (added) * test/sasdataloader/test/testLoad.py (deleted) * test/sasdataloader/test/testplugings.py (deleted) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_averaging.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/utest_extension_registry.py (added) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasdataloader/test/utest_sesans.py (modified) * test/sasdataloader/test/valid_cansas_xml.xml (added) * test/sasinvariant/test/utest_use_cases.py (modified) * test/utest_sasview.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) Merge branch 'master' into FixingTicket741 Wed, 30 Aug 2017 09:55:36 GMT lewis [2d9526d] * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) Refactor P(Q)*S(Q) plot updating logic, and ensure unsmeared theory is ... Mon, 21 Aug 2017 14:16:13 GMT lewis [dcb91cf] * src/sas/sascalc/dataloader/file_reader_base_class.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/file_converter/ascii2d_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * test/fileconverter/test/cansas1d.xml (modified) * test/sasdataloader/test/utest_extension_registry.py (added) * test/sasdataloader/test/valid_cansas_xml.xml (added) Make suggested changes Tue, 01 Aug 2017 16:02:35 GMT lewis [5a8cdbb] * check_packages.py (modified) * run.py (modified) * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/nr_data/NR_Ni_down_state.txt (added) * sasview/test/nr_data/NR_Ni_up_state.txt (added) * sasview/test/sesans_data/sphere2micron.ses (modified) * sasview/test/sesans_data/sphere_isis.ses (added) * sasview/wxcruft.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/formatnum.py (modified) * src/sas/sascalc/data_util/nxsunit.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/data_util/registry.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/sesans_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified) * src/sas/sascalc/simulation/iqPy/tests/signon.py (modified) * src/sas/sascalc/simulation/iqPy/tests/testiq.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (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/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/gui_style.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 (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added) * src/sas/sasgui/guiframe/proxy.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/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * test/calculatorview/__init__.py (added) * test/calculatorview/test/__init__.py (added) * test/corfunc/__init__.py (added) * test/corfunc/test/__init__.py (added) * test/fileconverter/__init__.py (added) * test/fileconverter/test/__init__.py (added) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/pr_inversion/__init__.py (added) * test/pr_inversion/test/__init__.py (added) * test/pr_inversion/test/utest_invertor.py (modified) * test/run_one.py (modified) * test/sascalculator/__init__.py (added) * test/sascalculator/test/__init__.py (added) * test/sasdataloader/__init__.py (added) * test/sasdataloader/plugins/__init__.py (added) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/__init__.py (added) * test/sasdataloader/test/isis_1_0_write_test.xml (deleted) * test/sasdataloader/test/isis_1_1_write_test.xml (deleted) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/sesans_examples/next_gen.ses (added) * test/sasdataloader/test/sesans_examples/no_spin_echo_unit.ses (added) * test/sasdataloader/test/sesans_examples/no_wavelength.ses (added) * test/sasdataloader/test/sesans_examples/sesans_no_data.ses (added) * test/sasdataloader/test/sesans_examples/sphere2micron.ses (added) * test/sasdataloader/test/sesans_examples/sphere_isis.ses (added) * test/sasdataloader/test/sesans_examples/too_many_headers.ses (added) * test/sasdataloader/test/testplugings.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/sasdataloader/test/utest_sesans.py (added) * test/sasdataloader/test/write_test.xml (deleted) * test/sasguiframe/__init__.py (added) * test/sasguiframe/test/__init__.py (added) * test/sasguiframe/test/utest_manipulations.py (modified) * test/sasinvariant/__init__.py (added) * test/sasinvariant/test/__init__.py (added) * test/sasrealspace/__init__.py (added) * test/sasrealspace/test/__init__.py (added) * 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) * setup.py (modified) * src/sas/sascalc/dataloader/file_reader_base_class.py (added) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/__init__.py (modified) * src/sas/sascalc/dataloader/readers/abs_reader.py (modified) * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/associations.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/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/defaults.json (deleted) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * test/sascalculator/test/utest_slit_length_calculator.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * test/sasdataloader/test/utest_generic_file_reader_class.py (added) * test/sasdataloader/test/utest_red2d_reader.py (modified) * test/sasinvariant/test/utest_use_cases.py (modified) Merge branch 'master' into ticket-876 Mon, 31 Jul 2017 10:28:48 GMT lewis [fafe52a] * src/sas/sascalc/dataloader/readers/anton_paar_saxs_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) Refactor Anton Paar SAXS reader to use FileReader class Mon, 31 Jul 2017 09:07:50 GMT lewis [9df816b] * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) Only show warning messages once Thu, 27 Jul 2017 16:13:00 GMT lewis [8dec7e7] * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) Raise DefaultReaderException in NXcanSAS reader and handle correctly Thu, 13 Jul 2017 11:21:06 GMT Piotr Rozyczko [a6ee176] * sasview/images/dls_logo.png (moved) * src/sas/sasgui/guiframe/images/angles.png (deleted) * src/sas/sasgui/guiframe/images/angles_flat.png (deleted) * src/sas/sasgui/guiframe/images/ansto_logo.png (deleted) * src/sas/sasgui/guiframe/images/danse_logo.png (deleted) * src/sas/sasgui/guiframe/images/ess_logo.png (deleted) * src/sas/sasgui/guiframe/images/ill_logo.png (deleted) * src/sas/sasgui/guiframe/images/isis_logo.png (deleted) * src/sas/sasgui/guiframe/images/nist_logo.png (deleted) * src/sas/sasgui/guiframe/images/nsf_logo.png (deleted) * src/sas/sasgui/guiframe/images/ornl_logo.png (deleted) * src/sas/sasgui/guiframe/images/sns_logo.png (deleted) * src/sas/sasgui/guiframe/images/tudelft_logo.png (deleted) * src/sas/sasgui/guiframe/images/umd_logo.png (deleted) * src/sas/sasgui/guiframe/images/utlogo.gif (deleted) Modified file distribution to avoid duplication. Fixes #969 Thu, 08 Jun 2017 17:28:28 GMT krzywon [47d93073] * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Apply new parameters before savig data. Mon, 22 May 2017 20:03:30 GMT krzywon [edc7852] * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Incorporate log binning into sector parameter window. Fri, 19 May 2017 13:41:37 GMT krzywon [324e0bf] * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Support numpy v1.12 - integer indices. Fri, 19 May 2017 13:33:29 GMT krzywon [8de66b6] * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) Integrate log binning into SectorSlicer. Wed, 10 May 2017 13:39:17 GMT krzywon [8e15dce] * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Modified manipulations to clarify what is needed. Save sliced data as ... Tue, 02 May 2017 12:05:48 GMT Paul Kienzle [914c49d5] * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/wxcruft.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/formatnum.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified) * src/sas/sascalc/simulation/iqPy/tests/signon.py (modified) * src/sas/sascalc/simulation/iqPy/tests/testiq.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (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/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/proxy.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/model_editor.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * test/fileconverter/test/utest_nxcansas_writer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/run_one.py (modified) * test/sasdataloader/plugins/test_reader.py (modified) * test/sasdataloader/test/isis_1_0_write_test.xml (deleted) * test/sasdataloader/test/isis_1_1_write_test.xml (deleted) * test/sasdataloader/test/sequence_tests.py (modified) * test/sasdataloader/test/testplugings.py (modified) * test/sasdataloader/test/utest_abs_reader.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasdataloader/test/write_test.xml (deleted) * 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) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added) Merge branch 'master' into batch_slicer Mon, 01 May 2017 04:26:11 GMT andyfaff [a1b8fee] * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/wxcruft.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/formatnum.py (modified) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/IgorReader.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/expression.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/expression.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified) * src/sas/sascalc/simulation/iqPy/tests/signon.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (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/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/proxy.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/model_editor.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/pr/pr.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) MAINT: from __future__ import print_function Sun, 30 Apr 2017 22:15:17 GMT andyfaff [9c3d784] * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/wxcruft.py (modified) * src/examples/data_generator/testdata_generator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/dataloader/readers/associations.py (modified) * src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/signon.py (modified) * src/sas/sascalc/simulation/analmodelpy/tests/testanal_model.py (modified) * src/sas/sascalc/simulation/geoshapespy/tests/testshapes.py (modified) * src/sas/sascalc/simulation/iqPy/tests/signon.py (modified) * src/sas/sascalc/simulation/iqPy/tests/testiq.py (modified) * src/sas/sascalc/simulation/pointsmodelpy/tests/signon.py (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/sasgui/guiframe/config.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/dummyapp.py (modified) * src/sas/sasgui/guiframe/gui_style.py (modified) * src/sas/sasgui/guiframe/proxy.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/model_editor.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/pr/pr.py (modified) * src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/binder.py (modified) * src/sas/sasgui/plottools/convert_units.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) MAINT: using print function Sun, 16 Apr 2017 18:27:35 GMT Paul Kienzle [6e6dd4c] * .gitignore (modified) * Vagrantfile (modified) * Vagrantprovision.sh (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) * run.py (modified) * sasview/logger_config.py (added) * sasview/logging.ini (modified) * sasview/media/README.txt (modified) * sasview/media/Tutorial.pdf (modified) * sasview/media/getting_started_with_sasview.pdf (added) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/test/nr_data/NR_Ni_down_state.txt (added) * sasview/test/nr_data/NR_Ni_up_state.txt (added) * setup.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * test/fileconverter/test/export2d.h5 (deleted) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) Merge branch 'master' into batch_slicer 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 13:51:05 GMT krzywon [278ddee] * .gitattributes (modified) * .gitignore (modified) * .travis.yml (modified) * Vagrantfile (modified) * Vagrantprovision.sh (modified) * check_packages.py (modified) * docs/pandoc-docs/Makefile (added) * docs/pandoc-docs/build_pandoc.py (added) * docs/pandoc-docs/source/README.txt (added) * 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/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) * run.py (modified) * sasview/__init__.py (modified) * sasview/custom_config.py (modified) * sasview/installer_generator.py (modified) * sasview/local_config.py (modified) * sasview/logger_config.py (added) * sasview/logging.ini (added) * sasview/media/README.txt (modified) * sasview/media/Tutorial.pdf (modified) * sasview/media/getting_started_with_sasview.pdf (added) * sasview/sasview.py (modified) * sasview/setup_exe.py (modified) * sasview/setup_mac.py (modified) * sasview/welcome_panel.py (modified) * setup.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/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/loader.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/cansas_constants.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/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/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/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/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/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/CategoryManager.py (modified) * src/sas/sasgui/guiframe/__init__.py (modified) * src/sas/sasgui/guiframe/aboutbox.py (modified) * src/sas/sasgui/guiframe/config.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_processor.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_manager.py (modified) * src/sas/sasgui/guiframe/gui_statusbar.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/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.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/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/SlicerParameters.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/__init__.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/binder.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/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/plugin_base.py (modified) * src/sas/sasgui/guiframe/proxy.py (modified) * src/sas/sasgui/guiframe/report_dialog.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/pyconsole.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/slit_length_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/source_editor.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/media/fdr-pdfs.rst (modified) * src/sas/sasgui/perspectives/file_converter/file_converter.py (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.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.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/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/fitting/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_state.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_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/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/binder.py (modified) * src/sas/sasgui/plottools/canvas.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/plottables.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/fileconverter/test/export2d.h5 (deleted) * test/logging.ini (added) * test/pr_inversion/test/utest_explorer.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/run_one.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/isis_1_0_write_test.xml (modified) * test/sasdataloader/test/isis_1_1_write_test.xml (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/sasdataloader/test/write_test.xml (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) * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/loader_exceptions.py (added) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) Merge branch 'master' into ticket-876 # Conflicts: # ... 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 17:00:32 GMT krzywon [3e5648b] * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Resolve merge conflicts and 2 small fixes to slicer panel. #467 Mon, 10 Apr 2017 16:42:23 GMT krzywon [6267876] * .gitattributes (modified) * check_packages.py (modified) * docs/pandoc-docs/Makefile (added) * docs/pandoc-docs/build_pandoc.py (added) * docs/pandoc-docs/source/README.txt (added) * 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/local_config.py (modified) * sasview/media/README.txt (modified) * sasview/setup_mac.py (modified) * sasview/welcome_panel.py (modified) * setup.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/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/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/cansas_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/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/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/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/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/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/config.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_processor.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_manager.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/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.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/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/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/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/plugin_base.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/pyconsole.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/slit_length_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/source_editor.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/media/fdr-pdfs.rst (modified) * src/sas/sasgui/perspectives/fitting/__init__.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.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.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/model_thread.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_state.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_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/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/canvas.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/plottables.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/fileconverter/test/export2d.h5 (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) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) Merge branch 'master' into batch_slicer # Conflicts: # ... Mon, 10 Apr 2017 12:40:40 GMT krzywon [37d461c] * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (modified) Allow box_sum calculator to use some of the repeated class methods ... Mon, 10 Apr 2017 11:43:20 GMT krzywon [3f75203] * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Update append value when parameters change and code cleanup. Mon, 10 Apr 2017 09:02:12 GMT krzywon [82ce1d0] * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Sending to fitting and batch fitting is now working as expected. see ... Mon, 10 Apr 2017 08:55:48 GMT krzywon [88188b4] * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Remove simultaneous fitting as an option. Sun, 09 Apr 2017 12:48:35 GMT ajj [d26f025] * check_packages.py (modified) * docs/pandoc-docs/Makefile (added) * docs/pandoc-docs/build_pandoc.py (added) * docs/pandoc-docs/source/README.txt (added) * sasview/media/README.txt (modified) * sasview/setup_mac.py (modified) * sasview/welcome_panel.py (modified) * src/sas/sascalc/calculator/kiessig_calculator.py (modified) * src/sas/sascalc/calculator/resolution_calculator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/cansas_writer.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified) * src/sas/sasgui/guiframe/panel_base.py (modified) * src/sas/sasgui/guiframe/plugin_base.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/data_editor.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/TextDialog.py (modified) * src/sas/sasgui/plottools/arrow3d.py (modified) * src/sas/sasgui/plottools/canvas.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) * sasview/local_config.py (modified) * src/sas/sasgui/guiframe/config.py (modified) Merge branch 'master' of https://www.github.com/sasview/sasview Sun, 09 Apr 2017 12:47:21 GMT ajj [ea45bfe] * sasview/local_config.py (modified) * src/sas/sasgui/guiframe/config.py (modified) Changing link for list of contributors to point to website. Website ... Sun, 09 Apr 2017 10:30:10 GMT andyfaff [45dffa69] * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) MAINT: more 'not x is None' fixes Sun, 09 Apr 2017 10:11:31 GMT andyfaff [7432acb] * sasview/welcome_panel.py (modified) * src/sas/sascalc/calculator/resolution_calculator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/calcthread.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/file_converter/cansas_writer.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/invariant/invariant.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified) * src/sas/sasgui/guiframe/plugin_base.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/guiframe/utils.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) * src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/fitting/batchfitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/report_dialog.py (modified) * src/sas/sasgui/perspectives/invariant/invariant.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/inversion_state.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/simulation/simulation.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/TextDialog.py (modified) * src/sas/sasgui/plottools/arrow3d.py (modified) * src/sas/sasgui/plottools/canvas.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/sasdataloader/test/utest_cansas.py (modified) MAINT: search+replace '!= None' by 'is not None' Sun, 09 Apr 2017 10:08:43 GMT andyfaff [ac07a3a] * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) MAINT: replace 'not x is None' by 'x is not None' Sun, 09 Apr 2017 09:46:10 GMT andyfaff [235f514] * check_packages.py (modified) * sasview/setup_mac.py (modified) * src/sas/sascalc/calculator/kiessig_calculator.py (modified) * src/sas/sascalc/calculator/sas_gen.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/danse_reader.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sascalc/file_converter/cansas_writer.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/Loader.py (modified) * src/sas/sascalc/fit/MultiplicationModel.py (modified) * src/sas/sascalc/pr/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/pr/fit/Loader.py (modified) * src/sas/sascalc/pr/invertor.py (modified) * src/sas/sascalc/pr/num_term.py (modified) * src/sas/sascalc/realspace/VolumeCanvas.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_processor.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py (modified) * src/sas/sasgui/guiframe/panel_base.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/perspectives/calculator/calculator.py (modified) * src/sas/sasgui/perspectives/calculator/data_editor.py (modified) * src/sas/sasgui/perspectives/calculator/data_operator.py (modified) * src/sas/sasgui/perspectives/calculator/density_panel.py (modified) * src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) * src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) * src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) * src/sas/sasgui/perspectives/pr/pr.py (modified) * src/sas/sasgui/perspectives/pr/pr_thread.py (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/fitDialog.py (modified) * src/sas/sasgui/plottools/fittings.py (modified) * src/sas/sasgui/plottools/plottable_interactor.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * src/sas/sasgui/plottools/transform.py (modified) * test/pr_inversion/test/utest_invertor.py (modified) * test/sasrealspace/test/sim_validation.py (modified) * test/sasrealspace/test/utest_realspace.py (modified) MAINT: replace '== None' by 'is None' Sun, 09 Apr 2017 08:58:36 GMT wojciech [e645bbb] * src/sas/sasgui/guiframe/data_processor.py (modified) Fixed order of imports Sun, 09 Apr 2017 07:45:49 GMT Ricardo Ferraz Leal [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 12:54:39 GMT krzywon [7a80072] * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Fitting partially works. Problem creating new pages. 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 Sat, 08 Apr 2017 08:21:01 GMT krzywon [377ca62f] * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) All files saved and reloaded into data manager. see #467 Fri, 07 Apr 2017 15:39:57 GMT krzywon [cac1828] * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Refactor to fix window redraw issues. Fri, 07 Apr 2017 10:38:01 GMT krzywon [71b25b2] * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Only save plots associated with selected slicer. 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'. Thu, 06 Apr 2017 15:56:37 GMT krzywon [982577b] * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) File from the box loaded. Events not triggering in proper order. Thu, 06 Apr 2017 15:06:43 GMT krzywon [2df1bd1] * .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/data_info.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/associations.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/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/media/data_formats_help.rst (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/LineModel.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) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added) Merge branch 'master' into batch_slicer Thu, 06 Apr 2017 15:04:29 GMT krzywon [54557b5] * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Integer params in manipulations to comply with numpy v1.12. Nearly ... Thu, 06 Apr 2017 13:10:22 GMT smk78 [76c4469] * src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) Fixed some failing superscripts in SESANS section of ... Wed, 05 Apr 2017 16:56:22 GMT GitHub [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:42:59 GMT krzywon [3444492] * .travis.yml (modified) * src/sas/sasgui/guiframe/media/data_formats_help.rst (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added) Merge branch 'master' into batch_slicer Wed, 05 Apr 2017 15:42:20 GMT krzywon [0d8ee36] * .travis.yml (modified) * build_tools/travis_build.sh (modified) * check_packages.py (modified) * mac_setup_homebrew.sh (added) * run.py (modified) * sasview/local_config.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/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) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added) Merge branch 'master' into batch_slicer Wed, 05 Apr 2017 15:41:47 GMT krzywon [b697396b] * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Check all items in the list box by default. More documentation. 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 15:08:59 GMT krzywon [7f75a3f] * src/sas/sascalc/data_util/registry.py (modified) * src/sas/sascalc/dataloader/loader.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/xml_reader.py (modified) * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) More explicit error messages when file loading fails. see #889 Wed, 05 Apr 2017 12:13:04 GMT krzywon [69400ec] * src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) Ask what to do with files that start with a period when loading ... 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 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 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:12:10 GMT krzywon [1661cd5] * INSTALL.txt (moved) * LICENSE.TXT (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/dataloader/readers/cansas_reader_HDF5.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/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/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added) Merge branch 'master' into batch_slicer Tue, 04 Apr 2017 15:00:39 GMT krzywon [f15da54] * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Apply slicer to plots via events. Look for loaded plots instead of ... Fri, 31 Mar 2017 18:28:20 GMT krzywon [a099131] * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Slicer applied to all data files when slowly stepping through. Need to ... Thu, 30 Mar 2017 13:47:56 GMT krzywon [dfa1579] * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Remove 1D data from batch slice list. Keep initial data set checked. ... 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 17:51:00 GMT krzywon [df27aa8] * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Plot data so it is added to plot_manager. Add non-event drive slicer ... Thu, 23 Mar 2017 01:35:45 GMT krzywon [ba90c32] * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Plot selected data. Thu, 23 Mar 2017 01:26:51 GMT krzywon [24fc06a] * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) Populate data file combo box with loaded files. Wed, 22 Mar 2017 20:32:23 GMT krzywon [f6bb24d] * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) base prototype of the batch slicing window loads. Wed, 22 Mar 2017 14:08:56 GMT krzywon [e075203] * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) PEP 8 Wed, 22 Mar 2017 13:22:37 GMT krzywon [39f0bf4] * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) * src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (moved) Modified slicer parameter panel to incorporate batch slicing. Added ... 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 ... Wed, 01 Mar 2017 14:46:54 GMT butler [8fa3fb8] * .gitignore (modified) * build_tools/jenkins_linux_build.sh (modified) * build_tools/jenkins_osx_build.sh (modified) * build_tools/jenkins_win64_build.bat (modified) * build_tools/jenkins_win_build.bat (modified) * docs/sphinx-docs/source/conf.py (modified) * sasview/README.txt (modified) * sasview/__init__.py (modified) * sasview/custom_config.py (modified) * sasview/local_config.py (modified) * sasview/sasview.spec (added) * sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (added) * sasview/test/save_states/fit_pr_and_invariant_project.svs (added) * sasview/test/save_states/fit_pr_and_inversion_project.svs (deleted) * sasview/test/save_states/fitstate.fitv (modified) * sasview/test/sesans_data/sphere2micron.ses (added) * sasview/test/sesans_data/spheres2micron.ses (deleted) * sasview/version.txt (added) * setup.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_constants.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_0.xsd (modified) * src/sas/sascalc/dataloader/readers/schema/cansas1d_invalid_v1_1.xsd (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/file_converter/c_ext/bsl_loader.c (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) * src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) * src/sas/sasgui/perspectives/corfunc/plot_labels.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/gpu_options.py (added) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/media/sm_help.rst (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) * src/sas/sasgui/perspectives/invariant/media/invariant_help.rst (modified) * src/sas/sasgui/perspectives/pr/media/pr_help.rst (modified) * src/sas/sasgui/plottools/PlotPanel.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) * test/sasdataloader/test/utest_ascii.py (modified) * src/sas/sasgui/guiframe/data_panel.py (modified) Merge remote-tracking branch 'origin/master' into expandable-de-688 Tue, 28 Feb 2017 18:22:40 GMT krzywon [53f0402] * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/media/fitting_help.rst (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * sasview/test/sesans_data/sphere2micron.ses (added) * sasview/test/sesans_data/spheres2micron.ses (deleted) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/cansas_constants.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) Merge branch 'master' into sesans41 Mon, 27 Feb 2017 04:20:48 GMT butler [ddbac66] * src/sas/sasgui/guiframe/CategoryInstaller.py (modified) * src/sas/sasgui/perspectives/calculator/model_editor.py (modified) * src/sas/sasgui/perspectives/calculator/pyconsole.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) Fix remaining custom/customized to plugin conversion Tue, 14 Feb 2017 21:28:07 GMT krzywon [2ffe241] * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) Fix issues with loading 2D data in the SESANS branch and always set ... Tue, 14 Feb 2017 20:27:46 GMT GitHub [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 14:03:45 GMT krzywon [68adf86] * src/sas/sasgui/guiframe/dataFitting.py (modified) Apply a linear transform for SESANS data as default. Fri, 20 Jan 2017 10:45:03 GMT jhbakker [20522e1] * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) Fixes based on Jeff's comments (20170119). Tested with 1D SESANS data on ... Tue, 17 Jan 2017 19:34:45 GMT jhbakker [aad41bb] * src/sas/sasgui/guiframe/dataFitting.py (modified) small bugfix Tue, 17 Jan 2017 19:18:58 GMT jhbakker [a9f579c] * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) Manually added in all the SESANS modifications from Jurtest Fri, 13 Jan 2017 11:58:05 GMT Piotr Rozyczko [73cbeec] * sasview/custom_config.py (modified) * sasview/local_config.py (modified) * src/sas/sasgui/guiframe/customdir.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/startup_configuration.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/gpu_options.py (added) Opencl dialog (#29) Merged OpenCL dialog prototype branch * Support ... Wed, 21 Dec 2016 15:48:31 GMT krzywon [a6fccd7] * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) * sasview/test/save_states/fit_pr_and_invariant_project.svs (added) * sasview/test/save_states/fit_pr_and_inversion_project.svs (deleted) * sasview/test/save_states/fitstate.fitv (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/fitting/models.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) * src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) Merge branch 'master' into ticket-795 Tue, 20 Dec 2016 12:59:08 GMT Paul Kienzle [505706a] * build_tools/jenkins_linux_build.sh (modified) * build_tools/jenkins_osx_build.sh (modified) * build_tools/jenkins_win64_build.bat (modified) * build_tools/jenkins_win_build.bat (modified) * sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (added) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sasgui/perspectives/fitting/fitting.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) Merge branch 'master' into ticket-811 Tue, 20 Dec 2016 12:45:00 GMT Paul Kienzle [d3911e3] * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/model_thread.py (modified) Reproduce sasview smear 2D wrapper so 2D fits work. Fixes #811, #825. Mon, 19 Dec 2016 21:09:08 GMT krzywon [ca224b1] * src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) * src/sas/sasgui/perspectives/fitting/pagestate.py (modified) Delete all plots when resetting state. Mon, 19 Dec 2016 12:23:36 GMT GitHub [345e7e4] * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) Revert "Jurtest2" Mon, 19 Dec 2016 09:40:37 GMT jhbakker [55bc5a7f] * build_tools/jenkins_osx_build.sh (modified) * src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) Merge branch 'master' into Jurtest2 Fri, 16 Dec 2016 15:40:27 GMT krzywon [67b0a99] * src/sas/sasgui/guiframe/gui_manager.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) #761: Constrained fit pages are now deleted if they no longer have any ... Thu, 15 Dec 2016 09:16:17 GMT jhbakker [e1e41de] * build_tools/jenkins_linux_build.sh (modified) * build_tools/jenkins_osx_build.sh (modified) * build_tools/jenkins_win64_build.bat (modified) * build_tools/jenkins_win_build.bat (modified) * sasview/test/2d_data/14250_2D_NoDetInfo_NXcanSAS_v3.h5 (added) * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) * src/sas/sasgui/perspectives/fitting/media/plugin.rst (modified) * src/sas/sascalc/data_util/qsmearing.py (modified) * src/sas/sascalc/dataloader/data_info.py (modified) * src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) * src/sas/sascalc/fit/AbstractFitEngine.py (modified) * src/sas/sascalc/fit/BumpsFitting.py (modified) * src/sas/sasgui/guiframe/dataFitting.py (modified) * src/sas/sasgui/guiframe/data_manager.py (modified) * src/sas/sasgui/perspectives/fitting/basepage.py (modified) * src/sas/sasgui/perspectives/fitting/fitpage.py (modified) * src/sas/sasgui/plottools/plottables.py (modified) Merge branch 'master' into Jurtest Wed, 07 Dec 2016 21:06:16 GMT krzywon [b2b36932] * src/sas/sascalc/dataloader/manipulations.py (modified) * src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) #824: 2D data without detector information can now use the slicers, and ...