Changeset d703451 in sasview

Timestamp:

Mar 21, 2016 9:09:35 AM (9 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:

• resultpanel.py (modified) (2 diffs)
• media/fitting_help.rst (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/resultpanel.py

@@ -9 +9 @@
 import wx.lib.newevent
 from wx.aui import AuiNotebook as Notebook
+
+import datetime
 
 from bumps.gui.convergence_view import ConvergenceView
@@ -56 +58 @@
 
     def on_plot_results(self, event):
-        self.frame.Show()
+        self.frame.Show(True)
         result = event.result[0][0]
+        filename = result.data.sas_data.filename
+        current_time = datetime.datetime.now().strftime("%I:%M%p, %B %d, %Y")
+        self.parent.SetTitle(self.window_name + " - " + filename + " - " + current_time)
         if hasattr(result, 'convergence'):
             best, pop = result.convergence[:, 0], result.convergence[:, 1:]

src/sas/sasgui/perspectives/fitting/media/fitting_help.rst

@@ -117 +117 @@
 ---------------
 
-For a complete list of all the library models available in SasView, see the section
-:ref:`Models`.
+For a complete list of all the library models available in SasView, see the Model Documentation.
 
 It is also possible to add your own models.