Changeset 47f695c9 in sasview for guitools/PlotPanel.py

Timestamp:

Apr 30, 2008 10:52:41 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:

eca05c8

Parents:

6ed101a

Message:

working

File:

• guitools/PlotPanel.py (modified) (9 diffs)

guitools/PlotPanel.py

@@ -23 +23 @@
     if 'get_children' in dir(obj):
         for a in obj.get_children(): show_tree(a,d+1)
-
+def _rescale(lo,hi,step,pt=None,bal=None,scale='linear'):
+        """
+        Rescale (lo,hi) by step, returning the new (lo,hi)
+        The scaling is centered on pt, with positive values of step
+        driving lo/hi away from pt and negative values pulling them in.
+        If bal is given instead of point, it is already in [0,1] coordinates.
+    
+        This is a helper function for step-based zooming.
+        """
+        # Convert values into the correct scale for a linear transformation
+        # TODO: use proper scale transformers
+        if scale=='log':
+            lo,hi = log10(lo),log10(hi)
+            if pt is not None: pt = log10(pt)
+    
+        # Compute delta from axis range * %, or 1-% if persent is negative
+        if step > 0:
+            delta = float(hi-lo)*step/100
+        else:
+            delta = float(hi-lo)*step/(100-step)
+    
+        # Add scale factor proportionally to the lo and hi values, preserving the
+        # point under the mouse
+        if bal is None:
+            bal = float(pt-lo)/(hi-lo)
+        lo = lo - bal*delta
+        hi = hi + (1-bal)*delta
+    
+        # Convert transformed values back to the original scale
+        if scale=='log':
+            lo,hi = pow(10.,lo),pow(10.,hi)
+    
+        return (lo,hi)
 
 
@@ -69 +101 @@
         self.prevYtrans =" "
         self.canvas.mpl_connect('scroll_event',self.onWheel)
-    def _rescale(lo,hi,step,pt=None,bal=None,scale='linear'):
-        """
-        Rescale (lo,hi) by step, returning the new (lo,hi)
-        The scaling is centered on pt, with positive values of step
-        driving lo/hi away from pt and negative values pulling them in.
-        If bal is given instead of point, it is already in [0,1] coordinates.
-    
-        This is a helper function for step-based zooming.
-        """
-        # Convert values into the correct scale for a linear transformation
-        # TODO: use proper scale transformers
-        if scale=='log':
-            lo,hi = log10(lo),log10(hi)
-            if pt is not None: pt = log10(pt)
-    
-        # Compute delta from axis range * %, or 1-% if persent is negative
-        if step > 0:
-            delta = float(hi-lo)*step/100
-        else:
-            delta = float(hi-lo)*step/(100-step)
-    
-        # Add scale factor proportionally to the lo and hi values, preserving the
-        # point under the mouse
-        if bal is None:
-            bal = float(pt-lo)/(hi-lo)
-        lo = lo - bal*delta
-        hi = hi + (1-bal)*delta
-    
-        # Convert transformed values back to the original scale
-        if scale=='log':
-            lo,hi = pow(10.,lo),pow(10.,hi)
-    
-        return (lo,hi)
+        self.axes = [self.subplot]
 
     def onWheel(self, event):
@@ -120 +120 @@
             ax.set_ylim((lo,hi))
         else:
-            # Check if zoom happens in the axes
+             # Check if zoom happens in the axes
             xdata,ydata = None,None
             x,y = event.x,event.y
@@ -249 +249 @@
 
   
-         
-    def onselect(self,event1, event2):
-        print"went here"
-        from matplotlib.widgets import RectangleSelector
-        from pylab import  show, gca, gcf
-
-        'event1 and event2 are the press and release events'
-        x1, y1 = event1.xdata, event1.ydata
-        x2, y2 = event2.xdata, event2.ydata
-        print "(%3.2f, %3.2f) --> (%3.2f, %3.2f)"%(x1,y1,x2,y2)
-        print " The button you used were: ",event1.button, event2.button
-        gca().set_xlim([x1,x2])
-        gca().set_ylim([y1,y2])
-        gcf().canvas.draw_idle()
-       
-        # drawtype is 'box' or 'line' or 'none'
-        LS = RectangleSelector(self.subplot, onselect,drawtype='box',useblit=True)
-        show()
-
-
-
+  
         
     def onSaveImage(self, evt):
@@ -432 +412 @@
             if ( self.xscales=="x" ):
                 item.returnTransformationx(transform.toX,transform.errToX)
-                
                 self.set_xscale("linear")
                 name, units = item.get_xaxis()
@@ -453 +432 @@
                 self.set_yscale("linear")
                 name, units = item.get_yaxis()
-                item.check_data_PlottableY() 
                 self.graph.yaxis("log %s" % name,  "%s^{-1}" % units)
                 
@@ -464 +442 @@
             if ( self.yscales=="log10(y)" ): 
                 item.returnTransformationy(transform.toX,transform.errToX)
-                item.check_data_PlottableY() 
                 self.set_yscale("log")  
                 name, units = item.get_yaxis()
@@ -485 +462 @@
                 self.set_yscale("linear")
                 name, units = item.get_yaxis()
-                item.check_data_PlottableY() 
                 self.graph.yaxis("%s" %name,  "%s" % units)
                 
@@ -499 +475 @@
                 self.set_yscale("linear")
                 yname, yunits = item.get_yaxis()
-                xname, xunits = item.get_xaxis()
-                item.check_data_PlottableY() 
+                xname, xunits = item.get_xaxis() 
                 self.graph.yaxis("Log %s%s^{2}" % (yname,xname),  "%s^{-1}%s^{-2}" % (yunits,xunits))