Changeset 2d107b8 in sasview for guiframe/local_perspectives/plotting/DataPanel.py

Timestamp:

Dec 11, 2008 6:04:28 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:

f39511b

Parents:

b2c3225

Message:

small changes circular averaging

File:

• guiframe/local_perspectives/plotting/DataPanel.py (modified) (7 diffs)

guiframe/local_perspectives/plotting/DataPanel.py

@@ -18 +18 @@
 from sans.guicomm.events import StatusEvent ,NewPlotEvent
 
+
+from SlicerParameters import SlicerEvent
 from binder import BindArtist
+(InternalEvent, EVT_INTERNAL)   = wx.lib.newevent.NewEvent()
 #from SlicerParameters import SlicerEvent
 #(InternalEvent, EVT_INTERNAL)   = wx.lib.newevent.NewEvent()
@@ -375 +378 @@
         self.slicer_z = 5
         self.slicer = None
-        #self.parent.Bind(EVT_INTERNAL, self._onEVT_INTERNAL)
+        self.parent.Bind(EVT_INTERNAL, self._onEVT_INTERNAL)
         self.axes_frozen = False
         ## Graph        
@@ -457 +460 @@
         
         id = wx.NewId()
-        slicerpop.Append(id, '&Sector')
-        wx.EVT_MENU(self, id, self.onSector) 
-        
-        
+        slicerpop.Append(id, '&Sector Q')
+        wx.EVT_MENU(self, id, self.onSectorQ) 
+        
+        id = wx.NewId()
+        slicerpop.Append(id, '&Sector Phi')
+        wx.EVT_MENU(self, id, self.onSectorPhi) 
       
         
@@ -524 +529 @@
         #self.slicer.update()
         self.draw()
+        
+        
+    def _getEmptySlicerEvent(self):
+        return SlicerEvent(type=None,
+                           params=None,
+                           obj_class=None)
+    def _onEVT_INTERNAL(self, event):
+        """
+            I don't understand why Unbind followed by a Bind
+            using a modified self.slicer doesn't work.
+            For now, I post a clear event followed by
+            a new slicer event...
+        """
+        self._setSlicer(event.slicer)
+            
+    def _setSlicer(self, slicer):
+        # Clear current slicer
+        #printEVT("Plotter2D._setSlicer %s" % slicer)
+        
+        if not self.slicer == None:  
+            self.slicer.clear()            
+            
+        self.slicer_z += 1
+        self.slicer = slicer(self, self.subplot, zorder=self.slicer_z)
+        self.subplot.set_ylim(-self.qmax, self.qmax)
+        self.subplot.set_xlim(-self.qmax, self.qmax)
+        self.update()
+        self.slicer.update()
+        
+        # Post slicer event
+        event = self._getEmptySlicerEvent()
+        event.type = self.slicer.__class__.__name__
+        event.obj_class = self.slicer.__class__
+        event.params = self.slicer.get_params()
+        wx.PostEvent(self.parent, event)
+
     def onCircular(self, event):
         """
-            perform circular averaging
-        """
+            perform circular averaging on Data2D
+        """
+        
         from DataLoader.manipulations import CircularAverage
-    def onSector(self, event):
-        """
-            Perform sector averaging
+        Circle = CircularAverage( r_min= -self.qmax, r_max= self.qmax, bin_width=0.001)
+        circ = Circle(self.data2D)
+        from sans.guiframe.dataFitting import Data1D
+        if hasattr(circ,"dxl"):
+            dxl= circ.dxl
+        else:
+            dxl= None
+        if hasattr(circ,"dxw"):
+            dxw= circ.dxw
+        else:
+            dxw= None
+            
+        new_plot = Data1D(x=circ.x,y=circ.y,dy=circ.dy,dxl=dxl,dxw=dxw)
+        new_plot.name = "Circ avg "+ self.data2D.name
+        new_plot.source=self.data2D.source
+        new_plot.info=self.data2D.info
+        new_plot.interactive = True
+        #print "loader output.detector",output.source
+        new_plot.detector =self.data2D.detector
+        
+        # If the data file does not tell us what the axes are, just assume...
+        new_plot.xaxis("\\rm{q}","A^{-1}")
+        new_plot.yaxis("\\rm{Intensity} ","cm^{-1}")
+        new_plot.group_id = "Circ avg "+ self.data2D.name
+        self.scale = 'log'
+        wx.PostEvent(self.parent, NewPlotEvent(plot=new_plot, title=new_plot.name))
+        
+        
+        
+    def onSectorQ(self, event):
+        """
+            Perform sector averaging on Q
+        """
+        from SectorSlicer import SectorInteractorQ
+              
+        self.slicer_z += 1
+        self.slicer = SectorInteractorQ(self, self.subplot, zorder=self.slicer_z)
+        self.subplot.set_ylim(-self.qmax, self.qmax)
+        self.subplot.set_xlim(-self.qmax, self.qmax)
+        self.update()
+        self.slicer.update()
+        
+        
+    def onSectorPhi(self, event):
+        """
+            Perform sector averaging on Phi
         """
         from SectorSlicer import SectorInteractor
@@ -544 +629 @@
        
     def onClearSlicer(self, event):
-        print "on clear"  
-        
+        """
+            Clear the slicer on the plot
+        """
+        if not self.slicer==None:
+            self.slicer.clear()
+            self.subplot.figure.canvas.draw()
+            self.slicer = None
+        
+            # Post slicer None event
+            event = self._getEmptySlicerEvent()
+            wx.PostEvent(self.parent, event)
           
     def _onEditDetector(self, event):
@@ -553 +647 @@
     def _onToggleScale(self, event):
         """
-            toggle axis and replot image
+            toggle pixel scale and replot image
         """
         if self.scale == 'log':
@@ -562 +656 @@
                    self.ymax_2D,self.zmin_2D ,self.zmax_2D )
         wx.PostEvent(self.parent, StatusEvent(status="Image is in %s scale"%self.scale))
+        
+        
+        
+        
+        
         
 class View1DModelPanel2D( View1DPanel2D):