Changeset 6f1f129 in sasview

Timestamp:

May 25, 2009 4:52:15 PM (16 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:

f68b14a

Parents:

5d98370

Message:

prview: allow to save/load a pr inversion state. removed the load button from the panel.

Location:

prview/perspectives/pr

Files:

• inversion_state.py (added)
• pr.py (modified) (5 diffs)

prview/perspectives/pr/pr.py

@@ -85 +85 @@
         self._default_Iq  = {}
         
+        # Associate the inversion state reader with .prv files
+        from DataLoader.loader import Loader
+        from inversion_state import Reader
+         
+        reader = Reader(self.set_state)
+        l = Loader()
+        l.associate_file_reader('.prv', reader)
+                
         # Log startup
         logging.info("Pr(r) plug-in started")
         
-        
+    def set_state(self, state):
+        """
+            Call-back method for the inversion state reader.
+            This method is called when a .prv file is loaded.
+            
+            @param state: InversionState object
+        """
+        self.control_panel.set_state(state)
+        #print state
 
     def populate_menu(self, id, owner):
@@ -332 +348 @@
         
         
-    def choose_file(self):
+    def choose_file(self, path=None):
         """
         
         """
         #TODO: this should be in a common module
-        return self.parent.choose_file()
+        return self.parent.choose_file(path=path)
                 
                 
@@ -374 +390 @@
                 wx.PostEvent(self.parent, StatusEvent(status=msg))
             else:
+                if dataread is None:
+                    return x, y, err
                 raise RuntimeError, "This tool can only read 1D data"
         
@@ -774 +792 @@
             try:
                 pr = self._create_file_pr(path)
+                
+                # If the file contains nothing, just return
+                if pr is None:
+                    return
+                
                 self.pr = pr
             except:  
@@ -930 +953 @@
                 wx.PostEvent(self.parent, StatusEvent(status=''))
                 x, y, err = self.load(path)
+                
+                # If the file contains no data, just return
+                #TODO: clean this up: we need a way to recognize that not all P(r) files are data
+                if x is None:
+                    return None
             
             # If we have not errors, add statistical errors