Changeset 302510b in sasview for prview/perspectives/pr

Timestamp:

Jun 6, 2009 12:57:53 PM (15 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

e733619

Parents:

675e0ab

Message:

prview: minor change to load saved inversions as a separate (time-stamped) problem and avoid confusion with data set that was previously loaded.

Location:

prview/perspectives/pr

Files:

• inversion_panel.py (modified) (1 diff)
• inversion_state.py (modified) (1 diff)
• pr.py (modified) (2 diffs)

prview/perspectives/pr/inversion_panel.py

@@ -349 +349 @@
         if self.manager.standalone==True:
             state.file = self.data_file.GetValue()
+        else:
+            state.file = self.plot_data.GetValue()
         
         # Background evaluation checkbox

prview/perspectives/pr/inversion_state.py

@@ -504 +504 @@
     datainfo = l.load("../../test/cansas1d.xml")
     
-    def call_back(state):
+    def call_back(state, datainfo=None):
         print state
         

prview/perspectives/pr/pr.py

@@ -6 +6 @@
 import wx
 import logging
+import time
 from danse.common.plottools import Data1D, Theory1D
 from sans.guicomm.events import NewPlotEvent, StatusEvent    
@@ -111 +112 @@
                 if datainfo is None:
                     raise RuntimeError, "Pr.set_state: datainfo parameter cannot be None in standalone mode"
+
+                # Ensuring that plots are coordinated correctly
+                t = time.localtime(datainfo.meta_data['prstate'].timestamp)
+                time_str = time.strftime("%b %d %H:%M", t)
+                datainfo.meta_data['prstate'].file = datainfo.meta_data['prstate'].file +' [' + time_str + ']'
+                datainfo.filename = datainfo.meta_data['prstate'].file
                     
                 self.current_plottable = datainfo