Changeset 42d27f2 in sasview

Timestamp:

Apr 13, 2009 11:43:41 AM (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:

309ccaf

Parents:

f31701c

Message:

save points as xml and txt combine

File:

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

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -204 +204 @@
             name = plot.name
            
-            slicerpop.Append(id, "&Save %s points" % name)
+            slicerpop.Append(id, "&Save points" )
             self.action_ids[str(id)] = plot
             wx.EVT_MENU(self, id, self._onSave)
-            
-            id = wx.NewId()
-            slicerpop.Append(id, "&Save %s canSAS XML" % name)
-            self.action_ids[str(id)] = plot
-            wx.EVT_MENU(self, id, self._onSaveXML)
+            #wx.EVT_MENU(self, id, self._onSaveXML)
            
             id = wx.NewId()
@@ -361 +357 @@
                
                
-    def _onSaveXML(self, evt):
+    def _onSaveXML(self, path):
         """
             Save 1D  Data to  XML file
+            @param evt: Menu event
+        """
+        if not path == None:
+            out = open(path, 'w')
+            from DataLoader.readers import cansas_reader
+            reader = cansas_reader.Reader()
+            datainfo= self.plots[self.graph.selected_plottable].info
+            reader.write( path, datainfo)
+        return 
+    
+    
+    def _onsaveTXT(self, path):
+        """
+            Save file as txt
+        """
+        data = self.plots[self.graph.selected_plottable]
+       
+        if not path == None:
+            out = open(path, 'w')
+            has_errors = True
+            if data.dy==None or data.dy==[]:
+                has_errors = False
+                
+            # Sanity check
+            if has_errors:
+                try:
+                    if len(data.y) != len(data.dy):
+
+                        has_errors = False
+                except:
+                    has_errors = False
+            
+            if has_errors:
+                out.write("<X>   <Y>   <dY>\n")
+            else:
+                out.write("<X>   <Y>\n")
+                
+            for i in range(len(data.x)):
+                if has_errors:
+                    out.write("%g  %g  %g\n" % (data.x[i], 
+                                                data.y[i],
+                                               data.dy[i]))
+                else:
+                    out.write("%g  %g\n" % (data.x[i], 
+                                            data.y[i]))
+                    
+            out.close()                 
+                
+                
+    def _onSave(self, evt):
+        """
+            Save a data set to a text file
             @param evt: Menu event
         """
@@ -369 +417 @@
         id = str(evt.GetId())
         if id in self.action_ids:         
+            
             path = None
-            dlg = wx.FileDialog(self, "Choose a file", os.getcwd(), "", "*.xml", wx.SAVE)
+            wildcard = "Text files (*.txt)|*.txt|CanSAS 1D files (*.xml)|*.xml|" 
+        
+            dlg = wx.FileDialog(self, "Choose a file", os.getcwd(), "",wildcard , wx.SAVE)
+           
             if dlg.ShowModal() == wx.ID_OK:
                 path = dlg.GetPath()
                 mypath = os.path.basename(path)
+                
             dlg.Destroy()
-            
-            if not path == None:
-                out = open(path, 'w')
-                from DataLoader.readers import cansas_reader
-                reader = cansas_reader.Reader()
-                datainfo= self.plots[self.graph.selected_plottable].info
-                reader.write( path, datainfo)
-            return 
-                      
-                
-                
-    def _onSave(self, evt):
-        """
-            Save a data set to a text file
-            @param evt: Menu event
-        """
-        import os
-        id = str(evt.GetId())
-        if id in self.action_ids:         
-            
-            path = None
-            dlg = wx.FileDialog(self, "Choose a file", os.getcwd(), "", "*.txt", wx.SAVE)
-            if dlg.ShowModal() == wx.ID_OK:
-                path = dlg.GetPath()
-                mypath = os.path.basename(path)
-                
-            dlg.Destroy()
-            
-            if not path == None:
-                out = open(path, 'w')
-                has_errors = True
-                if self.action_ids[id].dy==None or self.action_ids[id].dy==[]:
-                    has_errors = False
-                    
-                # Sanity check
-                if has_errors:
-                    try:
-                        if len(self.action_ids[id].y) != len(self.action_ids[id].dy):
-    
-                            has_errors = False
-                    except:
-                        has_errors = False
-                
-                if has_errors:
-                    out.write("<X>   <Y>   <dY>\n")
-                else:
-                    out.write("<X>   <Y>\n")
-                    
-                for i in range(len(self.action_ids[id].x)):
-                    if has_errors:
-                        out.write("%g  %g  %g\n" % (self.action_ids[id].x[i], 
-                                                    self.action_ids[id].y[i],
-                                                    self.action_ids[id].dy[i]))
-                    else:
-                        out.write("%g  %g\n" % (self.action_ids[id].x[i], 
-                                                self.action_ids[id].y[i]))
-                        
-                out.close()
-    
-    
-       
+            if os.path.splitext(mypath)[1].lower() ==".txt":
+                self._onsaveTXT(path)
+            if os.path.splitext(mypath)[1].lower() ==".xml":
+                 self._onSaveXML(path)
+        return
+    
+    
+    
+