Changeset ce64735 in sasview

Timestamp:

Nov 17, 2008 8:19:11 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:

9696b075

Parents:

4ce29e0

Message:

small changes not committed

Location:

guiframe

Files:

• data_loader.py (modified) (1 diff)
• local_perspectives/plotting/DataPanel.py (modified) (3 diffs)

guiframe/data_loader.py

@@ -89 +89 @@
     
     filename = os.path.basename(path)
-    new_plot.source=output   
+    new_plot.source=output.source
     new_plot.name = filename
     new_plot.interactive = True
-    print "loader output.detector",output.detector
+    #print "loader output.detector",output.source
     new_plot.detector =output.detector
     # If the data file does not tell us what the axes are, just assume...

guiframe/local_perspectives/plotting/DataPanel.py

@@ -16 +16 @@
 from danse.common.plottools.plottables import Graph,Data1D
 from sans.guicomm.events import EVT_NEW_PLOT
-from sans.guicomm.events import StatusEvent 
+from sans.guicomm.events import StatusEvent ,NewPlotEvent
 
 class PanelMenu(wx.Menu):
@@ -514 +514 @@
       
         id = wx.NewId()
-        slicerpop.Append(id, '&Line slicer [Q-view]')
-        wx.EVT_MENU(self, id, self.onLineSlicer) 
-        
-        id = wx.NewId()
-        slicerpop.Append(id, '&Annulus slicer [Phi-view]')
-        wx.EVT_MENU(self, id, self.onAnnulusSlicer) 
-        
-        id = wx.NewId()
-        slicerpop.Append(id, '&Clear slicer')
-        wx.EVT_MENU(self, id, self.onClearSlicer) 
-        
-        id = wx.NewId()
-        slicerpop.Append(id, '&Edit Parameters')
-        wx.EVT_MENU(self, id, self._onEditDetector) 
+        slicerpop.Append(id, '&sector averaging')
+        wx.EVT_MENU(self, id, self.onSectorSlicer) 
+        
+    
         
         pos = event.GetPosition()
@@ -534 +524 @@
    
 
-    def onLineSlicer(self, event):
+    def onSectorSlicer(self, event):
         print "onLineSlicer"
-        
-    def onAnnulusSlicer(self, event):
-        print "onAnnulusSlicer"
-    def onClearSlicer(self, event):
-        print "onClearSlicer"
-    def _onEditDetector(self, event):
-        print "_onEditDetector"
-    def onSaveImage(self, event):
-        print "onSaveImage"
-    def _onToggleScale(self, event):
-        print "_onToggleScale"
-    def _onToggleEnable(self, event):
-        print "_onToggleEnable"
+        import math
+        from DataLoader.manipulations import SectorPhi
+        for item in self.graph.plottables:
+            r= SectorPhi(005,.01, 0.0, math.pi/2.0)
+            print r(item)
+            data=r(item)
+        new_plot= Data1D(x=data.x,y=data.y,dy=data.dy )
+        new_plot.name = "sector"
+        new_plot.group_id= "sector"
+        #wx.PostEvent(self.parent, NewPlotEvent(plot=r(item), title="Analytical model"))
+        wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title="Analytical model"))
+        
+        
+