Changeset f79b054 in sasview for guitools

Timestamp:

Apr 1, 2008 3:24:24 PM (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:

e2914b1

Parents:

52b1f77

Message:

some changes that will certainly break the code

File:

• guitools/plottables.py (modified) (3 diffs)

guitools/plottables.py

@@ -401 +401 @@
             """
             import copy
+            import numpy
             # 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  = copy.deepcopy(x)
-            self.dx = copy.deepcopy(dx)
+            
+            self.x = numpy.zeros(len(x))
+            self.dx = numpy.zeros(len(x))
             
             for i in range(len(x)):
                  self.x[i] = func(x[i])
-            for i in range(len(dx)):
-                 self.dx[i] = errfunc(dx[i])
+                 self.dx[i] = errfunc(x[i], dx[i])
                           
         def transform_y(self, func, errfunc, y, dy):
@@ -427 +428 @@
                 raise ValueError, "Plottable.View: Given y and dy are not of the same length"
             
-            self.y  = copy.deepcopy(y)
-            self.dy = copy.deepcopy(dy)
-            
+            self.y = numpy.zeros(len(y))
+            self.dy = numpy.zeros(len(y))
+           
             for i in range(len(y)):
                  self.y[i] = func(y[i])
-            for i in range(len(dy)):
-                 self.dy[i] = errfunc(dy[i])
+                 self.dy[i] = errfunc(y[i], dy[i])
      
 class Data1D(Plottable):
@@ -457 +457 @@
     def render(self,plot,**kw):
         plot.points(self.view.x,self.view.y,dx=self.view.dx,dy=self.view.dy,**kw)
+        #plot.points(self.x,self.y,dx=self.dx,dy=self.dy,**kw)
    
     def changed(self):