Changeset 6cfe703 in sasview

Timestamp:

Mar 31, 2008 2:45:13 PM (17 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:

e40b651

Parents:

6b8399b

Message:

fixing X⁽²⁾

Location:

guitools

Files:

• LineModel.py (added)
• PropertyDialog.py (added)
• fitDialog.py (added)
• plottables.py (modified) (5 diffs)

guitools/plottables.py

@@ -199 +199 @@
         
         return labels
+    def returnPlottable(self):
+        return self.plottables
 
     def render(self,plot):
@@ -332 +334 @@
 
     def __init__(self):
-        pass
+        self.view = View()
     
     def render(self,plot):
@@ -342 +344 @@
         that it makes sense.
         """
-        plot.xaxis(self._xaxis, self._xunit)
-        plot.yaxis(self._yaxis, self._yunit)
+        self.view.render()
+        #plot.xaxis(self._xaxis, self._xunit)
+        #plot.yaxis(self._yaxis, self._yunit)
         
     def colors(self):
         """Return the number of colors need to render the object"""
         return 1
+    
+    def transform_x(self, func, errfunc):
+        """
+            @param func: reference to x transformation function
+            
+        """
+        self.view.transform_x(func, errfunc, self.x, self.dx)
+    
+    def transform_y(self, func, errfunc):
+        """
+            @param func: reference to y transformation function
+            
+        """
+        self.view.transform_y(func, errfunc, self.y, self.dy)
     
     class View:
@@ -378 +395 @@
                 raise ValueError, "Plottable.View: Given x and dx are not of the same length"
             
-            self.x  = deepcopy(x)
-            self.dx = deepcopy(dx)
+            self.x  = copy.deepcopy(x)
+            self.dx = copy.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):
             """
@@ -405 +422 @@
                  self.y[i] = func(y[i])
                  self.dy[i] = errfunc(dy[i])
-                      
-        
+        def render(self,plot):
+            """The base class makes sure the correct units are being used for
+            subsequent plottable.  
+            
+            For now it is assumed that the graphs are commensurate, and if you 
+            put a Qx object on a Temperature graph then you had better hope 
+            that it makes sense.
+            """
+            plot.xaxis(self._xaxis, self._xunit)
+            plot.yaxis(self._yaxis, self._yunit)
+                          
+            
 
 class Data1D(Plottable):