Changeset b35d3d1 in sasview for prview

Timestamp:

Aug 6, 2010 5:36:07 PM (14 years ago)

Author:

Jae Cho <jhjcho@…>

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:

028a0e8

Parents:

a93f525

Message:

save state file: working, but more work to do

Location:

prview/perspectives/pr

Files:

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

prview/perspectives/pr/inversion_panel.py

@@ -252 +252 @@
         
         dlg.Destroy()
-                
+        
+        state = self.get_state()
+            
+        self.manager.save_data(filepath=path, prstate=state)
+        
+        return state
+    
+    def get_state(self):
+        """
+        Get the current state
+        
+        : return: state object
+        """
         # Construct the state object    
         state = InversionState()
@@ -287 +299 @@
         state.iq0     = self.iq0
         state.bck     = self.bck
-            
-        self.manager.save_data(filepath=path, prstate=state)
         
         return state

prview/perspectives/pr/inversion_state.py

@@ -341 +341 @@
     
     ## Wildcards
-    type = ["P(r) files (*.prv)|*.prv"]
+    type = ["P(r) files (*.prv)|*.prv",
+            "SANSView files (*.svs)|*.svs"]
     ## List of allowed extensions
-    ext=['.prv', '.PRV']  
+    ext=['.prv', '.PRV', '.svs', '.SVS']  
     
     def __init__(self, call_back, cansas=True):
@@ -401 +402 @@
         
         """
-        # Create an empty state
-        state = InversionState()
+        state = None
         
         # Locate the P(r) node
         try:
             nodes = entry.xpath('ns:%s' % PRNODE_NAME, namespaces={'ns': CANSAS_NS})
-            state.fromXML(node=nodes[0])
+            if nodes !=[]:
+                # Create an empty state
+                state =  InversionState()
+                state.fromXML(node=nodes[0])
         except:
             logging.info("XML document does not contain P(r) information.\n %s" % sys.exc_value)
@@ -447 +450 @@
                     sas_entry = self._parse_entry(entry)
                     prstate = self._parse_prstate(entry)
-                    sas_entry.meta_data['prstate'] = prstate
-                    sas_entry.filename = prstate.file
-                    output.append(sas_entry)
+                    #prstate could be None when .svs file is loaded
+                    #in this case, skip appending to output
+                    if prstate != None:
+                        sas_entry.meta_data['prstate'] = prstate
+                        sas_entry.filename = prstate.file
+                        output.append(sas_entry)
         else:
             raise RuntimeError, "%s is not a file" % path
@@ -475 +481 @@
         # Sanity check
         if self.cansas == True:
-            if datainfo is None:
-                datainfo = DataLoader.data_info.Data1D(x=[], y=[])    
-            elif not issubclass(datainfo.__class__, DataLoader.data_info.Data1D):
-                raise RuntimeError, "The cansas writer expects a Data1D instance: %s" % str(datainfo.__class__.__name__)
-        
-            # Create basic XML document
-            doc, sasentry = self._to_xml_doc(datainfo)
-        
-            # Add the P(r) information to the XML document
-            if prstate is not None:
-                prstate.toXML(doc=doc, entry_node=sasentry)
-        
+            doc =self.write_toXML(datainfo, prstate)        
             # Write the XML document
             fd = open(filename, 'w')
@@ -494 +489 @@
             prstate.toXML(file=filename)
         
-    
-    
+    def write_toXML(self, datainfo=None, state=None):
+        """
+        Write toXML, a helper for write()
+        
+        : return: xml doc
+        """
+        if datainfo is None:
+            datainfo = DataLoader.data_info.Data1D(x=[], y=[])    
+        elif not issubclass(datainfo.__class__, DataLoader.data_info.Data1D):
+            raise RuntimeError, "The cansas writer expects a Data1D instance: %s" % str(datainfo.__class__.__name__)
+    
+        # Create basic XML document
+        doc, sasentry = self._to_xml_doc(datainfo)
+    
+        # Add the invariant information to the XML document
+        if state is not None:
+            state.toXML(doc=doc, entry_node=sasentry)
+            
+        return doc 
+    

prview/perspectives/pr/pr.py

@@ -112 +112 @@
         l = Loader()
         l.associate_file_reader('.prv', self.state_reader)
+        l.associate_file_reader(".sav", self.state_reader)
                 
         # Log startup