added autoscale_on property

jdh2358 · jdh2358 · commit f4b43147aa84 · 2005-06-06T17:19:27.000Z
svn path=/trunk/matplotlib/; revision=1430
diff --git a/.matplotlibrc b/.matplotlibrc
@@ -186,7 +186,7 @@ tk.pythoninspect  : False    # tk sets PYTHONINSEPCT
 ps.papersize      : letter   # executive, letter, legal, ledger, A0-A10, B0-B6, C0-C6
 ps.useafm         : False    # use of afm fonts -- breaks mathtext but results in small files
 ps.usedistiller   : False    # Experimental: use ghostscript to distill ps output - may yield smaller files
-ps.distiller.res  : 600      # dpi
+ps.distiller.res  : 6000      # dpi
 
 # Set the verbose flags.  This controls how much information
 # matplotlib gives you at runtime and where it goes.  Ther verbosity
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,9 @@
 New entries should be added at the top
 
+2005-06-06 Added autoscale_on prop to axes
+
+2005-06-06 Added Nick's picker "among" patch - JDH
+
 2005-06-05 Fixed a TeX/LaTeX font discrepency in backend_ps. - DSD
 
 2005-06-05 Added a ps.distill option in rc settings. If True, postscript
diff --git a/examples/tex_demo.py b/examples/tex_demo.py
@@ -29,5 +29,6 @@
       fontsize=16, color='r')
 grid(True)
 savefig('tex_demo.eps')
+savefig('jdh.ps')
 
 show()
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -655,6 +655,8 @@ def cla(self):
 
         self.images = []
 
+        self._autoscaleon = True
+        
         self.grid(self._gridOn)
         self.title =  Text(
             x=0.5, y=1.02, text='',
@@ -761,6 +763,7 @@ def autoscale_view(self):
         'autoscale the view limits using the data limits'
         # if image data only just use the datalim
 
+        if not self._autoscaleon: return
         if (len(self.images)>0 and
             len(self.lines)==0 and
             len(self.patches)==0):
@@ -1622,6 +1625,18 @@ def get_yticks(self):
         'Return the y ticks as a list of locations'
         return self.yaxis.get_ticklocs()
 
+    def get_frame_on(self):
+        """
+        Get whether the axes rectangle patch is drawn
+        """
+        return self._frameon
+
+    def get_autoscale_on(self):
+        """
+        Get whether autoscaling is applied on plot commands
+        """
+        return self._autoscaleon
+
     def grid(self, b=None):
         """
         Set the axes grids on or off; b is a boolean
@@ -1682,6 +1697,14 @@ def set_frame_on(self, b):
         """
         self._frameon = b
 
+    def set_autoscale_on(self, b):
+        """
+        Set whether the axes rectangle patch is drawn
+
+        ACCEPTS: True|False
+        """
+        self._autoscaleon = b
+
     def imshow(self, X,
                cmap = None,
                norm = None,
@@ -3547,13 +3570,20 @@ def disconnect(self, cid):
                     self._connected[key].remove(item)
                     return
 
-    def pick(self, x, y, trans=None):
+    def pick(self, x, y, trans=None, among=None):
         """
         Return the artist under point that is closest to the x, y.  if trans
         is None, x, and y are in window coords, 0,0 = lower left.  Otherwise,
         trans is a matplotlib transform that specifies the coordinate system
         of x, y.
-
+        
+        The selection of artists from amongst which the pick function
+        finds an artist can be narrowed using the optional keyword
+        argument among. If provided, this should be either a sequence
+        of permitted artists or a function taking an artist as its
+        argument and returning a true value if and only if that artist
+        can be selected.
+        
         Note this algorithm calculates distance to the vertices of the
         polygon, so if you want to pick a patch, click on the edge!
         """
@@ -3591,6 +3621,11 @@ def dist(a):
             return dist_x_y(xywin, asarray(xt), asarray(yt))
 
         artists = self.lines + self.patches + self.texts
+        if callable(among):
+            artists = filter(test, artists)
+        elif iterable(among):
+            amongd = dict([(k,1) for k in among])
+            artists = [a for a in artists if a in amongd]
         if not len(artists): return None
         ds = [ (dist(a),a) for a in artists]
         ds.sort()
