rolled back some log changes

svn path=/trunk/matplotlib/; revision=929

Author: jdh2358

TODO

@@ -672,3 +672,12 @@ square).  All displayed area is white.
 
 - button to add text labels easily anywhere on the plot.  A few drawing
 buttons as well for simple things? Circle/ellipse, box, arrows, etc.
+
+- toggle log/linear shows strange accumulation of ticks on y axis
+
+    from pylab import *
+    x = arange(-2.00, 10, 0.01)
+    y = exp(-x)
+    plot(x,y)
+    #set(gca(), xscale='log')
+    show()

lib/matplotlib/axes.py

@@ -698,10 +698,8 @@ def add_line(self, l):
                 l.get_transform(), zip(xdata, ydata))
             xdata, ydata = zip(*xys)
 
-        corners = ( (amin(xdata), amin(ydata)), (amax(xdata), amax(ydata)) )
-
-        self.update_datalim(corners)
-
+        self.update_datalim( zip(xdata, ydata) )
+        
         self.lines.append(l)
 
     def _get_verts_in_data_coords(self, trans, xys):
@@ -3054,19 +3052,17 @@ def set_xscale(self, value, basex = 10, subsx=None):
                 for patch in self.patches:
                     xs.extend([x for x,y in patch.get_verts()])
                 for collection in self.collections:
-                    xs.extend([x for x,y in collection.get_verts()])                    
+                    xs.extend([x for x,y in collection.get_verts()])
                 posx = [x for x in xs if x>0]
-                minx = min(posx)
-                maxx = max(posx)
-                # warning, probably breaks inverted axis
-                self.set_xlim((0.1*minx, maxx))
-                
-                            
-                
+                if len(posx):
+                    minx = min(posx)
+                    maxx = max(posx)
+                    # warning, probably breaks inverted axis
+                    self.set_xlim((0.1*minx, maxx))
+
             self.xaxis.set_major_locator(LogLocator(basex))
             self.xaxis.set_major_formatter(LogFormatterMathtext(basex))
-            self.xaxis.set_minor_locator(LogLocator(basex,subsx))
-            
+            self.xaxis.set_minor_locator(LogLocator(basex,subsx))            
             self.transData.get_funcx().set_type(LOG10)
         elif value == 'linear':
             self.xaxis.set_major_locator(AutoLocator())
@@ -3154,10 +3150,12 @@ def set_yscale(self, value, basey=10, subsy=None):
                 for collection in self.collections:
                     ys.extend([y for x,y in collection.get_verts()])                    
                 posy = [y for y in ys if y>0]
-                miny = min(posy)
-                maxy = max(posy)
-                # warning, probably breaks inverted axis
-                self.set_ylim((0.1*miny, maxy))
+                if len(posy):
+                    miny = min(posy)
+                    maxy = max(posy)
+                    # warning, probably breaks inverted axis
+                    self.set_ylim((0.1*miny, maxy))
+
 
             self.yaxis.set_major_locator(LogLocator(basey))
             self.yaxis.set_major_formatter(LogFormatterMathtext(basey))
@@ -3422,7 +3420,12 @@ def text(self, x, y, s, fontdict=None, **kwargs):
         return t
 
 
-
+    def toggle_log_lineary(self):
+        'toggle between log and linear on the y axis'
+        funcy = self.transData.get_funcy().get_type()
+        if funcy==LOG10: self.set_yscale('linear')
+        elif funcy==IDENTITY: self.set_yscale('log')
+        
     def vlines(self, x, ymin, ymax, color='k'):
         """\
 VLINES(x, ymin, ymax, color='k')
@@ -3957,7 +3960,11 @@ def get_xscale(self):
     def get_yscale(self):
         'return the yaxis scale string'
         return 'polar'
-        
+
+    def toggle_log_lineary(self):
+        'toggle between log and linear axes ignored for polar'
+        pass
+    
 class PolarSubplot(SubplotBase, PolarAxes):
     """
     Create a polar subplot with
@@ -3976,3 +3983,30 @@ def __init__(self, fig, *args, **kwargs):
         SubplotBase.__init__(self, *args)        
         PolarAxes.__init__(self, fig, [self.figLeft, self.figBottom, self.figW, self.figH], **kwargs)
 
+
+"""
+# this is some discarded code I was using to find the minimum positive
+# data point for some log scaling fixes.  I realized there was a
+# cleaner way to do it, but am keeping this around as an example for
+# how to get the data out of the axes.  Might want to make something
+# like this a method one day, or better yet make get_verts and Artist
+# method
+
+            minx, maxx = self.get_xlim()
+            if minx<=0 or maxx<=0:
+                # find the min pos value in the data
+                xs = []
+                for line in self.lines:
+                    xs.extend(line.get_xdata())
+                for patch in self.patches:
+                    xs.extend([x for x,y in patch.get_verts()])
+                for collection in self.collections:
+                    xs.extend([x for x,y in collection.get_verts()])
+                posx = [x for x in xs if x>0]
+                if len(posx):
+
+                    minx = min(posx)
+                    maxx = max(posx)
+                    # warning, probably breaks inverted axis
+                    self.set_xlim((0.1*minx, maxx))
+"""

lib/matplotlib/backend_bases.py

@@ -812,6 +812,9 @@ def key_press(self, event):
         if event.key == 'g':  
             event.inaxes.grid()
             self.canvas.draw()
+        if event.key == 'l':  
+            event.inaxes.toggle_log_lineary()
+            self.canvas.draw()
 
 
 # cursors

lib/matplotlib/ticker.py

@@ -638,12 +638,11 @@ def __call__(self):
     def autoscale(self):
         'Try to choose the view limits intelligently'
         self.verify_intervals()
+        
         vmin, vmax = self.dataInterval.get_bounds()
         if vmax<vmin:
             vmin, vmax = vmax, vmin
 
-        
-        
         if not is_decade(vmin,self.base): vmin = decade_down(vmin,self.base)
         if not is_decade(vmax,self.base): vmax = decade_up(vmax,self.base)
         if vmin==vmax:

src/_transforms.cpp

@@ -132,7 +132,7 @@ Point::~Point()
 }
 
 Interval::Interval(LazyValue* val1, LazyValue* val2) : 
-  _val1(val1), _val2(val2) {
+  _val1(val1), _val2(val2){
   _VERBOSE("Interval::Interval");
   Py_INCREF(val1);
   Py_INCREF(val2);
@@ -170,7 +170,6 @@ Interval::update(const Py::Tuple &args) {
 
   for (size_t i=0; i<Nval; ++i) {
     thisval = Py::Float(vals[i]);
-
     if (thisval<minx) minx = thisval;
     if (thisval>maxx) maxx = thisval;
   } 
@@ -183,6 +182,7 @@ Interval::update(const Py::Tuple &args) {
 
 Bbox::Bbox(Point* ll, Point* ur) : _ll(ll), _ur(ur) {
   _VERBOSE("Bbox::Bbox");
+  
   Py_INCREF(ll);
   Py_INCREF(ur);
 };
@@ -382,7 +382,7 @@ Bbox::update(const Py::Tuple &args) {
     if (x>maxx) maxx=x;
     if (y<miny) miny=y;
     if (y>maxy) maxy=y;
-
+    
   } 
 
 
@@ -1465,6 +1465,7 @@ Interval::init_type()
   add_varargs_method("span", &Interval::span, "span()\n");
   add_varargs_method("val1", &Interval::val1, "val1()\n");
   add_varargs_method("val2", &Interval::val2, "val2()\n");
+
 }
 
 void