Changeset b35d3d1 in sasview for invariantview

Timestamp:

Aug 6, 2010 7: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:

invariantview/perspectives/invariant

Files:

• invariant.py (modified) (1 diff)
• invariant_panel.py (modified) (2 diffs)
• invariant_state.py (modified) (9 diffs)

invariantview/perspectives/invariant/invariant.py

@@ -105 +105 @@
         loader = Loader()
         loader.associate_file_reader(".inv", self.state_reader)
+        loader.associate_file_reader(".svs", self.state_reader)
         # Return the list of panels
         return [self.invariant_panel]

invariantview/perspectives/invariant/invariant_panel.py

@@ -131 +131 @@
             self.reset_panel()
             self.compute_invariant(event=None)
+            self.state.file = self._data.name
         return True  
     def set_message(self):
@@ -166 +167 @@
             if not self.set_data(data):
                 return
-            self.state = state   
-            
+            self.state = state 
+            self.state.file = data.name   
             num = self.state.saved_state['state_num']
             

invariantview/perspectives/invariant/invariant_state.py

@@ -266 +266 @@
         # File name
         element = newdoc.createElement("filename")
-        if self.file is not None:
+        if self.file != None and self.file !='':
             element.appendChild(newdoc.createTextNode(str(self.file)))
         else:
@@ -353 +353 @@
             entry = get_content('ns:filename', node)
             if entry is not None:
-                self.file = entry.text.strip()
-            
+                file_name = entry.text.strip()
+
             # Get time stamp
             entry = get_content('ns:timestamp', node)
@@ -432 +432 @@
                     if input_field is not None:
                         self.set_saved_state(name=item, value=val)
-
+                        
+            self.file = file_name
+            
     def set_report_string(self):
         """
@@ -606 +608 @@
     
     ## Wildcards
-    type = ["Invariant file (*.inv)|*.inv"]
+    type = ["Invariant file (*.inv)|*.inv",
+            "SANSView file (*.svs)|*.svs"]
     ## List of allowed extensions
-    ext=['.inv', '.INV']  
+    ext=['.inv', '.INV', '.svs', 'SVS']  
     
     def __init__(self, call_back, cansas=True):
@@ -660 +663 @@
         : return: InvariantState object
         """
-        # Create an empty state
-        state = InvariantState()
-
+        state = None
         # Locate the invariant node
         try:
             nodes = entry.xpath('ns:%s' % INVNODE_NAME, namespaces={'ns': CANSAS_NS})
-            state.fromXML(node=nodes[0])
+            # Create an empty state
+            if nodes !=[]:
+                state = InvariantState()
+                state.fromXML(node=nodes[0])
         except:
             logging.info("XML document does not contain invariant information.\n %s" % sys.exc_value)  
@@ -683 +687 @@
         """
         output = []
-        
         if os.path.isfile(path):
             basename  = os.path.basename(path)
@@ -702 +705 @@
                     sas_entry = self._parse_entry(entry)
                     invstate = self._parse_state(entry)
-                    sas_entry.meta_data['invstate'] = invstate
-
-                    sas_entry.filename = invstate.file
-                    output.append(sas_entry)
-                
+                    
+                    #invstate could be None when .svs file is loaded
+                    #in this case, skip appending to output
+                    if invstate != None:
+                        sas_entry.meta_data['invstate'] = invstate
+                        sas_entry.filename = invstate.file
+                        output.append(sas_entry)
         else:
             raise RuntimeError, "%s is not a file" % path
@@ -730 +735 @@
         : param invstate: InvariantState object
         """
-
         # 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 invariant information to the XML document
-            if invstate is not None:
-                invstate.toXML(doc=doc, entry_node=sasentry)
-        
+            doc = self.write_toXML(datainfo,invstate)
             # Write the XML document
             fd = open(filename, 'w')
@@ -752 +745 @@
             invstate.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__)
+        #make sure title and data run is filled up.
+        if datainfo.title == None or datainfo.title=='': datainfo.title = datainfo.name
+        if datainfo.run_name == None or datainfo.run_name=={}: 
+            datainfo.run = [str(datainfo.name)]
+            datainfo.run_name[0] = datainfo.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