Changeset 75fbd17 in sasview for prview/perspectives

Timestamp:

Feb 9, 2011 2:04:24 AM (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:

c83a5af

Parents:

8240eab

Message:

working on save state

Location:

prview/perspectives/pr

Files:

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

prview/perspectives/pr/inversion_state.py

@@ -374 +374 @@
         ## CanSAS format flag
         self.cansas = cansas
+        self.state = None
         
     def read(self, path):
@@ -404 +405 @@
         
         # Call back to post the new state
-        self.call_back(state)
+        self.state = state
+        #self.call_back(state)
         return None
     
+    def get_state(self):
+        return self.state
     def _parse_prstate(self, entry):
         """
@@ -482 +486 @@
         elif len(output) == 1:
             # Call back to post the new state
-            self.call_back(output[0].meta_data['prstate'], datainfo = output[0])
+            #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

@@ -121 +121 @@
         return self.current_plottable
     
-    def set_state(self, state, datainfo=None):
+    def set_state(self, state=None, datainfo=None):
         """
         Call-back method for the inversion state reader.
@@ -131 +131 @@
         """
         try:
-            if datainfo is None:
+            if datainfo.__class__.__name__ == 'list':
+                if len(datainfo) == 1:
+                    data = datainfo[0]
+            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(datainfo.meta_data['prstate'].timestamp)
+            t = time.localtime(data.meta_data['prstate'].timestamp)
             time_str = time.strftime("%b %d %H:%M", t)
             
             # Check that no time stamp is already appended
-            max_char = datainfo.meta_data['prstate'].file.find("[")
+            max_char = data.meta_data['prstate'].file.find("[")
             if max_char < 0:
-                max_char = len(datainfo.meta_data['prstate'].file)
-            
-            datainfo.meta_data['prstate'].file = datainfo.meta_data['prstate'].file[0:max_char] +' [' + time_str + ']'
-            datainfo.filename = datainfo.meta_data['prstate'].file
-                
-            self.current_plottable = datainfo
-            self.current_plottable.group_id = datainfo.meta_data['prstate'].file
+                max_char = len(data.meta_data['prstate'].file)
+            
+            data.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
+            
+            # Make sure the user sees the P(r) panel after loading
+            #self.parent.set_perspective(self.perspective)  
+            self.on_perspective(event=None)   
             
             # Load the P(r) results
+            state = self.state_reader.get_state()
+            wx.PostEvent(self.parent, NewPlotEvent(plot=self.current_plottable,
+                                        title=self.current_plottable.title))
             self.control_panel.set_state(state)
-                        
-            # Make sure the user sees the P(r) panel after loading
-            self.parent.set_perspective(self.perspective)            
-
         except:
-            logging.error("prview.set_state: %s" % sys.exc_value)
+            raise
+            #logging.error("prview.set_state: %s" % sys.exc_value)
 
   
@@ -391 +398 @@
         new_plot.title = "P(r) fit"
         # Make sure that the plot is linear
-        new_plot.xtransform="x"
-        new_plot.ytransform="y"                 
+        new_plot.xtransform = "x"
+        new_plot.ytransform = "y"                 
         wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="P(r) fit"))