Changeset e0a50be in sasview

Timestamp:

Feb 19, 2015 8:56:51 AM (9 years ago)

Author:

Tobias Richter <tobias.richter@…>

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:

96032b3

Parents:

795ea6a2 (diff), 17d30be (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 github.com:SasView/sasview

Files:

• sasview/license.txt (modified) (1 diff)
• src/sas/dataloader/loader.py (modified) (1 diff)
• src/sas/guiframe/local_perspectives/plotting/slicerpanel.py (modified) (4 diffs)
• src/sas/perspectives/calculator/media/image_viewer_help.rst (modified) (1 diff)
• src/sas/perspectives/calculator/media/python_shell_help.rst (modified) (1 diff)
• .gitignore (modified) (2 diffs)
• Vagrantfile (added)
• Vagrantprovision.sh (added)

sasview/license.txt

@@ -2 +2 @@
 as part of the Distributed Data Analysis of Neutron Scattering 
 Experiments (DANSE) project funded by the US National Science Foundation
-and is currently being developed as an open source project hosted at SourceForge
-and managed by a consortium of scattering facilities.  Participating facilities
-include: The University of Maryland, The European Spallation Source, ISIS, The Institut Laue Langevin, 
-The National Institute of Standards and Technology Center for Neutron Research 
-and the Oak Ridge National Laboratory Neutron Sciences Directorate.
+and is currently being developed as an open source project hosted on GitHub
+and managed by a consortium of scattering facilities.
+
+Participating facilities include: the University of Tennessee, the University 
+of Maryland, the European Spallation Source, the National Institute of 
+Standards & Technology Center for Neutron Research, the Oak Ridge National 
+Laboratory Neutron Sciences Directorate, the ISIS Neutron & Muon Source, the 
+Institut Laue Langevin, the Diamond Light Source, and Delft University of 
+Technology.
 
 If you use this application to do scientific research that leads to publication, 
-we ask that you acknowledge the use of the software with the following sentence:
+we kindly ask that you acknowledge the use of the software with the following 
+sentence:
 
-"This work benefited from the use of the SasView application, originally developed under NSF award DMR-0520547." 
+*"This work benefited from the use of the SasView application, originally 
+developed under NSF award DMR-0520547."*
 
-copyright 2009-2011, UTK, UMD, NIST, ORNL, ISIS, ESS, and ILL
+(C) 2009-2015 UTK, UMD, ESS, NIST, ORNL, ISIS, ILL, DLS, DUT

src/sas/dataloader/loader.py

@@ -363 +363 @@
         :return: DataInfo object
         """
-        print self.__registry.extensions
         return self.__registry.load(file, format)
     

src/sas/guiframe/local_perspectives/plotting/slicerpanel.py

@@ -17 +17 @@
     #TODO: show units
     #TODO: order parameters properly
-     ## Internal name for the AUI manager
+    ## Internal name for the AUI manager
     window_name = "Slicer panel"
     ## Title to appear on top of the window
@@ -76 +76 @@
                          flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=15)
         else:
-            title = wx.StaticText(self, -1, "Slicer Parameters", 
+            title_text = str(type) + "Parameters"
+            title = wx.StaticText(self, -1, title_text, 
                                   style=wx.ALIGN_LEFT)
             self.bck.Add(title, (0, 0), (1, 2), 
@@ -125 +126 @@
     def onSetFocus(self, evt):
         """
-        Hightlight the textcrtl
+        Highlight the txtcrtl
         """
+        evt.Skip()
         # Get a handle to the TextCtrl
         widget = evt.GetEventObject()
@@ -147 +149 @@
         """
         Parameters have changed
-        """ 
+        """
+        evt.Skip()
         params = {}
         has_error = False

src/sas/perspectives/calculator/media/image_viewer_help.rst

@@ -29 +29 @@
 1) Select *Image Viewer* from the *Tool* menu on the SasView toolbar.
 
-2) Select a file and then click *Open*.
+2) Select a file and then click *Open*. If the loading is successful the image 
+   will be displayed.
 
 .. image:: load_image.bmp
-
-   If the loading is successful the image will be displayed.
 
 3) To save, print, or copy the image, or to apply a grid overlay, right-click 

src/sas/perspectives/calculator/media/python_shell_help.rst

@@ -23 +23 @@
 PyCrust has its own Help.
 
-*NOTE! Help() and Credits() do not work on Macs.*
+*NOTE! The Help() and Credits() calls do not work on Macs.*
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ

.gitignore

@@ -12 +12 @@
 .project
 .pydevproject
+.vagrant
 build
 dist
@@ -20 +21 @@
 html
 build
-
+sasview-install
 docs/sphinx-docs