Changeset ffd23b5 in sasview

Timestamp:

Jan 19, 2009 11:39:18 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:

48112ab

Parents:

a2c38de

Message:

 

Location:

guiframe/local_perspectives/plotting

Files:

• AnnulusSlicer.py (modified) (1 diff)
• Plotter1D.py (modified) (5 diffs)
• Plotter2D.py (modified) (1 diff)
• SectorSlicer.py (modified) (1 diff)
• boxSlicer.py (modified) (13 diffs)
• old_ boxSum.py (added)
• plotting.py (modified) (1 diff)
• ring.py (modified) (2 diffs)

guiframe/local_perspectives/plotting/AnnulusSlicer.py

@@ -157 +157 @@
         new_plot.yaxis("\\rm{Intensity} ","cm^{-1}")
         new_plot.group_id = "SectorPhi"+self.base.data2D.name
-        
+        new_plot.xtransform="x"
+        new_plot.ytransform="y"
         wx.PostEvent(self.base.parent, NewPlotEvent(plot=new_plot,
                                                  title="SectorPhi" ))

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -92 +92 @@
             @param event: data event
         """
+       
         #TODO: Check for existence of plot attribute
 
@@ -112 +113 @@
                 # plottable is already draw on the panel
                 is_new = False
-
+        
+            
            
         if is_new:
@@ -134 +136 @@
         #TODO: Should re-factor this
         #if event.plot._xunit != self.graph.prop["xunit"]:
+       
         self.graph.xaxis(event.plot._xaxis, event.plot._xunit)
             
@@ -223 +226 @@
                 id = wx.NewId()
                 slicerpop.Append(id, '&Add errors to data')
+                #print "panel scale before  ",self.xLabel, self.yLabel
+                #print "cyllinder before adding error", self.plots[self.graph.selected_plottable].x
                 wx.EVT_MENU(self, id, self._on_add_errors)
             else:
@@ -276 +281 @@
             label, unit = self.plots[self.graph.selected_plottable].get_yaxis()
             new_plot.yaxis(label, unit)
-            
+            #print "panel scale ",self.xLabel, self.yLabel
             self.graph.delete(self.plots[self.graph.selected_plottable])
             
             self.graph.add(new_plot)
+            # transforming the view of the new data into the same of the previous data
+            self._onEVT_FUNC_PROPERTY()
+            #print "cyllinder", self.plots[self.graph.selected_plottable].x,self.plots[self.graph.selected_plottable].view.x, new_plot.x, new_plot.view.x
             self.plots[self.graph.selected_plottable]=new_plot
             

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -154 +154 @@
             
         self.slicer= None
+       
         # Check axis labels
         #TODO: Should re-factor this

guiframe/local_perspectives/plotting/SectorSlicer.py

@@ -184 +184 @@
         new_plot.yaxis("\\rm{Intensity} ","cm^{-1}")
         new_plot.group_id = "SectorQ"+self.base.data2D.name
+        new_plot.xtransform = "ln(x)"
         wx.PostEvent(self.base.parent, NewPlotEvent(plot=new_plot,
                                                  title="SectorQ" ))

guiframe/local_perspectives/plotting/boxSlicer.py

@@ -13 +13 @@
 import math
 
-#from Plotter1D import AddPlotEvent
+from sans.guicomm.events import NewPlotEvent, StatusEvent
 import SlicerParameters
 import wx
@@ -28 +28 @@
         self.markers = []
         self.axes = axes
-        self.qmax = self.base.qmax
+        self.qmax = self.base.data2D.xmax
         self.connect = self.base.connect
         self.x= x_max
@@ -35 +35 @@
         self.theta2= math.pi/3
         ## Number of points on the plot
-        self.nbins = 20
+        self.nbins = 30
         self.count=0
         self.error=0
-        
+        self.averager=None
         self.left_line = VerticalLine(self, self.base.subplot,color='blue', 
                                       zorder=zorder,
@@ -45 +45 @@
                                         xmin= -self.x,
                                         xmax= -self.x)
-        self.left_line.qmax = self.base.qmax
+        self.left_line.qmax = self.qmax
         
         self.right_line= VerticalLine(self, self.base.subplot,color='black', 
@@ -53 +53 @@
                                      xmin= self.x,
                                      xmax= self.x)
-        self.right_line.qmax = self.base.qmax
+        self.right_line.qmax = self.qmax
         
         self.top_line= HorizontalLine(self, self.base.subplot,color='green', 
@@ -61 +61 @@
                                       ymin= self.y,
                                       ymax= self.y)
-        self.top_line.qmax= self.base.qmax
+        self.top_line.qmax= self.qmax
         
         self.bottom_line= HorizontalLine(self, self.base.subplot,color='gray', 
@@ -69 +69 @@
                                       ymin= -self.y,
                                       ymax= -self.y)
-        self.bottom_line.qmax= self.base.qmax
+        self.bottom_line.qmax= self.qmax
         
         self.update()
@@ -104 +104 @@
         
     def clear(self):
+        self.averager=None
         self.clear_markers()
         self.left_line.clear()
@@ -171 +172 @@
         self.top_line.save(ev)
         self.bottom_line.save(ev)
-
+    def _post_data(self):
+        pass
+        
+    
+    def post_data(self,new_slab=None , nbins=None):
+        """ post data averaging in Q"""
+        x_min= min(self.left_line.x1, self.right_line.x1)
+        x_max= max(self.left_line.x1, self.right_line.x1)
+        
+        y_min= min(self.top_line.y1, self.bottom_line.y1)
+        y_max= max(self.top_line.y1, self.bottom_line.y1)  
+        
+        if nbins !=None:
+            self.nbins
+        if self.averager==None:
+            if new_slab ==None:
+                raise ValueError,"post data:cannot average , averager is empty"
+            self.averager= new_slab
+        bin_width= (x_max + math.fabs(x_min))/self.nbins
+        
+        box = self.averager( x_min=x_min, x_max=x_max, y_min=y_min, y_max=y_max,
+                         bin_width=bin_width)
+        
+        boxavg = box(self.base.data2D)
+        
+        from sans.guiframe.dataFitting import Data1D
+        if hasattr(boxavg,"dxl"):
+            dxl= boxavg.dxl
+        else:
+            dxl= None
+        if hasattr(boxavg,"dxw"):
+            dxw=boxavg.dxw
+        else:
+            dxw= None
+       
+        new_plot = Data1D(x=boxavg.x,y=boxavg.y,dy=boxavg.dy,dxl=dxl,dxw=dxw)
+        new_plot.name = str(self.averager.__name__) +"("+ self.base.data2D.name+")"
+        
+       
+
+        new_plot.source=self.base.data2D.source
+        new_plot.info=self.base.data2D.info
+        new_plot.interactive = True
+        #print "loader output.detector",output.source
+        new_plot.detector =self.base.data2D.detector
+        # If the data file does not tell us what the axes are, just assume...
+        new_plot.xaxis("\\rm{Q}", 'rad')
+        new_plot.yaxis("\\rm{Intensity} ","cm^{-1}")
+        new_plot.group_id = str(self.averager.__name__)+self.base.data2D.name
+        new_plot.id = str(self.averager.__name__)
+        wx.PostEvent(self.base.parent, NewPlotEvent(plot=new_plot,
+                                                 title=str(self.averager.__name__) ))
+        
+        
     def _post_data(self):
         # Compute data
@@ -220 +274 @@
         params["x_max"]= math.fabs(self.right_line.x1)
         params["y_max"]= math.fabs(self.top_line.y1)
-        
+        params["nbins"]= self.nbins
         params["errors"] = self.error
         params["count"]= self.count
@@ -229 +283 @@
         self.x = float(math.fabs(params["x_max"]))
         self.y = float(math.fabs(params["y_max"] ))
-        
+        self.nbins=params["nbins"]
         self.left_line.update(xmin= -1*self.x,
                               xmax = -1*self.x,
@@ -249 +303 @@
                                  ymax= -1*self.y)
        
-        self._post_data()
+        self.post_data( nbins=None)
     def freeze_axes(self):
         self.base.freeze_axes()
@@ -503 +557 @@
         
 
-        
+class BoxInteractorX(BoxInteractor):
+    def __init__(self,base,axes,color='black', zorder=3):
+        BoxInteractor.__init__(self, base, axes, color=color)
+        self.base=base
+        self._post_data()
+    def _post_data(self):
+        from DataLoader.manipulations import SlabX
+        self.post_data(SlabX )   
+        
+
+class BoxInteractorY(BoxInteractor):
+    def __init__(self,base,axes,color='black', zorder=3):
+        BoxInteractor.__init__(self, base, axes, color=color)
+        self.base=base
+        self._post_data()
+    def _post_data(self):
+        from DataLoader.manipulations import SlabY
+        self.post_data(SlabY )   
+        
+        

guiframe/local_perspectives/plotting/plotting.py

@@ -119 +119 @@
             if not hasattr(event.plot,'data'):
                 from Plotter1D import ModelPanel1D
-                new_panel = ModelPanel1D(self.parent, -1, style=wx.RAISED_BORDER)
+                if hasattr(event.plot,"xtransform"):
+                    print "went here"
+                    xtransform = event.plot.xtransform
+                else:
+                   
+                    xtransform =None
+                if hasattr(event.plot,"ytransform"):
+                    ytransform=  event.plot.ytransform
+                else:
+                    ytransform=None
+                new_panel = ModelPanel1D(self.parent, -1,xtransform=xtransform,
+                                         ytransform=ytransform, style=wx.RAISED_BORDER)
             else:
                 from Plotter2D import ModelPanel2D

guiframe/local_perspectives/plotting/ring.py

@@ -26 +26 @@
         self.markers = []
         self.axes = axes
-        self.qmax = self.base.qmax
+        self.qmax = self.base.data2D.xmax
         self.connect = self.base.connect
         
@@ -34 +34 @@
         # Inner circle
         self.inner_circle = RingInteractor(self, self.base.subplot, zorder=zorder, r=self.qmax/2.0)
-        self.inner_circle.qmax = self.base.qmax
+        self.inner_circle.qmax = self.qmax
       
         #self.outer_circle.set_cursor(self.base.qmax/1.8, 0)