Changeset d703451 in sasview for src/sas


Ignore:
Timestamp:
Mar 21, 2016 7:09:35 AM (8 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:
d63cf11
Parents:
20846be (diff), fd82d9b (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/sasgui/perspectives/fitting
Files:
2 edited

Legend:

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

    rd85c194 r0c2c324  
    99import wx.lib.newevent 
    1010from wx.aui import AuiNotebook as Notebook 
     11 
     12import datetime 
    1113 
    1214from bumps.gui.convergence_view import ConvergenceView 
     
    5658 
    5759    def on_plot_results(self, event): 
    58         self.frame.Show() 
     60        self.frame.Show(True) 
    5961        result = event.result[0][0] 
     62        filename = result.data.sas_data.filename 
     63        current_time = datetime.datetime.now().strftime("%I:%M%p, %B %d, %Y") 
     64        self.parent.SetTitle(self.window_name + " - " + filename + " - " + current_time) 
    6065        if hasattr(result, 'convergence'): 
    6166            best, pop = result.convergence[:, 0], result.convergence[:, 1:] 
  • src/sas/sasgui/perspectives/fitting/media/fitting_help.rst

    rc812d11 r20846be  
    117117--------------- 
    118118 
    119 For a complete list of all the library models available in SasView, see the section 
    120 :ref:`Models`. 
     119For a complete list of all the library models available in SasView, see the Model Documentation. 
    121120 
    122121It is also possible to add your own models. 
Note: See TracChangeset for help on using the changeset viewer.