Changeset 8bd764d in sasview

Timestamp:

Feb 25, 2009 11:37: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:

25579e8

Parents:

72b524b

Message:

context menu improve for xml

Location:

guiframe

Files:

• data_loader.py (modified) (4 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (2 diffs)
• local_perspectives/plotting/Plotter2D.py (modified) (2 diffs)

guiframe/data_loader.py

@@ -91 +91 @@
             temp[temp==0]=1
 
-            wx.PostEvent(parent, StatusEvent(status="Loading 2D error bars of 1 \
-            created for : %s"% str(temp[temp==0])))
+            wx.PostEvent(parent, StatusEvent(status="Loading 2D error bars of value 1 \
+            were added to : %s"% output.filename))
             new_plot = Data2D(image=output.data,err_image=temp,
                               xmin=output.xmin,xmax=output.xmax,
@@ -101 +101 @@
         else:
             #print "output.dx, output.dy",output.dx, output.dy
-            if output.dy ==None:
-                #print "went here theory1D"
+            if output.dy ==None :
                 new_plot = Theory1D(output.x,output.y, dxl, dxw)
+            elif len(output.dy[output.dy==0])==len(output.dy):
+                output.dy[output.dy==0]=1 
+                wx.PostEvent(parent, StatusEvent(status="Loading 1D error bars of value 1 \
+                    were added to : %s"%output.filename))
+                new_plot = Theory1D(output.x,output.y,output.dy, dxl, dxw)
             else:
-                new_plot = Data1D(x=output.x,y=output.y,dy=output.dy, dxl=dxl, dxw=dxw)
-        #print "dataloader",output[0],output[1]
-        
+                    
+                new_plot = Data1D(x=output.x,y=output.y,dx=output.dx,dy=output.dy, dxl=dxl, dxw=dxw)
+       
         new_plot.source=output.source
         new_plot.name = output.filename
@@ -129 +133 @@
         except:
             title= filename
-        print "dataloader title", title,output.filename
+        
         wx.PostEvent(parent, NewPlotEvent(plot=new_plot, title=str(title)))
     else:
@@ -144 +148 @@
                 new_plot = Theory1D(item.x,item.y,dxl,dxw)
             else:
-                new_plot = Data1D(x=item.x,y=item.y,dy=item.dy,dxl=dxl,dxw=dxw)
+                new_plot = Data1D(x=item.x,y=item.y,dx=item.dx,dy=item.dy,dxl=dxl,dxw=dxw)
            
             new_plot.source=item.source

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -213 +213 @@
             self.action_ids[str(id)] = plot
             wx.EVT_MENU(self, id, self._onSave)
+            #save as cansas
+            id = wx.NewId()
+            slicerpop.Append(id, "&Save %s canSAS XML" % name)
+            self.action_ids[str(id)] = plot
+            wx.EVT_MENU(self, id, self._onSaveXML)
                 
             # Option to delete plottable
@@ -364 +369 @@
             
             self.graph.render(self)
-            self.subplot.figure.canvas.draw_idle()    
-    
+            self.subplot.figure.canvas.draw_idle() 
+               
+    def _onSaveXML(self, evt):
+        import os
+        id = str(evt.GetId())
+        if id in self.action_ids:         
+            path = None
+            dlg = wx.FileDialog(self, "Choose a file", os.getcwd(), "", "*.xml", wx.SAVE)
+            if dlg.ShowModal() == wx.ID_OK:
+                path = dlg.GetPath()
+                mypath = os.path.basename(path)
+                #print 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):
         """

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -209 +209 @@
         
                 slicerpop.AppendSeparator()
+        
         id = wx.NewId()
         slicerpop.Append(id, '&Edit Detector Parameters')
@@ -262 +263 @@
         pos = self.ScreenToClient(pos)
         self.PopupMenu(slicerpop, pos)
-        
+   
     def _onEditDetector(self, event):
         print "edit detortor param",self.zmin_2D, self.zmax_2D