Changeset 6e6dd4c in sasview
- Timestamp:
- Apr 16, 2017 2:27:35 PM (8 years ago)
- Branches:
- master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 914c49d5
- Parents:
- 3e5648b (diff), e5cbbce (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. - Files:
-
- 7 added
- 2 deleted
- 21 edited
- 3 moved
-
.gitignore (modified) (view diffs)
-
Vagrantfile (modified) (view diffs)
-
Vagrantprovision.sh (modified) (view diffs)
-
docs/sasview/Tutorial.pdf (modified) (view diffs)
-
docs/sasview/Tutorial.pptx (modified) (view diffs)
-
docs/sasview/Tutorial_SV2.pdf (moved) (moved from docs/sasview/Tutorial_Old.pdf) (view diffs)
-
docs/sasview/Tutorial_SV2.pptx (moved) (moved from docs/sasview/Tutorial_Old.pptx) (view diffs)
-
docs/sasview/Tutorial_SV3.pdf (added)
-
docs/sasview/Tutorial_SV3.pptx (added)
-
docs/sphinx-docs/build_sphinx.py (modified) (view diffs)
-
docs/sphinx-docs/source/user/tutorial.rst (modified) (view diffs)
-
docs/sphinx-docs/source/user/working.rst (modified) (view diffs)
-
run.py (modified) (view diffs)
-
sasview/logger_config.py (added)
-
sasview/logging.ini (modified) (view diffs)
-
sasview/media/README.txt (modified) (view diffs)
-
sasview/media/Tutorial.pdf (modified) (view diffs)
-
sasview/media/getting_started_with_sasview.pdf (added)
-
sasview/sasview.py (modified) (view diffs)
-
sasview/setup_exe.py (modified) (view diffs)
-
sasview/setup_mac.py (modified) (view diffs)
-
sasview/test/nr_data/NR_Ni_down_state.txt (added)
-
sasview/test/nr_data/NR_Ni_up_state.txt (added)
-
setup.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/gui_manager.py (modified) (view diffs)
-
src/sas/sasgui/perspectives/calculator/sld_panel.py (modified) (view diffs)
-
test/fileconverter/test/export2d.h5 (deleted)
-
src/sas/sascalc/dataloader/manipulations.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py (modified) (view diffs)
-
src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py (deleted)
-
src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_boxsum.py (moved) (moved from src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py) (view diffs)
-
src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (added)
-
src/sas/sasgui/perspectives/fitting/basepage.py (modified) (view diffs)
Note: See TracChangeset
for help on using the changeset viewer.
