matplotlib-checkins Mailing List for matplotlib

Revision: 7300
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7300&view=rev
Author: leejjoon
Date: 2009年07月27日 21:41:12 +0000 (2009年7月27日)
Log Message:
-----------
axes_zoom_effect.py modified to use floats (instead of strings) for alpha values
Modified Paths:
--------------
 trunk/matplotlib/examples/pylab_examples/axes_zoom_effect.py
Modified: trunk/matplotlib/examples/pylab_examples/axes_zoom_effect.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/axes_zoom_effect.py	2009年07月27日 19:49:20 UTC (rev 7299)
+++ trunk/matplotlib/examples/pylab_examples/axes_zoom_effect.py	2009年07月27日 21:41:12 UTC (rev 7300)
@@ -51,7 +51,7 @@
 
 prop_patches=kwargs.copy()
 prop_patches["ec"]="none"
- prop_patches["alpha"]="0.2"
+ prop_patches["alpha"]=0.2
 
 c1, c2, bbox_patch1, bbox_patch2, p = \
 connect_bbox(mybbox1, mybbox2,
@@ -84,7 +84,7 @@
 
 prop_patches=kwargs.copy()
 prop_patches["ec"]="none"
- prop_patches["alpha"]="0.2"
+ prop_patches["alpha"]=0.2
 
 c1, c2, bbox_patch1, bbox_patch2, p = \
 connect_bbox(mybbox1, mybbox2,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7299
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7299&view=rev
Author: evilguru
Date: 2009年07月27日 19:49:20 +0000 (2009年7月27日)
Log Message:
-----------
Fix an error importing afm.py.
Modified Paths:
--------------
 branches/mathtex/lib/matplotlib/afm.py
Modified: branches/mathtex/lib/matplotlib/afm.py
===================================================================
--- branches/mathtex/lib/matplotlib/afm.py	2009年07月27日 19:35:47 UTC (rev 7298)
+++ branches/mathtex/lib/matplotlib/afm.py	2009年07月27日 19:49:20 UTC (rev 7299)
@@ -35,7 +35,7 @@
 """
 
 import sys, os, re
-from _mathtext_data import uni2type1
+from _font_data import uni2type1
 
 #Convert string the a python type
 _to_int = int
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7298
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7298&view=rev
Author: efiring
Date: 2009年07月27日 19:35:47 +0000 (2009年7月27日)
Log Message:
-----------
Simplify plot argument handling code.
The only side effect of the change should be that previously,
plotting multiple columns required that x and y have the same
number of columns, or that one of them have only one column.
Now the plotting simply cycles through the columns of both,
wrapping back to the first column as needed.
Modified Paths:
--------------
 trunk/matplotlib/CHANGELOG
 trunk/matplotlib/lib/matplotlib/axes.py
Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2009年07月27日 19:23:55 UTC (rev 7297)
+++ trunk/matplotlib/CHANGELOG	2009年07月27日 19:35:47 UTC (rev 7298)
@@ -1,3 +1,5 @@
+2009年07月27日 Simplify argument handling code for plot method. -EF
+
 2009年07月25日 Allow "plot(1, 2, 'r*')" to work. - EF
 
 2009年07月22日 Added an 'interp' keyword to griddata so the faster linear
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2009年07月27日 19:23:55 UTC (rev 7297)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2009年07月27日 19:35:47 UTC (rev 7298)
@@ -199,21 +199,6 @@
 func = getattr(fill_poly,funcName)
 func(val)
 
- def _xy_from_y(self, y):
- if self.axes.yaxis is not None:
- b = self.axes.yaxis.update_units(y)
- if b: return np.arange(len(y)), y, False
-
- if not ma.isMaskedArray(y):
- y = np.asarray(y)
- if len(y.shape) == 1:
- y = y[:,np.newaxis]
- nr, nc = y.shape
- x = np.arange(nr)
- if len(x.shape) == 1:
- x = x[:,np.newaxis]
- return x,y, True
-
 def _xy_from_xy(self, x, y):
 if self.axes.xaxis is not None and self.axes.yaxis is not None:
 bx = self.axes.xaxis.update_units(x)
@@ -223,197 +208,107 @@
 if by:
 y = self.axes.convert_yunits(y)
 
- x = ma.asarray(np.atleast_1d(x))
- y = ma.asarray(np.atleast_1d(y))
+ x = np.atleast_1d(x) #like asanyarray, but converts scalar to array
+ y = np.atleast_1d(y)
+ if x.shape[0] != y.shape[0]:
+ raise ValueError("x and y must have same first dimension")
+ if x.ndim > 2 or y.ndim > 2:
+ raise ValueError("x and y can be no greater than 2-D")
+
 if x.ndim == 1:
 x = x[:,np.newaxis]
 if y.ndim == 1:
 y = y[:,np.newaxis]
- nrx, ncx = x.shape
- nry, ncy = y.shape
- assert nrx == nry, 'Dimensions of x and y are incompatible'
- if ncx == ncy:
- return x, y, True
- if ncx == 1:
- x = np.repeat(x, ncy, axis=1)
- if ncy == 1:
- y = np.repeat(y, ncx, axis=1)
- assert x.shape == y.shape, 'Dimensions of x and y are incompatible'
- return x, y, True
+ return x, y
 
+ def _makeline(self, x, y, kw, kwargs):
+ kw = kw.copy() # Don't modify the original kw.
+ if not 'color' in kw:
+ kw['color'] = self._get_next_cycle_color()
+ # (can't use setdefault because it always evaluates
+ # its second argument)
+ seg = mlines.Line2D(x, y,
+ axes=self.axes,
+ **kw
+ )
+ self.set_lineprops(seg, **kwargs)
+ return seg
 
- def _plot_1_arg(self, y, **kwargs):
- assert self.command == 'plot', 'fill needs at least 2 arguments'
- ret = []
+ def _makefill(self, x, y, kw, kwargs):
+ try:
+ facecolor = kw['color']
+ except KeyError:
+ facecolor = self._get_next_cycle_color()
+ seg = mpatches.Polygon(np.hstack(
+ (x[:,np.newaxis],y[:,np.newaxis])),
+ facecolor = facecolor,
+ fill=True,
+ closed=kw['closed']
+ )
+ self.set_patchprops(seg, **kwargs)
+ return seg
 
- x, y, multicol = self._xy_from_y(y)
 
- if multicol:
- for j in xrange(y.shape[1]):
- color = self._get_next_cycle_color()
- seg = mlines.Line2D(x, y[:,j],
- color = color,
- axes=self.axes,
- )
- self.set_lineprops(seg, **kwargs)
- ret.append(seg)
+ def _plot_args(self, tup, kwargs):
+ ret = []
+ if len(tup) > 1 and is_string_like(tup[-1]):
+ linestyle, marker, color = _process_plot_format(tup[-1])
+ tup = tup[:-1]
+ elif len(tup) == 3:
+ raise ValueError, 'third arg must be a format string'
 else:
- color = self._get_next_cycle_color()
- seg = mlines.Line2D(x, y,
- color = color,
- axes=self.axes,
- )
- self.set_lineprops(seg, **kwargs)
- ret.append(seg)
+ linestyle, marker, color = None, None, None
+ kw = {}
+ for k, v in zip(('linestyle', 'marker', 'color'),
+ (linestyle, marker, color)):
+ if v is not None:
+ kw[k] = v
 
- return ret
+ y = np.atleast_1d(tup[-1])
 
- def _plot_2_args(self, tup2, **kwargs):
- ret = []
- if is_string_like(tup2[1]):
-
- assert self.command == 'plot', ('fill needs at least 2 non-string '
- 'arguments')
- y, fmt = tup2
- x, y, multicol = self._xy_from_y(y)
-
- linestyle, marker, color = _process_plot_format(fmt)
-
- def makeline(x, y):
- _color = color
- if _color is None:
- _color = self._get_next_cycle_color()
- seg = mlines.Line2D(x, y,
- color=_color,
- linestyle=linestyle, marker=marker,
- axes=self.axes,
- )
- self.set_lineprops(seg, **kwargs)
- ret.append(seg)
-
- if multicol:
- for j in xrange(y.shape[1]):
- makeline(x[:,j], y[:,j])
- else:
- makeline(x, y)
-
- return ret
+ if len(tup) == 2:
+ x = np.atleast_1d(tup[0])
 else:
+ x = np.arange(y.shape[0], dtype=float)
 
- x, y = tup2
- x, y, multicol = self._xy_from_xy(x, y)
+ x, y = self._xy_from_xy(x, y)
 
- def makeline(x, y):
- color = self._get_next_cycle_color()
- seg = mlines.Line2D(x, y,
- color=color,
- axes=self.axes,
- )
- self.set_lineprops(seg, **kwargs)
- ret.append(seg)
-
- def makefill(x, y):
- facecolor = self._get_next_cycle_color()
- seg = mpatches.Polygon(np.hstack(
- (x[:,np.newaxis],y[:,np.newaxis])),
- facecolor = facecolor,
- fill=True,
- closed=closed
- )
- self.set_patchprops(seg, **kwargs)
- ret.append(seg)
-
- if self.command == 'plot':
- func = makeline
- else:
- closed = kwargs.get('closed', True)
- func = makefill
- if multicol:
- for j in xrange(y.shape[1]):
- func(x[:,j], y[:,j])
- else:
- func(x, y)
-
-
- return ret
-
- def _plot_3_args(self, tup3, **kwargs):
- ret = []
-
- x, y, fmt = tup3
- x, y, multicol = self._xy_from_xy(x, y)
-
- linestyle, marker, color = _process_plot_format(fmt)
-
- def makeline(x, y):
- _color = color
- if _color is None:
- _color = self._get_next_cycle_color()
- seg = mlines.Line2D(x, y,
- color=_color,
- linestyle=linestyle, marker=marker,
- axes=self.axes,
- )
- self.set_lineprops(seg, **kwargs)
- ret.append(seg)
-
- def makefill(x, y):
- facecolor = color
- seg = mpatches.Polygon(np.hstack(
- (x[:,np.newaxis],y[:,np.newaxis])),
- facecolor = facecolor,
- fill=True,
- closed=closed
- )
- self.set_patchprops(seg, **kwargs)
- ret.append(seg)
-
 if self.command == 'plot':
- func = makeline
+ func = self._makeline
 else:
- closed = kwargs.get('closed', True)
- func = makefill
+ kw['closed'] = kwargs.get('closed', True)
+ func = self._makefill
 
- if multicol:
- for j in xrange(y.shape[1]):
- func(x[:,j], y[:,j])
- else:
- func(x, y)
+ ncx, ncy = x.shape[1], y.shape[1]
+ for j in xrange(max(ncx, ncy)):
+ seg = func(x[:,j%ncx], y[:,j%ncy], kw, kwargs)
+ ret.append(seg)
 return ret
 
+
 def _grab_next_args(self, *args, **kwargs):
 
 remaining = args
 while 1:
 
- if len(remaining)==0: return
- if len(remaining)==1:
- for seg in self._plot_1_arg(remaining[0], **kwargs):
+ if len(remaining)==0:
+ return
+ if len(remaining) <= 3:
+ for seg in self._plot_args(remaining, kwargs):
 yield seg
- remaining = []
- continue
- if len(remaining)==2:
- for seg in self._plot_2_args(remaining, **kwargs):
- yield seg
- remaining = []
- continue
- if len(remaining)==3:
- if not is_string_like(remaining[2]):
- raise ValueError, 'third arg must be a format string'
- for seg in self._plot_3_args(remaining, **kwargs):
- yield seg
- remaining=[]
- continue
+ return
+
 if is_string_like(remaining[2]):
- for seg in self._plot_3_args(remaining[:3], **kwargs):
- yield seg
- remaining=remaining[3:]
+ isplit = 3
 else:
- for seg in self._plot_2_args(remaining[:2], **kwargs):
- yield seg
- remaining=remaining[2:]
+ isplit = 2
 
+ for seg in self._plot_args(remaining[:isplit], kwargs):
+ yield seg
+ remaining=remaining[isplit:]
 
+
+
 class Axes(martist.Artist):
 """
 The :class:`Axes` contains most of the figure elements:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7297
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7297&view=rev
Author: efiring
Date: 2009年07月27日 19:23:55 +0000 (2009年7月27日)
Log Message:
-----------
In findobj_demo, exclude patches from objects to be colored blue.
Modified Paths:
--------------
 trunk/matplotlib/examples/pylab_examples/findobj_demo.py
Modified: trunk/matplotlib/examples/pylab_examples/findobj_demo.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/findobj_demo.py	2009年07月27日 12:30:35 UTC (rev 7296)
+++ trunk/matplotlib/examples/pylab_examples/findobj_demo.py	2009年07月27日 19:23:55 UTC (rev 7297)
@@ -23,7 +23,7 @@
 
 # match on arbitrary function
 def myfunc(x):
- return hasattr(x, 'set_color')
+ return hasattr(x, 'set_color') and not hasattr(x, 'set_facecolor')
 
 for o in fig.findobj(myfunc):
 o.set_color('blue')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 7296
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7296&view=rev
Author: evilguru
Date: 2009年07月27日 12:30:35 +0000 (2009年7月27日)
Log Message:
-----------
Add support for rcParams['mathtext.default'], currently broken due to a suspected bug in mathtex.
Modified Paths:
--------------
 branches/mathtex/lib/matplotlib/backends/backend_agg.py
 branches/mathtex/lib/matplotlib/backends/backend_cairo.py
 branches/mathtex/lib/matplotlib/backends/backend_gdk.py
 branches/mathtex/lib/matplotlib/backends/backend_pdf.py
 branches/mathtex/lib/matplotlib/backends/backend_ps.py
 branches/mathtex/lib/matplotlib/backends/backend_svg.py
Modified: branches/mathtex/lib/matplotlib/backends/backend_agg.py
===================================================================
--- branches/mathtex/lib/matplotlib/backends/backend_agg.py	2009年07月26日 17:53:54 UTC (rev 7295)
+++ branches/mathtex/lib/matplotlib/backends/backend_agg.py	2009年07月27日 12:30:35 UTC (rev 7296)
@@ -110,7 +110,8 @@
 if __debug__: verbose.report('RendererAgg.draw_mathtext',
 'debug-annoying')
 if HAVE_MATHTEX:
- m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(), self.dpi)
+ m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(),
+ self.dpi, rcParams['mathtext.default'])
 b = MathtexBackendImage()
 
 m.render_to_backend(b)
@@ -164,7 +165,8 @@
 'Math will not be rendered.')
 return 0.0, 0.0, 0.0
 else:
- m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(), self.dpi)
+ m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(),
+ self.dpi, rcParams['mathtext.default'])
 return m.width, m.height, m.depth
 font = self._get_agg_font(prop)
 font.set_text(s, 0.0, flags=LOAD_FORCE_AUTOHINT) # the width and height of unrotated string
Modified: branches/mathtex/lib/matplotlib/backends/backend_cairo.py
===================================================================
--- branches/mathtex/lib/matplotlib/backends/backend_cairo.py	2009年07月26日 17:53:54 UTC (rev 7295)
+++ branches/mathtex/lib/matplotlib/backends/backend_cairo.py	2009年07月27日 12:30:35 UTC (rev 7296)
@@ -210,7 +210,8 @@
 
 ctx = gc.ctx
 
- m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(), self.dpi)
+ m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(),
+ self.dpi, rcParams['mathtext.default'])
 b = MathtexBackendCairo()
 m.render_to_backend(b)
 
@@ -240,7 +241,8 @@
 if _debug: print '%s.%s()' % (self.__class__.__name__, _fn_name())
 if ismath:
 if HAVE_MATHTEX:
- m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(), self.dpi)
+ m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(),
+ self.dpi, rcParams['mathtext.default'])
 return m.width, m.height, m.depth
 else:
 warnings.warn('matplotlib was compiled without mathtex support. ' +
Modified: branches/mathtex/lib/matplotlib/backends/backend_gdk.py
===================================================================
--- branches/mathtex/lib/matplotlib/backends/backend_gdk.py	2009年07月26日 17:53:54 UTC (rev 7295)
+++ branches/mathtex/lib/matplotlib/backends/backend_gdk.py	2009年07月27日 12:30:35 UTC (rev 7296)
@@ -167,7 +167,7 @@
 return
 
 m = Mathtex(s, matplotlib.rcParams['mathtext.fontset'],
- prop.get_size_in_points(), self.dpi)
+ prop.get_size_in_points(), self.dpi, rcParams['mathtext.default'])
 b = MathtexBackendImage()
 m.render_to_backend(b)
 
@@ -318,7 +318,7 @@
 return 0.0, 0.0, 0.0
 else:
 m = Mathtex(s, matplotlib.rcParams['mathtext.fontset'],
- prop.get_size_in_points(), self.dpi)
+ prop.get_size_in_points(), self.dpi, rcParams['mathtext.default'])
 return m.width, m.height, m.depth
 
 layout, inkRect, logicalRect = self._get_pango_layout(s, prop)
Modified: branches/mathtex/lib/matplotlib/backends/backend_pdf.py
===================================================================
--- branches/mathtex/lib/matplotlib/backends/backend_pdf.py	2009年07月26日 17:53:54 UTC (rev 7295)
+++ branches/mathtex/lib/matplotlib/backends/backend_pdf.py	2009年07月27日 12:30:35 UTC (rev 7296)
@@ -1351,7 +1351,8 @@
 if not HAVE_MATHTEX:
 return
 
- m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(), 72.0)
+ m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(),
+ 72.0, rcParams['mathtext.default'])
 
 # Generate the dict of used characters
 used_characters = {}
@@ -1668,7 +1669,7 @@
 w, h, d = 0.0, 0.0, 0.0
 else:
 m = Mathtex(s, rcParams['mathtext.fontset'],
- prop.get_size_in_points(), 72.0)
+ prop.get_size_in_points(), 72.0, rcParams['mathtext.default'])
 w, h, d = m.width, m.height, m.depth
 
 elif rcParams['pdf.use14corefonts']:
Modified: branches/mathtex/lib/matplotlib/backends/backend_ps.py
===================================================================
--- branches/mathtex/lib/matplotlib/backends/backend_ps.py	2009年07月26日 17:53:54 UTC (rev 7295)
+++ branches/mathtex/lib/matplotlib/backends/backend_ps.py	2009年07月27日 12:30:35 UTC (rev 7296)
@@ -282,7 +282,8 @@
 
 if ismath:
 if HAVE_MATHTEX:
- m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(), 72.0)
+ m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(),
+ 72.0, rcParams['mathtext.default'])
 return m.width, m.height, m.depth
 else:
 warnings.warn('matplotlib was compiled without mathtex support. ' +
@@ -750,7 +751,8 @@
 if not HAVE_MATHTEX:
 return
 
- m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(), 72.0)
+ m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(),
+ 72.0, rcParams['mathtext.default'])
 
 # Generate the dict of used characters
 used_characters = {}
Modified: branches/mathtex/lib/matplotlib/backends/backend_svg.py
===================================================================
--- branches/mathtex/lib/matplotlib/backends/backend_svg.py	2009年07月26日 17:53:54 UTC (rev 7295)
+++ branches/mathtex/lib/matplotlib/backends/backend_svg.py	2009年07月27日 12:30:35 UTC (rev 7296)
@@ -494,7 +494,8 @@
 if not HAVE_MATHTEX:
 return
 
- m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(), 72.0)
+ m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(),
+ 72.0, rcParams['mathtext.default'])
 
 # Extract the glyphs and rects to render
 svg_glyphs = [(info.font, info.fontsize, unichr(info.num),
@@ -600,8 +601,8 @@
 def get_text_width_height_descent(self, s, prop, ismath):
 if ismath:
 if HAVE_MATHTEX:
- m = Mathtex(s, rcParams['mathtext.fontset'],
- prop.get_size_in_points(), 72.0)
+ m = Mathtex(s, rcParams['mathtext.fontset'], prop.get_size_in_points(),
+ 72.0, rcParams['mathtext.default'])
 return m.width, m.height, m.depth
 else:
 warnings.warn('matplotlib was compiled without mathtex support. ' +
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.