Changeset 229da98 in sasview for prview/perspectives/pr

Timestamp:

Feb 11, 2011 8:53:25 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

03314e7

Parents:

90a7bbd

Message:

working prview inversion state

Location:

prview/perspectives/pr

Files:

• inversion_state.py (modified) (1 diff)
• pr.py (modified) (3 diffs)

prview/perspectives/pr/inversion_state.py

@@ -486 +486 @@
         elif len(output) == 1:
             # Call back to post the new state
-            #self.call_back(output[0].meta_data['prstate'], datainfo = output[0])
-            self.state = output[0].meta_data['prstate']
+            self.call_back(output[0].meta_data['prstate'], datainfo = output[0])
+            #self.state = output[0].meta_data['prstate']
             return output[0]
         else:

prview/perspectives/pr/pr.py

@@ -140 +140 @@
             if data is None:
                 raise RuntimeError, "Pr.set_state: datainfo parameter cannot be None in standalone mode"
-            """
+            
             # Ensuring that plots are coordinated correctly
             t = time.localtime(data.meta_data['prstate'].timestamp)
@@ -150 +150 @@
                 max_char = len(data.meta_data['prstate'].file)
             
-            data.meta_data['prstate'].file = data.meta_data['prstate'].file[0:max_char] +' [' + time_str + ']'
+            datainfo.meta_data['prstate'].file = data.meta_data['prstate'].file[0:max_char] +' [' + time_str + ']'
             data.filename = data.meta_data['prstate'].file
-             """   
-            self.current_plottable = data
-            # self.current_plottable.group_id = data.meta_data['prstate'].file
+             
+            self.current_plottable = self.parent.create_gui_data(data,None)
+            self.current_plottable.group_id = data.meta_data['prstate'].file
             
             # Make sure the user sees the P(r) panel after loading
@@ -161 +161 @@
             
             # Load the P(r) results
-            state = self.state_reader.get_state()
+            #state = self.state_reader.get_state()
             wx.PostEvent(self.parent, NewPlotEvent(plot=self.current_plottable,
                                         title=self.current_plottable.title))