Changeset 5d63ea0 in sasview for src/sas/perspectives/calculator

Timestamp:

Feb 17, 2015 8:45:34 AM (10 years ago)

Author:

smk78

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:

54b9ad2

Parents:

66e579f (diff), 400155b (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' of ​https://github.com/SasView/sasview.git

Location:

src/sas/perspectives/calculator

Files:

• data_editor.py (modified) (1 diff)
• media/data_operator_help.rst (added)
• media/data_operator_help_v0.html (moved) (moved from src/sas/perspectives/calculator/media/data_operator_help.html)
• media/density_calculator_help.rst (added)
• media/density_calculator_help_v0.html (moved) (moved from src/sas/perspectives/calculator/media/density_calculator_help.html)
• media/image_viewer_help.rst (added)
• media/kiessig_calculator_help.rst (added)
• media/kiessig_calculator_help_v0.html (moved) (moved from src/sas/perspectives/calculator/media/kiessig_calculator_help.html)
• media/load_image_help_v0.html (moved) (moved from src/sas/perspectives/calculator/media/load_image_help.html)
• media/pycrust_help_v0.html (moved) (moved from src/sas/perspectives/calculator/media/pycrust_help.html)
• media/python_shell_help.rst (added)
• media/resolution_calculator_help.rst (added)
• media/resolution_calculator_help_v0.html (moved) (moved from src/sas/perspectives/calculator/media/resolution_calculator_help.html)
• media/sas_calculator_help.rst (added)
• media/sld_calculator_help.rst (added)
• media/sld_calculator_help_v0.html (moved) (moved from src/sas/perspectives/calculator/media/sld_calculator_help.html)
• media/slit_calculator_help.rst (added)
• media/slit_calculator_help_v0.html (moved) (moved from src/sas/perspectives/calculator/media/slit_calculator_help.html)

src/sas/perspectives/calculator/data_editor.py

@@ -46 +46 @@
     
     if error is not None:
-        message += "When contacting the DANSE team,"
+        message += "When contacting the SasView team,"
         message += " mention the following:\n%s" % str(error)