Changeset fa6a8d1 in sasview


Ignore:
Timestamp:
Feb 19, 2015 6:13:24 AM (9 years ago)
Author:
krzywon
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:
74d679d, 80c84b5
Parents:
4749514 (diff), 98f6916 (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/

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sasview/license.txt

    r79492222 r98f6916  
    22as part of the Distributed Data Analysis of Neutron Scattering  
    33Experiments (DANSE) project funded by the US National Science Foundation 
    4 and is currently being developed as an open source project hosted at SourceForge 
    5 and managed by a consortium of scattering facilities.  Participating facilities 
    6 include: The University of Maryland, The European Spallation Source, ISIS, The Institut Laue Langevin,  
    7 The National Institute of Standards and Technology Center for Neutron Research  
    8 and the Oak Ridge National Laboratory Neutron Sciences Directorate. 
     4and is currently being developed as an open source project hosted on GitHub 
     5and managed by a consortium of scattering facilities. 
     6 
     7Participating facilities include: the University of Tennessee, the University  
     8of Maryland, the European Spallation Source, the National Institute of  
     9Standards & Technology Center for Neutron Research, the Oak Ridge National  
     10Laboratory Neutron Sciences Directorate, the ISIS Neutron & Muon Source, the  
     11Institut Laue Langevin, the Diamond Light Source, and Delft University of  
     12Technology. 
    913 
    1014If you use this application to do scientific research that leads to publication,  
    11 we ask that you acknowledge the use of the software with the following sentence: 
     15we kindly ask that you acknowledge the use of the software with the following  
     16sentence: 
    1217 
    13 "This work benefited from the use of the SasView application, originally developed under NSF award DMR-0520547."  
     18*"This work benefited from the use of the SasView application, originally  
     19developed under NSF award DMR-0520547."* 
    1420 
    15 copyright 2009-2011, UTK, UMD, NIST, ORNL, ISIS, ESS, and ILL 
     21(C) 2009-2015 UTK, UMD, ESS, NIST, ORNL, ISIS, ILL, DLS, DUT 
  • src/sas/dataloader/loader.py

    r5e326a6 r4749514  
    363363        :return: DataInfo object 
    364364        """ 
    365         print self.__registry.extensions 
    366365        return self.__registry.load(file, format) 
    367366     
  • src/sas/guiframe/local_perspectives/plotting/slicerpanel.py

    r79492222 r27ab091  
    1717    #TODO: show units 
    1818    #TODO: order parameters properly 
    19      ## Internal name for the AUI manager 
     19    ## Internal name for the AUI manager 
    2020    window_name = "Slicer panel" 
    2121    ## Title to appear on top of the window 
     
    7676                         flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=15) 
    7777        else: 
    78             title = wx.StaticText(self, -1, "Slicer Parameters",  
     78            title_text = str(type) + "Parameters" 
     79            title = wx.StaticText(self, -1, title_text,  
    7980                                  style=wx.ALIGN_LEFT) 
    8081            self.bck.Add(title, (0, 0), (1, 2),  
     
    125126    def onSetFocus(self, evt): 
    126127        """ 
    127         Hightlight the textcrtl 
     128        Highlight the txtcrtl 
    128129        """ 
     130        evt.Skip() 
    129131        # Get a handle to the TextCtrl 
    130132        widget = evt.GetEventObject() 
     
    147149        """ 
    148150        Parameters have changed 
    149         """  
     151        """ 
     152        evt.Skip() 
    150153        params = {} 
    151154        has_error = False 
Note: See TracChangeset for help on using the changeset viewer.