Changeset 057210c in sasview

Timestamp:

Mar 17, 2008 10:10:20 AM (17 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

4e290cd

Parents:

2bf92f2

Message:

Added a View class and an example

Location:

guitools

Files:

• PlotPanel.py (modified) (2 diffs)
• plottables.py (modified) (3 diffs)
• test_panel.py (added)

guitools/PlotPanel.py

@@ -10 +10 @@
 from canvas import FigureCanvas
 #TODO: make the plottables interactive
+from plottables import Graph
 
 def show_tree(obj,d=0):
@@ -46 +47 @@
         self.SetSizer(sizer)
 
-
+        # Graph object to manage the plottables
+        self.graph = Graph()
         
         self.Bind(wx.EVT_CONTEXT_MENU, self.onContextMenu)

guitools/plottables.py

@@ -123 +123 @@
         """Properties of the y axis.
         """
-        if self.prop["xunit"] and units != self.prop["xunit"]:
+        if self.prop["yunit"] and units != self.prop["yunit"]:
             pass
             #print "Plottable: how do we handle non-commensurate units"
         self.prop["ylabel"] = "%s (%s)"%(name,units)
-        self.prop["xunit"] = units
+        self.prop["yunit"] = units
         
     def title(self,name):
@@ -348 +348 @@
         """Return the number of colors need to render the object"""
         return 1
-
+    
+    class View:
+        """
+            Representation of the data that might include a transformation
+        """
+        x = None
+        y = None
+        dx = None
+        dy = None
+        
+        def __init__(self, x=None, y=None, dx=None, dy=None):
+            self.x = x
+            self.y = y
+            self.dx = dx
+            self.dy = dy
+            
+        def transform_x(self, func, errfunc, x, dx):
+            """
+                Transforms the x and dx vectors and stores the output.
+                
+                @param func: function to apply to the data
+                @param x: array of x values
+                @param dx: array of error values
+                @param errfunc: function to apply to errors
+            """
+            import copy
+            # Sanity check
+            if dx and not len(x)==len(dx):
+                raise ValueError, "Plottable.View: Given x and dx are not of the same length"
+            
+            self.x  = deepcopy(x)
+            self.dx = deepcopy(dx)
+            
+            for i in range(len(x)):
+                 self.x[i] = func(x[i])
+                 self.dx[i] = errfunc(dx[i])
+                      
+        def transform_y(self, func, errfunc, y, dy):
+            """
+                Transforms the x and dx vectors and stores the output.
+                
+                @param func: function to apply to the data
+                @param y: array of y values
+                @param dy: array of error values
+                @param errfunc: function to apply to errors
+            """
+            import copy
+            # Sanity check
+            if dy and not len(y)==len(dy):
+                raise ValueError, "Plottable.View: Given y and dy are not of the same length"
+            
+            self.y  = deepcopy(y)
+            self.dy = deepcopy(dy)
+            
+            for i in range(len(y)):
+                 self.y[i] = func(y[i])
+                 self.dy[i] = errfunc(dy[i])
+                      
+        
 
 class Data1D(Plottable):
@@ -362 +420 @@
         The label, if it is different, appears on the status bar.
         """
+        self.name = "data"
         self.x = x
         self.y = y
         self.dx = dx
         self.dy = dy
+        
+        self.view = self.View(self.x, self.y, self.dx, self.dy)
 
     def render(self,plot,**kw):
-        Plottable.render(self,plot)
-        plot.points(self.x,self.y,dx=self.dx,dy=self.dy,**kw)
+        plot.points(self.view.x,self.view.y,dx=self.view.dx,dy=self.view.dy,**kw)
 
     def changed(self):
         return False
 
+    @classmethod
+    def labels(cls, collection):
+        """Build a label mostly unique within a collection"""
+        map = {}
+        for item in collection:
+            #map[item] = label(item, collection)
+            map[item] = r"$\rm{%s}$" % item.name
+        return map
     
 class Theory1D(Plottable):