← Previous Changeset
Next Changeset →

Changeset 82d88d5 in sasview

Timestamp:

Mar 6, 2019 6:18:09 PM (5 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249

Children:

f923967

Parents:

cb64d86 (diff), f205d3a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into py37-sasgui

Files:

: 10 added
: 5 deleted
: 155 edited
: 8 moved

.gitignore (modified) (view diffs)
LICENSE.TXT (modified) (view diffs)
conftest.py (added)
docs/sasview/Tutorial.pdf (modified) (view diffs)
docs/sasview/Tutorial.pptx (modified) (view diffs)
docs/sasview/Tutorial_SV4.pdf (added)
docs/sasview/Tutorial_SV4.pptx (added)
docs/sphinx-docs/source/conf.py (modified) (view diffs)
docs/sphinx-docs/source/user/RELEASE.rst (modified) (view diffs)
installers/license.txt (modified) (view diffs)
setup.py (modified) (view diffs)
src/sas/_config.py (modified) (view diffs)
src/sas/sascalc/calculator/instrument.py (modified) (view diffs)
src/sas/sascalc/calculator/resolution_calculator.py (modified) (view diffs)
src/sas/sascalc/corfunc/corfunc_calculator.py (modified) (view diffs)
src/sas/sascalc/corfunc/transform_thread.py (modified) (view diffs)
src/sas/sascalc/data_util/calcthread.py (modified) (view diffs)
src/sas/sascalc/data_util/nxsunit.py (modified) (view diffs)
src/sas/sascalc/data_util/ordereddicttest.py (modified) (view diffs)
src/sas/sascalc/data_util/registry.py (modified) (view diffs)
src/sas/sascalc/data_util/uncertainty.py (modified) (view diffs)
src/sas/sascalc/dataloader/data_info.py (modified) (view diffs)
src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (view diffs)
src/sas/sascalc/dataloader/loader.py (modified) (view diffs)
src/sas/sascalc/dataloader/manipulations.py (modified) (view diffs)
src/sas/sascalc/dataloader/readers/abs_reader.py (modified) (view diffs)
src/sas/sascalc/dataloader/readers/ascii_reader.py (modified) (view diffs)
src/sas/sascalc/dataloader/readers/associations.py (modified) (view diffs)
src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (view diffs)
src/sas/sascalc/dataloader/readers/cansas_reader_HDF5.py (modified) (view diffs)
src/sas/sascalc/dataloader/readers/danse_reader.py (modified) (view diffs)
src/sas/sascalc/dataloader/readers/red2d_reader.py (modified) (view diffs)
src/sas/sascalc/file_converter/nxcansas_writer.py (modified) (view diffs)
src/sas/sascalc/fit/expression.py (modified) (view diffs)
src/sas/sascalc/fit/models.py (modified) (view diffs)
src/sas/sascalc/fit/pagestate.py (modified) (view diffs)
src/sas/sascalc/invariant/invariant.py (modified) (view diffs)
src/sas/sascalc/pr/distance_explorer.py (modified) (view diffs)
src/sas/sascalc/pr/fit/expression.py (modified) (view diffs)
src/sas/sascalc/pr/invertor.py (modified) (view diffs)
src/sas/sascalc/pr/num_term.py (modified) (view diffs)
src/sas/sascalc/realspace/VolumeCanvas.py (modified) (view diffs)
src/sas/sasgui/guiframe/gui_manager.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py (modified) (view diffs)
src/sas/sasgui/perspectives/calculator/model_editor.py (modified) (view diffs)
src/sas/sasgui/perspectives/corfunc/corfunc_panel.py (modified) (view diffs)
src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst (modified) (view diffs)
src/sas/sasgui/perspectives/fitting/fitpage.py (modified) (view diffs)
src/sas/sasgui/plottools/PlotPanel.py (modified) (view diffs)
src/sas/sasview/__init__.py (modified) (view diffs)
src/sas/sasview/local_config.py (modified) (view diffs)
src/sas/sasview/test/1d_data/33837rear_1D_1.75_16.5_NXcanSAS.h5 (deleted)
src/sas/sasview/test/1d_data/FK403_0006_Nika.hdf (added)
src/sas/sasview/test/1d_data/Lew_Sa3_DSM_QinA.h5 (added)
src/sas/sasview/test/1d_data/VTMA.h5 (added)
src/sas/sasview/test/2d_data/33837rear_2D_1.75_16.5_NXcanSAS.h5 (deleted)
src/sas/sasview/test/2d_data/BAM_2D.h5 (added)
test/calculatorview/test/utest_gui_sld.py (modified) (view diffs)
test/pr_inversion/test/utest_explorer.py (modified) (view diffs)
test/sascalculator/test/utest_sld.py (modified) (view diffs)
test/sasdataloader/plugins/test_reader.py (modified) (view diffs)
test/sasdataloader/test/cansas_1Dand2D_multiplesasentry_multiplesasdata.h5 (deleted)
test/sasdataloader/test/cansas_1Dand2D_samedatafile.h5 (deleted)
test/sasdataloader/test/cansas_1Dand2D_samesasentry.h5 (deleted)
test/sasdataloader/test/sam14_cor.txt (moved) (moved from test/sasdataloader/test/sam14_cor.cor) (view diffs)
test/sasdataloader/test/test_data/MAR07232_rest.h5 (moved) (moved from test/sasdataloader/test/MAR07232_rest.h5) (view diffs)
test/sasdataloader/test/test_data/avg_testdata.txt (moved) (moved from test/sasdataloader/test/avg_testdata.txt) (view diffs)
test/sasdataloader/test/test_data/nxcansas_1Dand2D_multisasdata.h5 (added)
test/sasdataloader/test/test_data/nxcansas_1Dand2D_multisasentry.h5 (added)
test/sasdataloader/test/test_data/nxcansas_1Dand2D_multisasentry_multisasdata.h5 (added)
test/sasdataloader/test/test_data/ring_testdata.txt (moved) (moved from test/sasdataloader/test/ring_testdata.txt) (view diffs)
test/sasdataloader/test/test_data/sectorphi_testdata.txt (moved) (moved from test/sasdataloader/test/sectorphi_testdata.txt) (view diffs)
test/sasdataloader/test/test_data/sectorq_testdata.txt (moved) (moved from test/sasdataloader/test/sectorq_testdata.txt) (view diffs)
test/sasdataloader/test/test_data/slabx_testdata.txt (moved) (moved from test/sasdataloader/test/slabx_testdata.txt) (view diffs)
test/sasdataloader/test/test_data/slaby_testdata.txt (moved) (moved from test/sasdataloader/test/slaby_testdata.txt) (view diffs)
test/sasdataloader/test/utest_abs_reader.py (modified) (view diffs)
test/sasdataloader/test/utest_ascii.py (modified) (view diffs)
test/sasdataloader/test/utest_averaging.py (modified) (view diffs)
test/sasdataloader/test/utest_cansas.py (modified) (view diffs)
test/sasdataloader/test/utest_generic_file_reader_class.py (modified) (view diffs)
test/sasdataloader/test/utest_red2d_reader.py (modified) (view diffs)
test/sasdataloader/test/utest_sesans.py (modified) (view diffs)
test/sasinvariant/test/utest_data_handling.py (modified) (view diffs)
test/sasinvariant/test/utest_use_cases.py (modified) (view diffs)
test/sasrealspace/test/utest_oriented.py (modified) (view diffs)
test/sasrealspace/test/utest_realspace.py (modified) (view diffs)
src/sas/sasgui/guiframe/CategoryInstaller.py (modified) (view diffs)
src/sas/sasgui/guiframe/CategoryManager.py (modified) (view diffs)
src/sas/sasgui/guiframe/custom_pstats.py (modified) (view diffs)
src/sas/sasgui/guiframe/data_manager.py (modified) (view diffs)
src/sas/sasgui/guiframe/data_panel.py (modified) (view diffs)
src/sas/sasgui/guiframe/data_processor.py (modified) (view diffs)
src/sas/sasgui/guiframe/data_state.py (modified) (view diffs)
src/sas/sasgui/guiframe/gui_statusbar.py (modified) (view diffs)
src/sas/sasgui/guiframe/gui_style.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/data_loader/load_thread.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/plotting/AzimutSlicer.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/plotting/Edge.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/plotting/appearanceDialog.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/plotting/binder.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/plotting/boxMask.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py (modified) (view diffs)
src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py (modified) (view diffs)
src/sas/sasgui/guiframe/plugin_base.py (modified) (view diffs)
src/sas/sasgui/guiframe/proxy.py (modified) (view diffs)
src/sas/sasgui/guiframe/report_dialog.py (modified) (view diffs)
src/sas/sasgui/guiframe/startup_configuration.py (modified) (view diffs)
src/sas/sasgui/guiframe/utils.py (modified) (view diffs)
src/sas/sasgui/perspectives/calculator/__init__.py (modified) (view diffs)
src/sas/sasgui/perspectives/calculator/calculator.py (modified) (view diffs)
src/sas/sasgui/perspectives/calculator/collimation_editor.py (modified) (view diffs)
src/sas/sasgui/perspectives/calculator/data_editor.py (modified) (view diffs)
src/sas/sasgui/perspectives/calculator/data_operator.py (modified) (view diffs)
src/sas/sasgui/perspectives/calculator/density_panel.py (modified) (view diffs)
src/sas/sasgui/perspectives/calculator/detector_editor.py (modified) (view diffs)
src/sas/sasgui/perspectives/calculator/gen_scatter_panel.py (modified) (view diffs)
src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) (view diffs)
src/sas/sasgui/perspectives/calculator/kiessig_calculator_panel.py (modified) (view diffs)
src/sas/sasgui/perspectives/calculator/resolcal_thread.py (modified) (view diffs)
src/sas/sasgui/perspectives/calculator/resolution_calculator_panel.py (modified) (view diffs)
src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) (view diffs)
src/sas/sasgui/perspectives/calculator/slit_length_calculator_panel.py (modified) (view diffs)
src/sas/sasgui/perspectives/corfunc/__init__.py (modified) (view diffs)
src/sas/sasgui/perspectives/corfunc/corfunc.py (modified) (view diffs)
src/sas/sasgui/perspectives/corfunc/corfunc_state.py (modified) (view diffs)
src/sas/sasgui/perspectives/file_converter/__init__.py (modified) (view diffs)
src/sas/sasgui/perspectives/file_converter/converter_panel.py (modified) (view diffs)
src/sas/sasgui/perspectives/file_converter/converter_widgets.py (modified) (view diffs)
src/sas/sasgui/perspectives/fitting/__init__.py (modified) (view diffs)
src/sas/sasgui/perspectives/fitting/basepage.py (modified) (view diffs)
src/sas/sasgui/perspectives/fitting/fit_thread.py (modified) (view diffs)
src/sas/sasgui/perspectives/fitting/fitpanel.py (modified) (view diffs)
src/sas/sasgui/perspectives/fitting/fitproblem.py (modified) (view diffs)
src/sas/sasgui/perspectives/fitting/fitting.py (modified) (view diffs)
src/sas/sasgui/perspectives/fitting/model_thread.py (modified) (view diffs)
src/sas/sasgui/perspectives/fitting/resultpanel.py (modified) (view diffs)
src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) (view diffs)
src/sas/sasgui/perspectives/invariant/__init__.py (modified) (view diffs)
src/sas/sasgui/perspectives/invariant/invariant.py (modified) (view diffs)
src/sas/sasgui/perspectives/invariant/invariant_details.py (modified) (view diffs)
src/sas/sasgui/perspectives/invariant/invariant_panel.py (modified) (view diffs)
src/sas/sasgui/perspectives/invariant/invariant_state.py (modified) (view diffs)
src/sas/sasgui/perspectives/invariant/report_dialog.py (modified) (view diffs)
src/sas/sasgui/perspectives/pr/__init__.py (modified) (view diffs)
src/sas/sasgui/perspectives/pr/explore_dialog.py (modified) (view diffs)
src/sas/sasgui/perspectives/pr/inversion_panel.py (modified) (view diffs)
src/sas/sasgui/perspectives/pr/inversion_state.py (modified) (view diffs)
src/sas/sasgui/perspectives/pr/pr.py (modified) (view diffs)
src/sas/sasgui/perspectives/pr/pr_thread.py (modified) (view diffs)
src/sas/sasgui/perspectives/simulation/ShapeAdapter.py (modified) (view diffs)
src/sas/sasgui/perspectives/simulation/ShapeParameters.py (modified) (view diffs)
src/sas/sasgui/perspectives/simulation/__init__.py (modified) (view diffs)
src/sas/sasgui/perspectives/simulation/simulation.py (modified) (view diffs)
src/sas/sasgui/plottools/LineModel.py (modified) (view diffs)
src/sas/sasgui/plottools/__init__.py (modified) (view diffs)
src/sas/sasgui/plottools/binder.py (modified) (view diffs)
src/sas/sasgui/plottools/canvas.py (modified) (view diffs)
src/sas/sasgui/plottools/convert_units.py (modified) (view diffs)
src/sas/sasgui/plottools/fitDialog.py (modified) (view diffs)
src/sas/sasgui/plottools/fittings.py (modified) (view diffs)
src/sas/sasgui/plottools/plottable_interactor.py (modified) (view diffs)
src/sas/sasgui/plottools/plottables.py (modified) (view diffs)
src/sas/sasgui/plottools/toolbar.py (modified) (view diffs)
src/sas/sasgui/plottools/transform.py (modified) (view diffs)
src/sas/sasview/sasview.py (modified) (view diffs)
src/sas/sasview/welcome_panel.py (modified) (view diffs)
src/sas/sasview/wxcruft.py (modified) (view diffs)

Note: See TracChangeset for help on using the changeset viewer.

SasView

Changeset 82d88d5 in sasview

Download in other formats: