matplotlib-checkins Mailing List for matplotlib

Revision: 8489
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8489&view=rev
Author: ryanmay
Date: 2010年07月02日 23:03:44 +0000 (2010年7月02日)
Log Message:
-----------
Clean up docstring of restore_region().
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/backends/backend_agg.py
Modified: trunk/matplotlib/lib/matplotlib/backends/backend_agg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_agg.py	2010年07月02日 22:44:27 UTC (rev 8488)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_agg.py	2010年07月02日 23:03:44 UTC (rev 8489)
@@ -269,11 +269,11 @@
 
 def restore_region(self, region, bbox=None, xy=None):
 """
- restore the saved region. if bbox (instance of BboxBase, or
+ Restore the saved region. If bbox (instance of BboxBase, or
 its extents) is given, only the region specified by the bbox
 will be restored. *xy* (a tuple of two floasts) optionally
- specify the new position (of the LLC of the originally region,
- not the LLC of the bbox) that the region will be restored.
+ specifies the new position (the LLC of the original region,
+ not the LLC of the bbox) where the region will be restored.
 
 >>> region = renderer.copy_from_bbox()
 >>> x1, y1, x2, y2 = region.get_extents()
@@ -445,4 +445,3 @@
 renderer.width, renderer.height,
 filename_or_obj, self.figure.dpi)
 renderer.dpi = original_dpi
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8488
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8488&view=rev
Author: efiring
Date: 2010年07月02日 22:44:27 +0000 (2010年7月02日)
Log Message:
-----------
tick_params works with existing ticks instead of starting with new ones
Modified Paths:
--------------
 trunk/matplotlib/examples/pylab_examples/multiple_yaxis_with_spines.py
 trunk/matplotlib/lib/matplotlib/axis.py
 trunk/matplotlib/lib/matplotlib/projections/geo.py
 trunk/matplotlib/lib/matplotlib/projections/polar.py
Modified: trunk/matplotlib/examples/pylab_examples/multiple_yaxis_with_spines.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/multiple_yaxis_with_spines.py	2010年07月02日 19:03:05 UTC (rev 8487)
+++ trunk/matplotlib/examples/pylab_examples/multiple_yaxis_with_spines.py	2010年07月02日 22:44:27 UTC (rev 8488)
@@ -54,8 +54,13 @@
 par1.yaxis.label.set_color(p2.get_color())
 par2.yaxis.label.set_color(p3.get_color())
 
+ tkw = dict(size=4, width=1.5)
+ host.tick_params(axis='y', colors=p1.get_color(), **tkw)
+ par1.tick_params(axis='y', colors=p2.get_color(), **tkw)
+ par2.tick_params(axis='y', colors=p3.get_color(), **tkw)
+ host.tick_params(axis='x', **tkw)
+
 lines = [p1, p2, p3]
 host.legend(lines, [l.get_label() for l in lines])
- plt.draw()
 plt.show()
 
Modified: trunk/matplotlib/lib/matplotlib/axis.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axis.py	2010年07月02日 19:03:05 UTC (rev 8487)
+++ trunk/matplotlib/lib/matplotlib/axis.py	2010年07月02日 22:44:27 UTC (rev 8488)
@@ -84,7 +84,8 @@
 """
 artist.Artist.__init__(self)
 
- if gridOn is None: gridOn = rcParams['axes.grid']
+ if gridOn is None:
+ gridOn = rcParams['axes.grid']
 
 self.set_figure(axes.figure)
 self.axes = axes
@@ -148,18 +149,11 @@
 self.update_position(loc)
 
 def apply_tickdir(self, tickdir):
- if tickdir is None:
- tickdir = rcParams['%s.direction' % self._name]
- self._tickdir = tickdir
+ """
+ Calculate self._pad and self._tickmarkers
+ """
+ pass
 
- if self._tickdir == 'in':
- self._xtickmarkers = (mlines.TICKUP, mlines.TICKDOWN)
- self._ytickmarkers = (mlines.TICKRIGHT, mlines.TICKLEFT)
- self._pad = self._base_pad
- else:
- self._xtickmarkers = (mlines.TICKDOWN, mlines.TICKUP)
- self._ytickmarkers = (mlines.TICKLEFT, mlines.TICKRIGHT)
- self._pad = self._base_pad + self._size
 
 def get_children(self):
 children = [self.tick1line, self.tick2line, self.gridline, self.label1, self.label2]
@@ -271,20 +265,81 @@
 def set_view_interval(self, vmin, vmax, ignore=False):
 raise NotImplementedError('Derived must override')
 
+ def _apply_params(self, **kw):
+ switchkw = ['gridOn', 'tick1On', 'tick2On', 'label1On', 'label2On']
+ switches = [k for k in kw if k in switchkw]
+ for k in switches:
+ setattr(self, k, kw.pop(k))
+ dirpad = [k for k in kw if k in ['pad', 'tickdir']]
+ if dirpad:
+ self._base_pad = kw.pop('pad', self._base_pad)
+ self.apply_tickdir(kw.pop('tickdir', self._tickdir))
+ trans = self._get_text1_transform()[0]
+ self.label1.set_transform(trans)
+ trans = self._get_text2_transform()[0]
+ self.label2.set_transform(trans)
+ self.tick1line.set_marker(self._tickmarkers[0])
+ self.tick2line.set_marker(self._tickmarkers[1])
+ tick_kw = dict([kv for kv in kw.items()
+ if kv[0] in ['color', 'zorder']])
+ if tick_kw:
+ self.tick1line.set(**tick_kw)
+ self.tick2line.set(**tick_kw)
+ for k, v in tick_kw.items():
+ setattr(self, '_'+k, v)
+ tick_list = [kv for kv in kw.items() if kv[0] in ['size', 'width']]
+ for k, v in tick_list:
+ setattr(self, '_'+k, v)
+ if k == 'size':
+ self.tick1line.set_markersize(v)
+ self.tick2line.set_markersize(v)
+ else:
+ self.tick1line.set_markeredgewidth(v)
+ self.tick2line.set_markeredgewidth(v)
+ label_list = [k for k in kw.items()
+ if k[0] in ['labelsize', 'labelcolor']]
+ if label_list:
+ label_kw = dict([(k[5:], v) for (k, v) in label_list])
+ self.label1.set(**label_kw)
+ self.label2.set(**label_kw)
+ for k, v in label_kw.items():
+ setattr(self, '_'+k, v)
 
+
+
 class XTick(Tick):
 """
 Contains all the Artists needed to make an x tick - the tick line,
 the label text and the grid line
 """
 __name__ = 'xtick'
+
+ def _get_text1_transform(self):
+ return self.axes.get_xaxis_text1_transform(self._pad)
+
+ def _get_text2_transform(self):
+ return self.axes.get_xaxis_text2_transform(self._pad)
+
+ def apply_tickdir(self, tickdir):
+ if tickdir is None:
+ tickdir = rcParams['%s.direction' % self._name]
+ self._tickdir = tickdir
+
+ if self._tickdir == 'in':
+ self._tickmarkers = (mlines.TICKUP, mlines.TICKDOWN)
+ self._pad = self._base_pad
+ else:
+ self._tickmarkers = (mlines.TICKDOWN, mlines.TICKUP)
+ self._pad = self._base_pad + self._size
+
+
 def _get_text1(self):
 'Get the default Text instance'
 # the y loc is 3 points below the min of y axis
 # get the affine as an a,b,c,d,tx,ty list
 # x in data coords, y in axes coords
 #t = mtext.Text(
- trans, vert, horiz = self.axes.get_xaxis_text1_transform(self._pad)
+ trans, vert, horiz = self._get_text1_transform()
 t = mtext.Text(
 x=0, y=0,
 fontproperties=font_manager.FontProperties(size=self._labelsize),
@@ -302,7 +357,7 @@
 'Get the default Text 2 instance'
 # x in data coords, y in axes coords
 #t = mtext.Text(
- trans, vert, horiz = self.axes.get_xaxis_text2_transform(self._pad)
+ trans, vert, horiz = self._get_text2_transform()
 t = mtext.Text(
 x=0, y=1,
 fontproperties=font_manager.FontProperties(size=self._labelsize),
@@ -320,7 +375,7 @@
 l = mlines.Line2D(xdata=(0,), ydata=(0,),
 color=self._color,
 linestyle = 'None',
- marker = self._xtickmarkers[0],
+ marker = self._tickmarkers[0],
 markersize=self._size,
 markeredgewidth=self._width,
 zorder=self._zorder,
@@ -335,7 +390,7 @@
 l = mlines.Line2D( xdata=(0,), ydata=(1,),
 color=self._color,
 linestyle = 'None',
- marker = self._xtickmarkers[1],
+ marker = self._tickmarkers[1],
 markersize=self._size,
 markeredgewidth=self._width,
 zorder=self._zorder,
@@ -412,11 +467,30 @@
 """
 __name__ = 'ytick'
 
+ def _get_text1_transform(self):
+ return self.axes.get_yaxis_text1_transform(self._pad)
+
+ def _get_text2_transform(self):
+ return self.axes.get_yaxis_text2_transform(self._pad)
+
+ def apply_tickdir(self, tickdir):
+ if tickdir is None:
+ tickdir = rcParams['%s.direction' % self._name]
+ self._tickdir = tickdir
+
+ if self._tickdir == 'in':
+ self._tickmarkers = (mlines.TICKRIGHT, mlines.TICKLEFT)
+ self._pad = self._base_pad
+ else:
+ self._tickmarkers = (mlines.TICKLEFT, mlines.TICKRIGHT)
+ self._pad = self._base_pad + self._size
+
+
 # how far from the y axis line the right of the ticklabel are
 def _get_text1(self):
 'Get the default Text instance'
 # x in axes coords, y in data coords
- trans, vert, horiz = self.axes.get_yaxis_text1_transform(self._pad)
+ trans, vert, horiz = self._get_text1_transform()
 t = mtext.Text(
 x=0, y=0,
 fontproperties=font_manager.FontProperties(size=self._labelsize),
@@ -432,7 +506,7 @@
 def _get_text2(self):
 'Get the default Text instance'
 # x in axes coords, y in data coords
- trans, vert, horiz = self.axes.get_yaxis_text2_transform(self._pad)
+ trans, vert, horiz = self._get_text2_transform()
 t = mtext.Text(
 x=1, y=0,
 fontproperties=font_manager.FontProperties(size=self._labelsize),
@@ -450,7 +524,7 @@
 
 l = mlines.Line2D( (0,), (0,),
 color=self._color,
- marker = self._ytickmarkers[0],
+ marker = self._tickmarkers[0],
 linestyle = 'None',
 markersize=self._size,
 markeredgewidth=self._width,
@@ -465,7 +539,7 @@
 # x in axes coords, y in data coords
 l = mlines.Line2D( (1,), (0,),
 color=self._color,
- marker = self._ytickmarkers[1],
+ marker = self._tickmarkers[1],
 linestyle = 'None',
 markersize=self._size,
 markeredgewidth=self._width,
@@ -715,7 +789,15 @@
 if reset:
 d.clear()
 d.update(kwtrans)
- self.reset_ticks()
+ if reset:
+ self.reset_ticks()
+ else:
+ if which == 'major' or which == 'both':
+ for tick in self.majorTicks:
+ tick._apply_params(**self._major_tick_kw)
+ if which == 'minor' or which == 'both':
+ for tick in self.minorTicks:
+ tick._apply_params(**self._minor_tick_kw)
 
 @staticmethod
 def _translate_tick_kw(kw, to_init_kw=True):
@@ -733,7 +815,7 @@
 # The following lists may be moved to a more
 # accessible location.
 kwkeys0 = ['size', 'width', 'color', 'tickdir', 'pad',
- 'labelsize', 'labelcolor', 'zorder',
+ 'labelsize', 'labelcolor', 'zorder', 'gridOn',
 'tick1On', 'tick2On', 'label1On', 'label2On']
 kwkeys1 = ['length', 'direction', 'left', 'bottom', 'right', 'top',
 'labelleft', 'labelbottom', 'labelright', 'labeltop']
@@ -1144,21 +1226,26 @@
 if len(kwargs): b = True
 which = which.lower()
 if which in ['minor', 'both']:
- if b is None: self._gridOnMinor = not self._gridOnMinor
- else: self._gridOnMinor = b
+ if b is None:
+ self._gridOnMinor = not self._gridOnMinor
+ else:
+ self._gridOnMinor = b
 for tick in self.minorTicks: # don't use get_ticks here!
 if tick is None: continue
 tick.gridOn = self._gridOnMinor
 if len(kwargs): artist.setp(tick.gridline,**kwargs)
+ self._minor_tick_kw['gridOn'] = self._gridOnMinor
 if which in ['major', 'both']:
- if b is None: self._gridOnMajor = not self._gridOnMajor
- else: self._gridOnMajor = b
+ if b is None:
+ self._gridOnMajor = not self._gridOnMajor
+ else:
+ self._gridOnMajor = b
 for tick in self.majorTicks: # don't use get_ticks here!
 if tick is None: continue
 tick.gridOn = self._gridOnMajor
 if len(kwargs): artist.setp(tick.gridline,**kwargs)
+ self._major_tick_kw['gridOn'] = self._gridOnMajor
 
-
 def update_units(self, data):
 """
 introspect *data* for units converter and update the
@@ -1552,50 +1639,30 @@
 """
 Set the ticks position (top, bottom, both, default or none)
 both sets the ticks to appear on both positions, but does not
- change the tick labels. default resets the tick positions to
- the default: ticks on both positions, labels at bottom. none
- can be used if you don't want any ticks.
+ change the tick labels. 'default' resets the tick positions to
+ the default: ticks on both positions, labels at bottom. 'none'
+ can be used if you don't want any ticks. 'none' and 'both'
+ affect only the ticks, not the labels.
 
 ACCEPTS: [ 'top' | 'bottom' | 'both' | 'default' | 'none' ]
 """
- assert position in ('top', 'bottom', 'both', 'default', 'none')
-
-
- # The first ticks of major & minor ticks should always be
- # included, otherwise, the information can be lost. Thus, use
- # majorTicks instead of get_major_ticks() which may return
- # empty list.
- ticks = list( self.majorTicks ) # a copy
- ticks.extend( self.minorTicks )
-
 if position == 'top':
- for t in ticks:
- t.tick1On = False
- t.tick2On = True
- t.label1On = False
- t.label2On = True
+ self.set_tick_params(which='both', top=True, labeltop=True,
+ bottom=False, labelbottom=False)
 elif position == 'bottom':
- for t in ticks:
- t.tick1On = True
- t.tick2On = False
- t.label1On = True
- t.label2On = False
+ self.set_tick_params(which='both', top=False, labeltop=False,
+ bottom=True, labelbottom=True)
+ elif position == 'both':
+ self.set_tick_params(which='both', top=True,
+ bottom=True)
+ elif position == 'none':
+ self.set_tick_params(which='both', top=False,
+ bottom=False)
 elif position == 'default':
- for t in ticks:
- t.tick1On = True
- t.tick2On = True
- t.label1On = True
- t.label2On = False
- elif position == 'none':
- for t in ticks:
- t.tick1On = False
- t.tick2On = False
+ self.set_tick_params(which='both', top=True, labeltop=False,
+ bottom=True, labelbottom=True)
 else:
- for t in ticks:
- t.tick1On = True
- t.tick2On = True
- for t in ticks:
- t.update_position(t._loc)
+ raise ValueError("invalid position: %s" % position)
 
 def tick_top(self):
 'use ticks only on top'
@@ -1829,45 +1896,23 @@
 
 ACCEPTS: [ 'left' | 'right' | 'both' | 'default' | 'none' ]
 """
- assert position in ('left', 'right', 'both', 'default', 'none')
-
- # The first ticks of major & minor ticks should always be
- # included, otherwise, the information can be lost. Thus, use
- # majorTicks instead of get_major_ticks() which may return
- # empty list.
- ticks = list( self.majorTicks ) # a copy
- ticks.extend( self.minorTicks )
-
 if position == 'right':
- self.set_offset_position('right')
- for t in ticks:
- t.tick1On = False
- t.tick2On = True
- t.label1On = False
- t.label2On = True
+ self.set_tick_params(which='both', right=True, labelright=True,
+ left=False, labelleft=False)
 elif position == 'left':
- self.set_offset_position('left')
- for t in ticks:
- t.tick1On = True
- t.tick2On = False
- t.label1On = True
- t.label2On = False
+ self.set_tick_params(which='both', right=False, labelright=False,
+ left=True, labelleft=True)
+ elif position == 'both':
+ self.set_tick_params(which='both', right=True,
+ left=True)
+ elif position == 'none':
+ self.set_tick_params(which='both', right=False, labelright=False,
+ left=False, labelleft=False)
 elif position == 'default':
- self.set_offset_position('left')
- for t in ticks:
- t.tick1On = True
- t.tick2On = True
- t.label1On = True
- t.label2On = False
- elif position == 'none':
- for t in ticks:
- t.tick1On = False
- t.tick2On = False
+ self.set_tick_params(which='both', right=True, labelright=False,
+ left=True, labelleft=True)
 else:
- self.set_offset_position('left')
- for t in ticks:
- t.tick1On = True
- t.tick2On = True
+ raise ValueError("invalid position: %s" % position)
 
 def tick_right(self):
 'use ticks only on right'
Modified: trunk/matplotlib/lib/matplotlib/projections/geo.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/projections/geo.py	2010年07月02日 19:03:05 UTC (rev 8487)
+++ trunk/matplotlib/lib/matplotlib/projections/geo.py	2010年07月02日 22:44:27 UTC (rev 8488)
@@ -55,6 +55,9 @@
 self.yaxis.set_minor_locator(NullLocator())
 self.xaxis.set_ticks_position('none')
 self.yaxis.set_ticks_position('none')
+ self.yaxis.set_tick_params(label1On=True)
+ # Why do we need to turn on yaxis tick labels, but
+ # xaxis tick labels are already on?
 
 self.grid(rcParams['axes.grid'])
 
Modified: trunk/matplotlib/lib/matplotlib/projections/polar.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/projections/polar.py	2010年07月02日 19:03:05 UTC (rev 8487)
+++ trunk/matplotlib/lib/matplotlib/projections/polar.py	2010年07月02日 22:44:27 UTC (rev 8488)
@@ -226,6 +226,9 @@
 self.grid(rcParams['polaraxes.grid'])
 self.xaxis.set_ticks_position('none')
 self.yaxis.set_ticks_position('none')
+ self.yaxis.set_tick_params(label1On=True)
+ # Why do we need to turn on yaxis tick labels, but
+ # xaxis tick labels are already on?
 
 def _init_axis(self):
 "move this out of __init__ because non-separable axes don't use it"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8487
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8487&view=rev
Author: jdh2358
Date: 2010年07月02日 19:03:05 +0000 (2010年7月02日)
Log Message:
-----------
use class var rather than self for texmanager hack state
Modified Paths:
--------------
 trunk/matplotlib/examples/pylab_examples/tex_demo.py
 trunk/matplotlib/lib/matplotlib/texmanager.py
Modified: trunk/matplotlib/examples/pylab_examples/tex_demo.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/tex_demo.py	2010年07月02日 18:45:17 UTC (rev 8486)
+++ trunk/matplotlib/examples/pylab_examples/tex_demo.py	2010年07月02日 19:03:05 UTC (rev 8487)
@@ -29,5 +29,5 @@
 title(r"\TeX\ is Number $\displaystyle\sum_{n=1}^\infty\frac{-e^{i\pi}}{2^n}$!",
 fontsize=16, color='r')
 grid(True)
-
+#savefig('tex_demo')
 show()
Modified: trunk/matplotlib/lib/matplotlib/texmanager.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/texmanager.py	2010年07月02日 18:45:17 UTC (rev 8486)
+++ trunk/matplotlib/lib/matplotlib/texmanager.py	2010年07月02日 19:03:05 UTC (rev 8487)
@@ -92,7 +92,7 @@
 os.mkdir(texcache)
 
 _dvipng_hack_alpha = None
-
+ #_dvipng_hack_alpha = dvipng_hack_alpha()
 # mappable cache of
 rgba_arrayd = {}
 grey_arrayd = {}
@@ -455,7 +455,7 @@
 report = 'No dvipng error report available.'
 if exit_status:
 raise RuntimeError('dvipng was not able to \
-process the flowing file:\n%s\nHere is the full report generated by dvipng: \
+process the following file:\n%s\nHere is the full report generated by dvipng: \
 \n\n'% dvifile + report)
 else: mpl.verbose.report(report, 'debug')
 try: os.remove(outfile)
@@ -516,9 +516,9 @@
 if rcParams['text.dvipnghack'] is not None:
 hack = rcParams['text.dvipnghack']
 else:
- if self._dvipng_hack_alpha is None:
- self._dvipng_hack_alpha = dvipng_hack_alpha()
- hack = self._dvipng_hack_alpha
+ if TexManager._dvipng_hack_alpha is None:
+ TexManager._dvipng_hack_alpha = dvipng_hack_alpha()
+ hack = TexManager._dvipng_hack_alpha
 
 
 if hack:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8486
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8486&view=rev
Author: ryanmay
Date: 2010年07月02日 18:45:17 +0000 (2010年7月02日)
Log Message:
-----------
Allow set_ticks to take a locator object, since this is valid for the ticks kwarg in __init__.
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/colorbar.py
Modified: trunk/matplotlib/lib/matplotlib/colorbar.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/colorbar.py	2010年07月02日 18:19:08 UTC (rev 8485)
+++ trunk/matplotlib/lib/matplotlib/colorbar.py	2010年07月02日 18:45:17 UTC (rev 8486)
@@ -299,7 +299,11 @@
 set tick locations. Tick locations are updated immediately unless update_ticks is
 *False*. To manually update the ticks, call *update_ticks* method explicitly.
 """
- self.locator = ticker.FixedLocator(ticks, nbins=len(ticks))
+ if cbook.iterable(ticks):
+ self.locator = ticker.FixedLocator(ticks, nbins=len(ticks))
+ else:
+ self.locator = ticks
+
 if update_ticks:
 self.update_ticks()
 
@@ -842,5 +846,3 @@
 cax = fig.add_axes(pbcb)
 cax.set_aspect(aspect, anchor=anchor, adjustable='box')
 return cax, kw
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8485
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8485&view=rev
Author: jdh2358
Date: 2010年07月02日 18:19:08 +0000 (2010年7月02日)
Log Message:
-----------
fix typos in gridspec docs
Modified Paths:
--------------
 trunk/matplotlib/doc/users/gridspec.rst
 trunk/matplotlib/lib/matplotlib/axes.py
Modified: trunk/matplotlib/doc/users/gridspec.rst
===================================================================
--- trunk/matplotlib/doc/users/gridspec.rst	2010年07月02日 18:06:25 UTC (rev 8484)
+++ trunk/matplotlib/doc/users/gridspec.rst	2010年07月02日 18:19:08 UTC (rev 8485)
@@ -118,7 +118,7 @@
 ==========================
 
 You can create GridSpec from the SubplotSpec, in which case its layout
-parameters are set to that of the locataion of the given SubplotSpec. ::
+parameters are set to that of the location of the given SubplotSpec. ::
 
 gs0 = gridspec.GridSpec(1, 2)
 
@@ -134,13 +134,13 @@
 
 By default, GridSpec creates cells of equal sizes. You can adjust
 relative heights and widths of rows and columns. Note that absolute
-values are meaningless, onlt their relative ratios matter. ::
+values are meaningless, only their relative ratios matter. ::
 
 gs = gridspec.GridSpec(2, 2,
 width_ratios=[1,2],
 height_ratios=[4,1]
 )
- 
+
 ax1 = plt.subplot(gs[0])
 ax2 = plt.subplot(gs[1])
 ax3 = plt.subplot(gs[2])
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2010年07月02日 18:06:25 UTC (rev 8484)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2010年07月02日 18:19:08 UTC (rev 8485)
@@ -8254,7 +8254,7 @@
 triplot.__doc__ = mtri.triplot.__doc__
 
 
-from gridspec import GridSpec, SubplotSpec
+from matplotlib.gridspec import GridSpec, SubplotSpec
 
 class SubplotBase:
 """
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8484
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8484&view=rev
Author: jdh2358
Date: 2010年07月02日 18:06:25 +0000 (2010年7月02日)
Log Message:
-----------
fix swab bug so mpl will compile on solaris with cxx 6
Modified Paths:
--------------
 trunk/matplotlib/CHANGELOG
 trunk/matplotlib/CXX/WrapPython.h
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2010年07月02日 17:24:37 UTC (rev 8483)
+++ trunk/matplotlib/CHANGELOG	2010年07月02日 18:06:25 UTC (rev 8484)
@@ -1,3 +1,7 @@
+2010年07月02日 Modified CXX/WrapPython.h to fix "swab bug" on solaris so
+ mpl can compile on Solaris with CXX6 in the trunk. Closes
+ tracker bug 3022815 - JDH
+
 2010年06月30日 Added autoscale convenience method and corresponding
 pyplot function for simplified control of autoscaling;
 and changed axis, set_xlim, and set_ylim so that by
Modified: trunk/matplotlib/CXX/WrapPython.h
===================================================================
--- trunk/matplotlib/CXX/WrapPython.h	2010年07月02日 17:24:37 UTC (rev 8483)
+++ trunk/matplotlib/CXX/WrapPython.h	2010年07月02日 18:06:25 UTC (rev 8484)
@@ -48,7 +48,10 @@
 #if defined(_XPG4)
 #undef _XPG4
 #endif
+#if defined(_XPG3)
+#undef _XPG3
 #endif
+#endif
 
 // Python.h will redefine these and generate warning in the process
 #undef _XOPEN_SOURCE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8483
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8483&view=rev
Author: jdh2358
Date: 2010年07月02日 17:24:37 +0000 (2010年7月02日)
Log Message:
-----------
revert accidental commit of WrapPython which was testing for swab bug
Modified Paths:
--------------
 trunk/matplotlib/CXX/WrapPython.h
Modified: trunk/matplotlib/CXX/WrapPython.h
===================================================================
--- trunk/matplotlib/CXX/WrapPython.h	2010年07月02日 17:22:49 UTC (rev 8482)
+++ trunk/matplotlib/CXX/WrapPython.h	2010年07月02日 17:24:37 UTC (rev 8483)
@@ -44,7 +44,11 @@
 #endif
 
 // Prevent multiple conflicting definitions of swab from stdlib.h and unistd.h
+#if defined(__sun) || defined(sun)
+#if defined(_XPG4)
 #undef _XPG4
+#endif
+#endif
 
 // Python.h will redefine these and generate warning in the process
 #undef _XOPEN_SOURCE
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8482
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8482&view=rev
Author: jdh2358
Date: 2010年07月02日 17:22:49 +0000 (2010年7月02日)
Log Message:
-----------
added christophs dvipng_hack_alpha import fix
Modified Paths:
--------------
 trunk/matplotlib/CXX/WrapPython.h
 trunk/matplotlib/lib/matplotlib/texmanager.py
Modified: trunk/matplotlib/CXX/WrapPython.h
===================================================================
--- trunk/matplotlib/CXX/WrapPython.h	2010年07月01日 18:24:00 UTC (rev 8481)
+++ trunk/matplotlib/CXX/WrapPython.h	2010年07月02日 17:22:49 UTC (rev 8482)
@@ -44,11 +44,7 @@
 #endif
 
 // Prevent multiple conflicting definitions of swab from stdlib.h and unistd.h
-#if defined(__sun) || defined(sun)
-#if defined(_XPG4)
 #undef _XPG4
-#endif
-#endif
 
 // Python.h will redefine these and generate warning in the process
 #undef _XOPEN_SOURCE
Modified: trunk/matplotlib/lib/matplotlib/texmanager.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/texmanager.py	2010年07月01日 18:24:00 UTC (rev 8481)
+++ trunk/matplotlib/lib/matplotlib/texmanager.py	2010年07月02日 17:22:49 UTC (rev 8482)
@@ -91,7 +91,7 @@
 if not os.path.exists(texcache):
 os.mkdir(texcache)
 
- _dvipng_hack_alpha = dvipng_hack_alpha()
+ _dvipng_hack_alpha = None
 
 # mappable cache of
 rgba_arrayd = {}
@@ -516,8 +516,11 @@
 if rcParams['text.dvipnghack'] is not None:
 hack = rcParams['text.dvipnghack']
 else:
+ if self._dvipng_hack_alpha is None:
+ self._dvipng_hack_alpha = dvipng_hack_alpha()
 hack = self._dvipng_hack_alpha
 
+
 if hack:
 # hack the alpha channel
 # dvipng assumed a constant background, whereas we want to
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.