fixed an add_subplot bug

jdh2358 · jdh2358 · commit bf3116fa5d15 · 2006-09-12T17:00:15.000Z
svn path=/trunk/matplotlib/; revision=2766
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -425,7 +425,7 @@ def add_axes(self, *args, **kwargs):
         if not len(args): return
         if isinstance(args[0], Axes):
             a = args[0]
-            a.set_figure(self)
+            assert(a.get_figure() is self)            
         else:
             rect = args[0]
             ispolar = popd(kwargs, 'polar', False)
@@ -459,7 +459,6 @@ def add_subplot(self, *args, **kwargs):
         """
 
         key = self._make_key(*args, **kwargs)
-
         if self._seen.has_key(key):
             ax = self._seen[key]
             self.sca(ax)
@@ -468,9 +467,9 @@ def add_subplot(self, *args, **kwargs):
 
         if not len(args): return
 
-        if isinstance(args[0], Subplot) or isinstance(args, PolarSubplot):
+        if isinstance(args[0], Subplot) or isinstance(args[0], PolarSubplot):
             a = args[0]
-            a.set_figure(self)
+            assert(a.get_figure() is self)
         else:
             ispolar = popd(kwargs, 'polar', False)
             if ispolar:
diff --git a/matplotlibrc.template b/matplotlibrc.template
@@ -171,7 +171,7 @@ grid.linewidth   :   0.5     # in points
 
 ### Legend
 legend.isaxes        : True
-legend.numpoints     : 4      # the number of points in the legend line
+legend.numpoints     : 2      # the number of points in the legend line
 legend.fontsize      : 14
 legend.pad           : 0.2    # the fractional whitespace inside the legend border
 legend.markerscale   : 1.0    # the relative size of legend markers vs. original
