Ignore:
Timestamp:
Feb 27, 2015 8:33:57 PM (10 years ago)
Author:
butler
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:
3f5d75b
Parents:
906a325 (diff), 4ddf30e4 (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/perspectives/fitting/fitting.py

    r386ffe1 r39356b5  
    523523        self.fit_panel.clear_panel() 
    524524         
    525     def set_default_perspective(self): 
    526         """ 
    527         Call back method that True to notify the parent that the current plug-in 
    528         can be set as default perspective. 
    529         when returning False, the plug-in is not candidate for an automatic 
    530         default perspective setting 
    531         """ 
    532         return True 
    533      
    534525    def delete_data(self, data): 
    535526        """ 
Note: See TracChangeset for help on using the changeset viewer.