Changeset f0a9a3cc in sasview

Timestamp:

Jun 8, 2009 2:27:40 PM (16 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:

d4ccbb1

Parents:

ff3f900b

Message:

remove save as xml function

File:

• guiframe/local_perspectives/plotting/Plotter1D.py (modified) (3 diffs)

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -420 +420 @@
                
                
-    def _onSaveXML(self, path):
-        """
-            Save 1D  Data to  XML file
-            
-            TODO: Refactor and remove this method. See TODO in _onSave.
-            
-            @param evt: Menu event
-        """
-        if not path == None:
-            out = open(path, 'w')
-            from DataLoader.readers import cansas_reader
-            reader = cansas_reader.Reader()
-            data= self.plots[self.graph.selected_plottable]
-            if hasattr(data, "info"):
-                datainfo= data.info
-            else:
-                datainfo= data
-            try:
-                reader.write( path, datainfo)
-            except:
-                msg= "couldn't save point %s"%sys.exc_value
-                raise 
-           
-            try:
-                self._default_save_location = os.path.dirname(path)
-            except:
-                pass
-        
-        return 
-    
-    
     def _onsaveTXT(self, path):
         """
@@ -499 +468 @@
             @param evt: Menu event
         """
-        import os
+       
         id = str(evt.GetId())
         if id in self.action_ids:         
@@ -515 +484 @@
                 #TODO: This is bad design. The DataLoader is designed to recognize extensions.
                 # It should be a simple matter of calling the .save(file, data, '.xml') method
-                # of the DataLoader.loader.Loader class. 
-                
-                if os.path.splitext(mypath)[1].lower() ==".txt":
-                    self._onsaveTXT(path)
-                if os.path.splitext(mypath)[1].lower() ==".xml":
-                    self._onSaveXML(path)
-            
+                # of the DataLoader.loader.Loader class.
+                from DataLoader.loader import  Loader
+                #Instantiate a loader 
+                loader = Loader() 
+                data = self.plots[self.graph.selected_plottable]
+                format=".txt"
+                if os.path.splitext(mypath)[1].lower() == format:
+                     self._onsaveTXT( path)
+
+                format= ".xml"
+                if os.path.splitext(mypath)[1].lower() ==format:
+                    loader.save( path, data, format)
+                try:
+                    self._default_save_location = os.path.dirname(path)
+                except:
+                    pass    
             dlg.Destroy()
             
+            
+    
+