Changeset 052a66bc in sasview for guitools/plottables.py

Timestamp:

May 30, 2008 2:14:48 PM (16 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:

be0ea2a

Parents:

6a8adb0

Message:

Bug fixing

File:

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

guitools/plottables.py

@@ -173 +173 @@
         """Detect if any graphed plottables have changed"""
         return any([p.changed() for p in self.plottables])
+    
+    def get_range(self):
+        """
+            Return the range of all displayed plottables
+        """
+        min = None
+        max = None
+        
+        for p in self.plottables:
+            if p.hidden==True:
+                continue
+            
+            if not p.x==None:
+                for x_i in p.x:
+                    if min==None or x_i<min:
+                        min = x_i
+                    if max==None or x_i>max:
+                        max = x_i
+                        
+        return min, max
 
     def delete(self,plottable):
@@ -183 +203 @@
             self.color =0 
             
+    def reset_scale(self):
+        """
+            Resets the scale transformation data to the underlying data
+        """
+        for p in self.plottables:
+            p.reset_view()
 
     def reset(self):
@@ -321 +347 @@
 
 
-class Plottable:
+class Plottable(object):
+    
+    # Short ascii name to refer to the plottable in a menu 
+    short_name = None
+    
+    # Data
+    x  = None
+    y  = None
+    dx = None
+    dy = None
+    
+    # Parameter to allow a plot to be part of the list without being displayed
+    hidden = False
+
+    def __setattr__(self, name, value):
+        """
+            Take care of changes in View when data is changed.
+            This method is provided for backward compatibility.
+        """
+        object.__setattr__(self, name, value)
+        
+        if name in ['x', 'y', 'dx', 'dy']:
+            self.reset_view()
+            #print "self.%s has been called" % name
+
+    def set_data(self, x, y, dx=None, dy=None):
+        self.x = x
+        self.y = y
+        self.dy = dy
+        self.dx = dx
+        self.transformView()
+    
     def xaxis(self, name, units):
         """
@@ -409 +466 @@
         plot.xaxis(self._xaxis, self._xunit)
         plot.yaxis(self._yaxis, self._yunit)
+        
+    def is_empty(self):
+        """
+            Returns True if there is no data stored in the plottable
+        """
+        if not self.x==None and len(self.x)==0 \
+            and not self.y==None and len(self.y)==0:
+            return True
+        return False
+        
         
     def colors(self):
@@ -500 +567 @@
             self.funcdx= None
             self.funcdy= None
+
         def transform(self, x=None,y=None,dx=None, dy=None):
             """
@@ -512 +580 @@
             # Sanity check
             # Do the transofrmation only when x and y are empty
+            has_err_x = not (dx==None or len(dx)==0)
+            has_err_y = not (dy==None or len(dy)==0)
+            
             if (x!=None) and (y!=None): 
-                if dx and not len(x)==len(dx):
+                if not dx==None and not len(dx)==0 and not len(x)==len(dx):
                         raise ValueError, "Plottable.View: Given x and dx are not of the same length" 
                 # Check length of y array
@@ -519 +590 @@
                     raise ValueError, "Plottable.View: Given y and x are not of the same length"
             
-                if dy and not len(y)==len(dy):
-                    raise ValueError, "Plottable.View: Given y and dy are not of the same length"
+                if not dy==None and not len(dy)==0 and not len(y)==len(dy):
+                    message = "Plottable.View: Given y and dy are not of the same length: len(y)=%s, len(dy)=%s" %(len(y), len(dy))
+                    raise ValueError, message
+                
+                
                 self.x = []
                 self.y = []
-                self.dx = []
-                self.dy = []
+                if has_err_x:
+                    self.dx = []
+                else:
+                    self.dx = None
+                if has_err_y:
+                    self.dy = []
+                else:
+                    self.dy = None
                 tempx=[]
                 tempy=[]
-                if dx==None:
+                
+                if not has_err_x:
                     dx=numpy.zeros(len(x))
-                if dy==None:
+                if not has_err_y:
                     dy=numpy.zeros(len(y))
               
@@ -536 +617 @@
                          tempx =self.funcx(x[i],y[i])
                          tempy =self.funcy(y[i],x[i])
-                         tempdx = self.funcdx(x[i], y[i], dx[i], dy[i])
-                         tempdy = self.funcdy(y[i], x[i], dy[i], dx[i])
+                         if has_err_x:
+                             tempdx = self.funcdx(x[i], y[i], dx[i], dy[i])
+                         if has_err_y:
+                             tempdy = self.funcdy(y[i], x[i], dy[i], dx[i])
                         
                          self.x.append(tempx)
                          self.y.append(tempy)
-                         self.dx.append(tempdx)
-                         self.dy.append(tempdy)
+                         if has_err_x:
+                             self.dx.append(tempdx)
+                         if has_err_y:
+                             self.dy.append(tempdy)
                     except:
                          tempx=x[i]
                          tempy=y[i]
-                         print "View.transform: skipping point x %g" % x[i]
-                         print "View.transform: skipping point y %g" % y[i]
-                         print "View.transform: skipping point dy %g" % dy[i]
+                         print "View.transform: skipping point x=%g y=%g" % (x[i], y[i])
                          
                          print sys.exc_value  
                
                 # Sanity check
-                if not (len(self.x)==len(self.dx))and(len(self.x)==len(self.dy))\
-                and(len(self.x)==len(self.y))and(len(self.y)==len(self.dy)) :
-                        raise ValueError, "Plottable.View: Given x,y,dy and dx are not of the same length" 
+                if not len(self.x)==len(self.y):
+                    raise ValueError, "Plottable.View: transformed x and y are not of the same length" 
+                if has_err_x and not (len(self.x) and len(self.dx)):
+                    raise ValueError, "Plottable.View: transformed x and dx are not of the same length" 
+                if has_err_y and not (len(self.y) and len(self.dy)):
+                    raise ValueError, "Plottable.View: transformed y and dy are not of the same length" 
+                
                 # Check that negative values are not plot on x and y axis for log10 transformation
                 self.check_data_logX()
@@ -564 +651 @@
                 self.DXreel = self.dx
                 self.DYreel = self.dy
-                
                 
                 
@@ -749 +835 @@
         
     def render(self,plot,**kw):
-        #plot.curve(self.x,self.y,dy=self.dy,**kw)
         plot.curve(self.view.x,self.view.y,dy=self.view.dy,**kw)