Changeset e843a1c in sasview
- Timestamp:
- Feb 17, 2015 10:49:39 AM (9 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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 61c93b3
- Parents:
- 4ec242e (diff), 0c4bca6 (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:
-
- 72 added
- 11 deleted
- 16 edited
- 31 moved
-
build.txt (added)
-
docs/README-BUILD-TIPS.TXT (moved) (moved from docs/README.TXT) (view diffs)
-
docs/pre-sphinx-docs/Graph_help_v0.html (moved) (moved from src/sas/guiframe/media/Graph_help.html) (view diffs)
-
docs/pre-sphinx-docs/NIST_IGOR_SANS_Model_Docs_v4.10.pdf (moved) (moved from src/sas/models/media/NIST_IGOR_SANS_Model_Docs_v4.10.pdf) (view diffs)
-
docs/pre-sphinx-docs/README-OLD-DOCS.TXT (added)
-
docs/pre-sphinx-docs/averaging_help_v0.html (moved) (moved from src/sas/guiframe/media/averaging_help.html) (view diffs)
-
docs/pre-sphinx-docs/batch_help_v0.html (moved) (moved from src/sas/perspectives/fitting/media/batch_help.html) (view diffs)
-
docs/pre-sphinx-docs/category_manager_help_v0.html (moved) (moved from src/sas/perspectives/fitting/media/category_manager_help.html) (view diffs)
-
docs/pre-sphinx-docs/change_scale_help_v0.html (moved) (moved from src/sas/guiframe/media/change_scale_help.html) (view diffs)
-
docs/pre-sphinx-docs/data_explorer_help_v0.html (moved) (moved from src/sas/guiframe/media/data_explorer_help.html) (view diffs)
-
docs/pre-sphinx-docs/data_operator_help_v0.html (moved) (moved from src/sas/perspectives/calculator/media/data_operator_help.html) (view diffs)
-
docs/pre-sphinx-docs/density_calculator_help_v0.html (moved) (moved from src/sas/perspectives/calculator/media/density_calculator_help.html) (view diffs)
-
docs/pre-sphinx-docs/fitting_key_help_v0.html (moved) (moved from src/sas/perspectives/fitting/media/key_help.html) (view diffs)
-
docs/pre-sphinx-docs/glossaryhelp_v0.html (moved) (moved from src/sas/perspectives/fitting/media/glossaryhelp.html) (view diffs)
-
docs/pre-sphinx-docs/graph_key_help_v0.html (moved) (moved from src/sas/guiframe/media/key_help.html) (view diffs)
-
docs/pre-sphinx-docs/help_v0.html (moved) (moved from src/sas/perspectives/fitting/media/help.html) (view diffs)
-
docs/pre-sphinx-docs/invariant_help_v0.html (moved) (moved from src/sas/perspectives/invariant/media/invariant_help.html) (view diffs)
-
docs/pre-sphinx-docs/kiessig_calculator_help_v0.html (moved) (moved from src/sas/perspectives/calculator/media/kiessig_calculator_help.html) (view diffs)
-
docs/pre-sphinx-docs/load_data_help_v0.html (moved) (moved from src/sas/perspectives/fitting/media/load_data_help.html) (view diffs)
-
docs/pre-sphinx-docs/load_image_help_v0.html (moved) (moved from src/sas/perspectives/calculator/media/load_image_help.html) (view diffs)
-
docs/pre-sphinx-docs/model_documentation.docx (moved) (moved from docs/model_documentation.docx) (view diffs)
-
docs/pre-sphinx-docs/model_editor_help_v0.html (moved) (moved from src/sas/perspectives/fitting/media/model_editor_help.html) (view diffs)
-
docs/pre-sphinx-docs/model_use_help_v0.html (moved) (moved from src/sas/perspectives/fitting/media/model_use_help.html) (view diffs)
-
docs/pre-sphinx-docs/pd_help_v0.html (moved) (moved from src/sas/models/media/pd_help.html) (view diffs)
-
docs/pre-sphinx-docs/polar_mag_help_v0.html (moved) (moved from src/sas/models/media/polar_mag_help.html) (view diffs)
-
docs/pre-sphinx-docs/pycrust_help_v0.html (moved) (moved from src/sas/perspectives/calculator/media/pycrust_help.html) (view diffs)
-
docs/pre-sphinx-docs/report_template_v0.html (added)
-
docs/pre-sphinx-docs/resolution_calculator_help_v0.html (moved) (moved from src/sas/perspectives/calculator/media/resolution_calculator_help.html) (view diffs)
-
docs/pre-sphinx-docs/simultaneous_fit_help_v0.html (moved) (moved from src/sas/perspectives/fitting/media/simultaneous_fit_help.html) (view diffs)
-
docs/pre-sphinx-docs/single_fit_help_v0.html (moved) (moved from src/sas/perspectives/fitting/media/single_fit_help.html) (view diffs)
-
docs/pre-sphinx-docs/sld_calculator_help_v0.html (moved) (moved from src/sas/perspectives/calculator/media/sld_calculator_help.html) (view diffs)
-
docs/pre-sphinx-docs/slit_calculator_help_v0.html (moved) (moved from src/sas/perspectives/calculator/media/slit_calculator_help.html) (view diffs)
-
docs/pre-sphinx-docs/smear_computation_v0.html (moved) (moved from src/sas/models/media/smear_computation.html) (view diffs)
-
docs/pre-sphinx-docs/status_bar_help_v0.html (moved) (moved from src/sas/perspectives/fitting/media/status_bar_help.html) (view diffs)
-
docs/sphinx-docs/build_sphinx.py (modified) (view diffs)
-
docs/sphinx-docs/source/user/user.rst (modified) (view diffs)
-
install.txt (added)
-
src/sas/calculator/media/density_calculator_help.rst (deleted)
-
src/sas/calculator/media/kiessig_calculator_help.rst (deleted)
-
src/sas/calculator/media/resolution_calculator_help.rst (deleted)
-
src/sas/calculator/media/sas_calculator_help.rst (deleted)
-
src/sas/calculator/media/sld_calculator.rst (deleted)
-
src/sas/calculator/media/slit_calculator_help.rst (deleted)
-
src/sas/data_util/media/data_operator_help.rst (deleted)
-
src/sas/dataloader/data_info.py (modified) (view diffs)
-
src/sas/dataloader/manipulations.py (modified) (view diffs)
-
src/sas/fit/media/fitting_help.rst (deleted)
-
src/sas/guiframe/documentation_window.py (modified) (view diffs)
-
src/sas/guiframe/gui_manager.py (modified) (view diffs)
-
src/sas/guiframe/local_perspectives/data_loader/data_loader.py (modified) (view diffs)
-
src/sas/guiframe/local_perspectives/plotting/AnnulusSlicer.py (modified) (view diffs)
-
src/sas/guiframe/media/data_explorer_help.rst (modified) (view diffs)
-
src/sas/guiframe/media/graph_help.rst (modified) (view diffs)
-
src/sas/invariant/media/invariant_help.rst (deleted)
-
src/sas/invariant/media/pr_help.rst (deleted)
-
src/sas/models/media/model_functions.rst (modified) (view diffs)
-
src/sas/models/media/readme.txt (deleted)
-
src/sas/perspectives/calculator/data_editor.py (modified) (view diffs)
-
src/sas/perspectives/calculator/media/data_operator_help.rst (added)
-
src/sas/perspectives/calculator/media/density_calculator_help.rst (added)
-
src/sas/perspectives/calculator/media/image_viewer_help.rst (added)
-
src/sas/perspectives/calculator/media/kiessig_calculator_help.rst (added)
-
src/sas/perspectives/calculator/media/python_shell_help.rst (added)
-
src/sas/perspectives/calculator/media/resolution_calculator_help.rst (added)
-
src/sas/perspectives/calculator/media/sas_calculator_help.rst (added)
-
src/sas/perspectives/calculator/media/sld_calculator_help.rst (added)
-
src/sas/perspectives/calculator/media/slit_calculator_help.rst (added)
-
src/sas/perspectives/fitting/media/M_angles_pic.bmp (added)
-
src/sas/perspectives/fitting/media/dm_eq.gif (added)
-
src/sas/perspectives/fitting/media/fitting_help.html (added)
-
src/sas/perspectives/fitting/media/fitting_help.rst (added)
-
src/sas/perspectives/fitting/media/m0x_eq.gif (added)
-
src/sas/perspectives/fitting/media/m0y_eq.gif (added)
-
src/sas/perspectives/fitting/media/m0z_eq.gif (added)
-
src/sas/perspectives/fitting/media/mag_vector.bmp (added)
-
src/sas/perspectives/fitting/media/mqx.gif (added)
-
src/sas/perspectives/fitting/media/mqy.gif (added)
-
src/sas/perspectives/fitting/media/mxp.gif (added)
-
src/sas/perspectives/fitting/media/myp.gif (added)
-
src/sas/perspectives/fitting/media/mzp.gif (added)
-
src/sas/perspectives/fitting/media/pd_image001.png (added)
-
src/sas/perspectives/fitting/media/pd_image002.png (added)
-
src/sas/perspectives/fitting/media/pd_image003.png (added)
-
src/sas/perspectives/fitting/media/pd_image004.jpg (added)
-
src/sas/perspectives/fitting/media/pd_image005.png (added)
-
src/sas/perspectives/fitting/media/pd_image006.jpg (added)
-
src/sas/perspectives/fitting/media/pd_image007.png (added)
-
src/sas/perspectives/fitting/media/pd_image008.png (added)
-
src/sas/perspectives/fitting/media/pd_image009.png (added)
-
src/sas/perspectives/fitting/media/pd_image010.jpg (added)
-
src/sas/perspectives/fitting/media/pd_image011.png (added)
-
src/sas/perspectives/fitting/media/pd_image012.png (added)
-
src/sas/perspectives/fitting/media/pd_image013.jpg (added)
-
src/sas/perspectives/fitting/media/sld1.gif (added)
-
src/sas/perspectives/fitting/media/sld2.gif (added)
-
src/sas/perspectives/fitting/media/sm_image002.gif (added)
-
src/sas/perspectives/fitting/media/sm_image003.gif (added)
-
src/sas/perspectives/fitting/media/sm_image004.gif (added)
-
src/sas/perspectives/fitting/media/sm_image005.gif (added)
-
src/sas/perspectives/fitting/media/sm_image006.gif (added)
-
src/sas/perspectives/fitting/media/sm_image007.gif (added)
-
src/sas/perspectives/fitting/media/sm_image008.gif (added)
-
src/sas/perspectives/fitting/media/sm_image009.gif (added)
-
src/sas/perspectives/fitting/media/sm_image010.gif (added)
-
src/sas/perspectives/fitting/media/sm_image011.gif (added)
-
src/sas/perspectives/fitting/media/sm_image012.gif (added)
-
src/sas/perspectives/fitting/media/sm_image013.gif (added)
-
src/sas/perspectives/fitting/media/sm_image016.gif (added)
-
src/sas/perspectives/fitting/media/sm_image017.gif (added)
-
src/sas/perspectives/fitting/media/sm_image018.gif (added)
-
src/sas/perspectives/fitting/media/sm_image019.gif (added)
-
src/sas/perspectives/fitting/media/sm_image020.gif (added)
-
src/sas/perspectives/fitting/media/sm_image021.gif (added)
-
src/sas/perspectives/fitting/media/sm_image022.gif (added)
-
src/sas/perspectives/fitting/media/sm_image023.gif (added)
-
src/sas/perspectives/fitting/media/sm_image024.gif (added)
-
src/sas/perspectives/fitting/media/sm_image025.gif (added)
-
src/sas/perspectives/fitting/media/sm_image026.gif (added)
-
src/sas/perspectives/fitting/media/sm_image027.gif (added)
-
src/sas/perspectives/fitting/media/sm_image028.gif (added)
-
src/sas/perspectives/invariant/media/invariant_help.rst (added)
-
src/sas/perspectives/invariant/media/report_template.html (modified) (view diffs)
-
src/sas/perspectives/pr/media/pr_help.rst (added)
-
test/pr_inversion/test/test_output.txt (added)
-
test/sasdataloader/test/isis_1_0_write_test.xml (added)
-
test/sasdataloader/test/isis_1_1_write_test.xml (added)
-
test/sasdataloader/test/ring_testdata.txt (modified) (view diffs)
-
test/sasdataloader/test/write_test.xml (added)
-
src/sas/perspectives/fitting/report_dialog.py (modified) (view diffs)
-
src/sas/perspectives/invariant/report_dialog.py (modified) (view diffs)
Note: See TracChangeset
for help on using the changeset viewer.
