SF.net SVN: matplotlib: [5297] trunk/toolkits/basemap
Revision: 5297 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5297&view=rev Author: jswhit Date: 2008-05-29 04:47:44 -0700 (Thu, 29 May 2008) Log Message: --- added Changelog entry for pyproj update, fixed typo in README. Modified Paths: -- trunk/toolkits/basemap/Changelog trunk/toolkits/basemap/README Modified: trunk/toolkits/basemap/Changelog === --- trunk/toolkits/basemap/Changelog2008-05-28 18:39:05 UTC (rev 5296) +++ trunk/toolkits/basemap/Changelog2008-05-29 11:47:44 UTC (rev 5297) @@ -1,4 +1,5 @@ version 0.99 + * updated pyproj to 1.8.5. * fixed bug in NetCDFFile creating masked arrays when both _FillValue and missing_value exist. * drawparallels and drawmeridians return a dictionary containing Modified: trunk/toolkits/basemap/README === --- trunk/toolkits/basemap/README 2008-05-28 18:39:05 UTC (rev 5296) +++ trunk/toolkits/basemap/README 2008-05-29 11:47:44 UTC (rev 5297) @@ -100,7 +100,7 @@ the client is included) and httplib2. By default, setup.py checks to see if these are already installed, and if so does not try to overwrite them. If you get import errors related to either of these two packages, -edit setup.cfg and set pydap and/or httplib to True to force +edit setup.cfg and set pydap and/or httplib2 to True to force installation of the included versions. 4) To test, cd to the examples directory and run 'python simpletest.py'. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5298] branches/v0_91_maint
Revision: 5298
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5298&view=rev
Author: mdboom
Date: 2008-05-29 06:01:40 -0700 (Thu, 29 May 2008)
Log Message:
---
Implement path clipping in SVG backend.
Modified Paths:
--
branches/v0_91_maint/CHANGELOG
branches/v0_91_maint/lib/matplotlib/backends/backend_svg.py
Modified: branches/v0_91_maint/CHANGELOG
===
--- branches/v0_91_maint/CHANGELOG 2008-05-29 11:47:44 UTC (rev 5297)
+++ branches/v0_91_maint/CHANGELOG 2008-05-29 13:01:40 UTC (rev 5298)
@@ -1,3 +1,5 @@
+2008-05-29 Implement path clipping in SVG backend - MGD
+
2008-05-28 Fix crashing of PDFs in xpdf and ghostscript when two-byte
characters are used with Type 3 fonts - MGD
Modified: branches/v0_91_maint/lib/matplotlib/backends/backend_svg.py
===
--- branches/v0_91_maint/lib/matplotlib/backends/backend_svg.py 2008-05-29
11:47:44 UTC (rev 5297)
+++ branches/v0_91_maint/lib/matplotlib/backends/backend_svg.py 2008-05-29
13:01:40 UTC (rev 5298)
@@ -56,6 +56,37 @@
self._svgwriter.write ('%s<%s style="%s" %s %s/>\n' % (
cliprect, element, style, clippath, details))
+def _path_commands(self, path):
+cmd = []
+while 1:
+code, xp, yp = path.vertex()
+yp = self.height - yp
+
+if code == agg.path_cmd_stop:
+cmd.append('z') # Hack, path_cmd_end_poly not found
+break
+elif code == agg.path_cmd_move_to:
+cmd.append('M%g %g' % (xp, yp))
+elif code == agg.path_cmd_line_to:
+cmd.append('L%g %g' % (xp, yp))
+elif code == agg.path_cmd_curve3:
+verts = [xp, yp]
+verts.extent(path.vertex()[1:])
+verts[-1] = self.height - verts[-1]
+cmd.append('Q%g %g %g %g' % tuple(verts))
+elif code == agg.path_cmd_curve4:
+verts = [xp, yp]
+verts.extend(path.vertex()[1:])
+verts[-1] = self.height - verts[-1]
+verts.extend(path.vertex()[1:])
+verts[-1] = self.height - verts[-1]
+cmd.append('C%g %g %g %g %g %g'%tuple(verts))
+elif code == agg.path_cmd_end_poly:
+cmd.append('z')
+
+path_data = "".join(cmd)
+return path_data
+
def _get_font(self, prop):
key = hash(prop)
font = self.fontd.get(key)
@@ -108,10 +139,28 @@
def _get_gc_clip_svg(self, gc):
cliprect = gc.get_clip_rectangle()
-if cliprect is None:
+clippath = gc.get_clip_path()
+if cliprect is None and clippath is None:
return '', None
-else:
+elif clippath is not None:
# See if we've already seen this clip rectangle
+key = hash(clippath)
+if self._clipd.get(key) is None: # If not, store a new clipPath
+self._clipd[key] = clippath
+style = "stroke: gray; fill: none;"
+path_data = self._path_commands(clippath)
+path = """\
+
+
+
+
+
+""" % locals()
+return path, key
+else:
+return '', key
+elif cliprect is not None:
+# See if we've already seen this clip rectangle
key = hash(cliprect)
if self._clipd.get(key) is None: # If not, store a new clipPath
self._clipd[key] = cliprect
@@ -139,35 +188,7 @@
self._svgwriter.write('\n')
def draw_path(self, gc, rgbFace, path):
-cmd = []
-
-while 1:
-code, xp, yp = path.vertex()
-yp = self.height - yp
-
-if code == agg.path_cmd_stop:
-cmd.append('z') # Hack, path_cmd_end_poly not found
-break
-elif code == agg.path_cmd_move_to:
-cmd.append('M%g %g' % (xp, yp))
-elif code == agg.path_cmd_line_to:
-cmd.append('L%g %g' % (xp, yp))
-elif code == agg.path_cmd_curve3:
-verts = [xp, yp]
-verts.extent(path.vertex()[1:])
-verts[-1] = self.height - verts[-1]
-cmd.append('Q%g %g %g %g' % tuple(verts))
-elif code == agg.path_cmd_curve4:
-verts = [xp, yp]
-verts.extend(path.vertex()[1:])
-verts[-1] = self.height - verts[-1]
-verts.extend(path.vertex()[1:])
-verts[-1] = self.height - verts[-1]
-cmd.append('C%g %g %g %g %g %g'%tuple(verts))
-elif code == agg.path_cmd_end_poly:
-cmd.append('z')
-
-path_data = "".join(cmd)
+path_data = self._path_commands(path)
self._draw_svg_element
SF.net SVN: matplotlib: [5299] branches/v0_91_maint
Revision: 5299
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5299&view=rev
Author: dsdale
Date: 2008-05-29 06:54:04 -0700 (Thu, 29 May 2008)
Log Message:
---
fixed two bugs in texmanager: dvipng version comparison, and
another related to the addition of the get_gray method
Modified Paths:
--
branches/v0_91_maint/CHANGELOG
branches/v0_91_maint/lib/matplotlib/texmanager.py
Modified: branches/v0_91_maint/CHANGELOG
===
--- branches/v0_91_maint/CHANGELOG 2008-05-29 13:01:40 UTC (rev 5298)
+++ branches/v0_91_maint/CHANGELOG 2008-05-29 13:54:04 UTC (rev 5299)
@@ -1,3 +1,8 @@
+2008-05-29 Fixed two bugs in texmanager.py:
+ improved comparison of dvipng versions
+ fixed a bug introduced when get_grey method was added
+ - DSD
+
2008-05-29 Implement path clipping in SVG backend - MGD
2008-05-28 Fix crashing of PDFs in xpdf and ghostscript when two-byte
Modified: branches/v0_91_maint/lib/matplotlib/texmanager.py
===
--- branches/v0_91_maint/lib/matplotlib/texmanager.py 2008-05-29 13:01:40 UTC
(rev 5298)
+++ branches/v0_91_maint/lib/matplotlib/texmanager.py 2008-05-29 13:54:04 UTC
(rev 5299)
@@ -34,6 +34,7 @@
"""
import copy, glob, md5, os, shutil, sys, warnings
+import distutils.version
import numpy as npy
import matplotlib as mpl
from matplotlib import rcParams
@@ -44,14 +45,15 @@
if sys.platform.startswith('win'): cmd_split = '&'
else: cmd_split = ';'
-def get_dvipng_version():
+def dvipng_hack_alpha():
stdin, stdout = os.popen4('dvipng -version')
for line in stdout:
if line.startswith('dvipng '):
version = line.split()[-1]
mpl.verbose.report('Found dvipng version %s'% version,
'helpful')
-return version
+version = distutils.version.LooseVersion(version)
+return version < distutils.version.LooseVersion('1.6')
raise RuntimeError('Could not obtain dvipng version')
@@ -76,7 +78,7 @@
if not os.path.exists(texcache):
os.mkdir(texcache)
-dvipngVersion = get_dvipng_version()
+_dvipng_hack_alpha = dvipng_hack_alpha()
# mappable cache of
rgba_arrayd = {}
@@ -332,8 +334,28 @@
pngfile = self.make_png(tex, fontsize, dpi)
X = readpng(os.path.join(self.texcache, pngfile))
-if (self.dvipngVersion < '1.6') or rcParams['text.dvipnghack']:
-# hack the alpha channel as described in comment above
+if self._dvipng_hack_alpha or rcParams['text.dvipnghack']:
+# hack the alpha channel
+# dvipng assumed a constant background, whereas we want to
+# overlay these rasters with antialiasing over arbitrary
+# backgrounds that may have other figure elements under them.
+# When you set dvipng -bg Transparent, it actually makes the
+# alpha channel 1 and does the background compositing and
+# antialiasing itself and puts the blended data in the rgb
+# channels. So what we do is extract the alpha information
+# from the red channel, which is a blend of the default dvipng
+# background (white) and foreground (black). So the amount of
+# red (or green or blue for that matter since white and black
+# blend to a grayscale) is the alpha intensity. Once we
+# extract the correct alpha information, we assign it to the
+# alpha channel properly and let the users pick their rgb. In
+# this way, we can overlay tex strings on arbitrary
+# backgrounds with antialiasing
+#
+# red = alpha*red_foreground + (1-alpha)*red_background
+#
+# Since the foreground is black (0) and the background is
+# white (1) this reduces to red = 1-alpha or alpha = 1-red
alpha = npy.sqrt(1-X[:,:,0])
else:
alpha = X[:,:,-1]
@@ -346,26 +368,6 @@
"""
Return tex string as an rgba array
"""
-# dvipng assumes a constant background, whereas we want to
-# overlay these rasters with antialiasing over arbitrary
-# backgrounds that may have other figure elements under them.
-# When you set dvipng -bg Transparent, it actually makes the
-# alpha channel 1 and does the background compositing and
-# antialiasing itself and puts the blended data in the rgb
-# channels. So what we do is extract the alpha information
-# from the red channel, which is a blend of the default dvipng
-# background (white) and foreground (black). So the amount of
-# red (or green or
SF.net SVN: matplotlib: [5300] trunk/matplotlib
Revision: 5300
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5300&view=rev
Author: mdboom
Date: 2008-05-29 07:57:15 -0700 (Thu, 29 May 2008)
Log Message:
---
Merged revisions 5295-5299 via svnmerge from
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_91_maint
r5298 | mdboom | 2008-05-29 09:01:40 -0400 (Thu, 29 May 2008) | 2 lines
Implement path clipping in SVG backend.
r5299 | dsdale | 2008-05-29 09:54:04 -0400 (Thu, 29 May 2008) | 3 lines
fixed two bugs in texmanager: dvipng version comparison, and
another related to the addition of the get_gray method
Modified Paths:
--
trunk/matplotlib/CHANGELOG
trunk/matplotlib/lib/matplotlib/texmanager.py
Property Changed:
trunk/matplotlib/
Property changes on: trunk/matplotlib
___
Name: svnmerge-integrated
- /branches/v0_91_maint:1-5294
+ /branches/v0_91_maint:1-5299
Modified: trunk/matplotlib/CHANGELOG
===
--- trunk/matplotlib/CHANGELOG 2008-05-29 13:54:04 UTC (rev 5299)
+++ trunk/matplotlib/CHANGELOG 2008-05-29 14:57:15 UTC (rev 5300)
@@ -1,3 +1,10 @@
+2008-05-29 Fixed two bugs in texmanager.py:
+ improved comparison of dvipng versions
+ fixed a bug introduced when get_grey method was added
+ - DSD
+
+2008-05-29 Implement path clipping in SVG backend - MGD
+
2008-05-28 Fix crashing of PDFs in xpdf and ghostscript when two-byte
characters are used with Type 3 fonts - MGD
Modified: trunk/matplotlib/lib/matplotlib/texmanager.py
===
--- trunk/matplotlib/lib/matplotlib/texmanager.py 2008-05-29 13:54:04 UTC
(rev 5299)
+++ trunk/matplotlib/lib/matplotlib/texmanager.py 2008-05-29 14:57:15 UTC
(rev 5300)
@@ -33,7 +33,8 @@
"""
-import copy, glob, md5, os, shutil, sys
+import copy, glob, md5, os, shutil, sys, warnings
+import distutils.version
import numpy as np
import matplotlib as mpl
from matplotlib import rcParams
@@ -44,14 +45,15 @@
if sys.platform.startswith('win'): cmd_split = '&'
else: cmd_split = ';'
-def get_dvipng_version():
+def dvipng_hack_alpha():
stdin, stdout = os.popen4('dvipng -version')
for line in stdout:
if line.startswith('dvipng '):
version = line.split()[-1]
mpl.verbose.report('Found dvipng version %s'% version,
'helpful')
-return version
+version = distutils.version.LooseVersion(version)
+return version < distutils.version.LooseVersion('1.6')
raise RuntimeError('Could not obtain dvipng version')
@@ -78,7 +80,7 @@
if not os.path.exists(texcache):
os.mkdir(texcache)
-dvipngVersion = get_dvipng_version()
+_dvipng_hack_alpha = dvipng_hack_alpha()
# mappable cache of
rgba_arrayd = {}
@@ -364,8 +366,28 @@
pngfile = self.make_png(tex, fontsize, dpi)
X = readpng(os.path.join(self.texcache, pngfile))
-if (self.dvipngVersion < '1.6') or rcParams['text.dvipnghack']:
-# hack the alpha channel as described in comment above
+if self._dvipng_hack_alpha or rcParams['text.dvipnghack']:
+# hack the alpha channel
+# dvipng assumed a constant background, whereas we want to
+# overlay these rasters with antialiasing over arbitrary
+# backgrounds that may have other figure elements under them.
+# When you set dvipng -bg Transparent, it actually makes the
+# alpha channel 1 and does the background compositing and
+# antialiasing itself and puts the blended data in the rgb
+# channels. So what we do is extract the alpha information
+# from the red channel, which is a blend of the default dvipng
+# background (white) and foreground (black). So the amount of
+# red (or green or blue for that matter since white and black
+# blend to a grayscale) is the alpha intensity. Once we
+# extract the correct alpha information, we assign it to the
+# alpha channel properly and let the users pick their rgb. In
+# this way, we can overlay tex strings on arbitrary
+# backgrounds with antialiasing
+#
+# red = alpha*red_foreground + (1-alpha)*red_background
+#
+# Since the foreground is black (0) and the background is
+# white (1) this reduces to red = 1-alpha or alpha = 1-red
alpha = np.sqrt(1-X[:,:,0])
else:
alpha = X[:,:,-1]
@@ -378,26 +400,6 @@
"""
Returns latex's rendering of the tex st
SF.net SVN: matplotlib: [5301] trunk/matplotlib/CHANGELOG
Revision: 5301 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5301&view=rev Author: mdboom Date: 2008-05-29 08:13:52 -0700 (Thu, 29 May 2008) Log Message: --- Removed erroneous CHANGELOG entry (it was applied only to branch) Modified Paths: -- trunk/matplotlib/CHANGELOG Modified: trunk/matplotlib/CHANGELOG === --- trunk/matplotlib/CHANGELOG 2008-05-29 14:57:15 UTC (rev 5300) +++ trunk/matplotlib/CHANGELOG 2008-05-29 15:13:52 UTC (rev 5301) @@ -3,8 +3,6 @@ fixed a bug introduced when get_grey method was added - DSD -2008-05-29 Implement path clipping in SVG backend - MGD - 2008-05-28 Fix crashing of PDFs in xpdf and ghostscript when two-byte characters are used with Type 3 fonts - MGD This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5302] trunk/matplotlib/lib/matplotlib/ticker.py
Revision: 5302
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5302&view=rev
Author: jdh2358
Date: 2008-05-29 08:55:55 -0700 (Thu, 29 May 2008)
Log Message:
---
turned off unicode minus for usetex
Modified Paths:
--
trunk/matplotlib/lib/matplotlib/ticker.py
Modified: trunk/matplotlib/lib/matplotlib/ticker.py
===
--- trunk/matplotlib/lib/matplotlib/ticker.py 2008-05-29 15:13:52 UTC (rev
5301)
+++ trunk/matplotlib/lib/matplotlib/ticker.py 2008-05-29 15:55:55 UTC (rev
5302)
@@ -179,7 +179,7 @@
"""
some classes may want to replace a hyphen for minus with the
proper unicode symbol as described here
-
+
http://sourceforge.net/tracker/index.php?func=detail&aid=1962574&group_id=80706&atid=560720.
The default is to do nothing
@@ -191,7 +191,7 @@
should have an explicit format_data_short method
"""
return s
-
+
class NullFormatter(Formatter):
'Always return the empty string'
def __call__(self, x, pos=None):
@@ -303,7 +303,8 @@
def fix_minus(self, s):
'use a unicode minus rather than hyphen'
-return s.replace('-', u'\u2212')
+if rcParams['text.usetex']: return s
+else: return s.replace('-', u'\u2212')
def __call__(self, x, pos=None):
'Return the format for tick val x at position pos'
@@ -366,7 +367,7 @@
s = ''.join(('$',sciNotStr,offsetStr,'$'))
else:
s = ''.join((sciNotStr,offsetStr))
-
+
return self.fix_minus(s)
def set_locs(self, locs):
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5303] trunk/matplotlib
Revision: 5303 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5303&view=rev Author: jdh2358 Date: 2008-05-29 09:44:49 -0700 (Thu, 29 May 2008) Log Message: --- fixed the font rotation agg bug -- and there was much rejoicing Modified Paths: -- trunk/matplotlib/lib/matplotlib/ticker.py trunk/matplotlib/src/_backend_agg.cpp Modified: trunk/matplotlib/lib/matplotlib/ticker.py === --- trunk/matplotlib/lib/matplotlib/ticker.py 2008-05-29 15:55:55 UTC (rev 5302) +++ trunk/matplotlib/lib/matplotlib/ticker.py 2008-05-29 16:44:49 UTC (rev 5303) @@ -301,6 +301,7 @@ self._scientific = True self._powerlimits = rcParams['axes.formatter.limits'] + def fix_minus(self, s): 'use a unicode minus rather than hyphen' if rcParams['text.usetex']: return s Modified: trunk/matplotlib/src/_backend_agg.cpp === --- trunk/matplotlib/src/_backend_agg.cpp 2008-05-29 15:55:55 UTC (rev 5302) +++ trunk/matplotlib/src/_backend_agg.cpp 2008-05-29 16:44:49 UTC (rev 5303) @@ -679,8 +679,11 @@ typedef agg::span_allocator color_span_alloc_type; typedef agg::span_interpolator_linear<> interpolator_type; typedef agg::image_accessor_clip image_accessor_type; - typedef agg::span_image_filter_gray_2x2 + //typedef agg::span_image_filter_gray_2x2 + // image_span_gen_type; + typedef agg::span_image_filter_gray image_span_gen_type; + typedef font_to_rgba span_gen_type; typedef agg::renderer_scanline_aa renderer_type; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5304] branches/v0_91_maint
Revision: 5304
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5304&view=rev
Author: jdh2358
Date: 2008-05-29 11:25:15 -0700 (Thu, 29 May 2008)
Log Message:
---
added clippath support for ps
Modified Paths:
--
branches/v0_91_maint/examples/polar_demo.py
branches/v0_91_maint/lib/matplotlib/backends/backend_ps.py
branches/v0_91_maint/lib/matplotlib/backends/backend_svg.py
Modified: branches/v0_91_maint/examples/polar_demo.py
===
--- branches/v0_91_maint/examples/polar_demo.py 2008-05-29 16:44:49 UTC (rev
5303)
+++ branches/v0_91_maint/examples/polar_demo.py 2008-05-29 18:25:15 UTC (rev
5304)
@@ -57,4 +57,6 @@
ax.set_rmax(2.0)
ax.set_title("And there was much rejoicing!", fontsize=20)
+
+fig.savefig('polar_demo')
show()
Modified: branches/v0_91_maint/lib/matplotlib/backends/backend_ps.py
===
--- branches/v0_91_maint/lib/matplotlib/backends/backend_ps.py 2008-05-29
16:44:49 UTC (rev 5303)
+++ branches/v0_91_maint/lib/matplotlib/backends/backend_ps.py 2008-05-29
18:25:15 UTC (rev 5304)
@@ -150,6 +150,8 @@
self.used_characters = {}
self.mathtext_parser = MathTextParser("PS")
+self._clip_paths = dict()
+
def track_characters(self, font, s):
"""Keeps track of which characters are required from
each font."""
@@ -445,6 +447,49 @@
ps = '%1.4g %1.4g m %1.4g %1.4g l'%(x0, y0, x1, y1)
self._draw_ps(ps, gc, None, "line")
+def _get_clippath_command(self, clippath):
+id = self._clip_paths.get(clippath)
+if id is None:
+id = 'c%x' % len(self._clip_paths)
+ps_cmd = ['/%s {' % id]
+ps_cmd.append(self._get_path(clippath))
+ps_cmd.extend(['clip', 'newpath', '} bind def\n'])
+self._pswriter.write('\n'.join(ps_cmd))
+self._clip_paths[clippath] = id
+
+return '%s\n'%id
+
+def _get_path(self, path):
+cmd = []
+while 1:
+code, xp, yp = path.vertex()
+
+
+if code == agg.path_cmd_stop:
+cmd.append('closepath\n')
+break
+elif code == agg.path_cmd_move_to:
+cmd.append('%g %g m' % (xp, yp))
+elif code == agg.path_cmd_line_to:
+cmd.append('%g %g l' % (xp, yp))
+elif code == agg.path_cmd_curve3:
+verts = [xp, yp]
+verts.extend(path.vertex()[1:])
+cmd.append('%g %g %g %g %g %g c' % (verts[0], verts[1],
+ verts[0], verts[1],
+ verts[2], verts[3]))
+elif code == agg.path_cmd_curve4:
+verts = [xp, yp]
+verts.extend(path.vertex()[1:])
+verts.extend(path.vertex()[1:])
+cmd.append('%g %g %g %g %g %g c'%tuple(verts))
+elif code == agg.path_cmd_end_poly:
+cmd.append('cl\n')
+
+if len(cmd)==0:
+return None
+return '\n'.join(cmd)
+
def draw_markers(self, gc, path, rgbFace, x, y, transform):
"""
Draw the markers defined by path at each of the positions in x
@@ -515,10 +560,17 @@
mask = npy.where(npy.isnan(x) + npy.isnan(y), 0, 1)
cliprect = gc.get_clip_rectangle()
+clippath = gc.get_clip_path()
if cliprect:
write('gsave\n')
xc,yc,wc,hc=cliprect
write('%g %g %g %g clipbox\n' % (wc,hc,xc,yc))
+if clippath:
+write('gsave\n')
+cmd = self._get_clippath_command(clippath)
+write(cmd)
+
+
write(' '.join(['/o {', ps_cmd, '} bind def\n']))
# Now evaluate the marker command at each marker location:
while start < len(x):
@@ -527,8 +579,11 @@
write('\n'.join(ps)+'\n')
start = end
end += step
+
if cliprect: write('grestore\n')
+if clippath: write('grestore\n')
+
def draw_path(self, gc, rgbFace, path):
ps_cmd = []
@@ -594,10 +649,17 @@
self.push_gc(gc, store=1)
cliprect = gc.get_clip_rectangle()
+clippath = gc.get_clip_path()
+
if cliprect:
write('gsave\n')
xc,yc,wc,hc=cliprect
write('%g %g %g %g clipbox\n' % (wc,hc,xc,yc))
+if clippath:
+write('gsave\n')
+cmd = self._get_clippath_command(clippath)
+write(cmd)
+
while start < len(points):
drawone.state = 'm'
ps = [i for i in [drawone(x,y,s) for x,y,s in points[start:end+1]]\
@@ -607,8 +669,8 @@
start = end
end += step
if cliprect: write('grestore\n')
+if clippath: write('grestore\n')
-
def draw_lines_old(self, gc, x, y, transform=None):
SF.net SVN: matplotlib: [5305] branches/v0_91_maint/CHANGELOG
Revision: 5305 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5305&view=rev Author: jdh2358 Date: 2008-05-29 11:25:58 -0700 (Thu, 29 May 2008) Log Message: --- added clippath support for ps Modified Paths: -- branches/v0_91_maint/CHANGELOG Modified: branches/v0_91_maint/CHANGELOG === --- branches/v0_91_maint/CHANGELOG 2008-05-29 18:25:15 UTC (rev 5304) +++ branches/v0_91_maint/CHANGELOG 2008-05-29 18:25:58 UTC (rev 5305) @@ -1,3 +1,5 @@ +2008-05-29 Implement path clipping in PS backend - JDH + 2008-05-29 Fixed two bugs in texmanager.py: improved comparison of dvipng versions fixed a bug introduced when get_grey method was added This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5306] branches/v0_91_maint
Revision: 5306
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5306&view=rev
Author: jdh2358
Date: 2008-05-29 13:17:32 -0700 (Thu, 29 May 2008)
Log Message:
---
imread via pil now returns lumininance or rgb if possible
Modified Paths:
--
branches/v0_91_maint/API_CHANGES
branches/v0_91_maint/CHANGELOG
branches/v0_91_maint/lib/matplotlib/image.py
Modified: branches/v0_91_maint/API_CHANGES
===
--- branches/v0_91_maint/API_CHANGES2008-05-29 18:25:58 UTC (rev 5305)
+++ branches/v0_91_maint/API_CHANGES2008-05-29 20:17:32 UTC (rev 5306)
@@ -1,3 +1,8 @@
+matplotlib.image.imread now no longer always returns RGBA -- if
+the image is luminance or RGB, it will return a MxN or MxNx3 array
+if possible. Also uint8 is no longer always forced to float.
+
+
0.91.2 Released
For csv2rec, checkrows=0 is the new default indicating all rows
Modified: branches/v0_91_maint/CHANGELOG
===
--- branches/v0_91_maint/CHANGELOG 2008-05-29 18:25:58 UTC (rev 5305)
+++ branches/v0_91_maint/CHANGELOG 2008-05-29 20:17:32 UTC (rev 5306)
@@ -1,3 +1,8 @@
+2008-05-29 matplotlib.image.imread now no longer always returns RGBA
+ -- if the image is luminance or RGB, it will return a MxN
+ or MxNx3 array if possible. Also uint8 is no longer always
+ forced to float.
+
2008-05-29 Implement path clipping in PS backend - JDH
2008-05-29 Fixed two bugs in texmanager.py:
Modified: branches/v0_91_maint/lib/matplotlib/image.py
===
--- branches/v0_91_maint/lib/matplotlib/image.py2008-05-29 18:25:58 UTC
(rev 5305)
+++ branches/v0_91_maint/lib/matplotlib/image.py2008-05-29 20:17:32 UTC
(rev 5306)
@@ -607,11 +607,15 @@
"""
return image file in fname as numpy array
-Return value is a MxNx4 array of 0-1 normalized floats
+return value is a numpy array. For grayscale images, the return
+array is MxN. For RGB images, the return value is MxNx3. For
+RGBA images the return value is MxNx4
matplotlib can only read PNGs natively, but if PIL is installed,
-it will use it to load the image and return an RGBA if possible
+it will use it to load the image and return an array (if possible)
which can be used with imshow
+
+TODO: support RGB and grayscale return values in _image.readpng
"""
def pilread():
@@ -639,15 +643,39 @@
def pil_to_array( pilImage ):
+"""
+load a PIL image and return it as a numpy array of uint8. For
+grayscale images, the return array is MxN. For RGB images, the
+return value is MxNx3. For RGBA images the return value is MxNx4
+"""
+def toarray(im):
+'return a 1D array of floats'
+x_str = im.tostring('raw',im.mode,0,-1)
+x = npy.fromstring(x_str,npy.uint8)
+return x
+
if pilImage.mode in ('RGBA', 'RGBX'):
-im = pilImage # no need to convert images in rgba format
+im = pilImage # no need to convert images
+elif pilImage.mode=='L':
+im = pilImage # no need to luminance images
+# return MxN luminance array
+x = toarray(im)
+x.shape = im.size[1], im.size[0]
+return x
+elif pilImage.mode=='RGB':
+#return MxNx3 RGB array
+im = pilImage # no need to RGB images
+x = toarray(im)
+x.shape = im.size[1], im.size[0], 3
+return x
+
else: # try to convert to an rgba image
try:
im = pilImage.convert('RGBA')
except ValueError:
raise RuntimeError('Unknown image mode')
-x_str = im.tostring('raw',im.mode,0,-1)
-x = npy.fromstring(x_str,npy.uint8)
+# return MxNx4 RGBA array
+x = toarray(im)
x.shape = im.size[1], im.size[0], 4
return x
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5307] trunk/matplotlib/examples/data/lena.png
Revision: 5307 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5307&view=rev Author: jdh2358 Date: 2008-05-29 13:18:41 -0700 (Thu, 29 May 2008) Log Message: --- some prop changes on lena Added Paths: --- trunk/matplotlib/examples/data/lena.png Added: trunk/matplotlib/examples/data/lena.png === (Binary files differ) Property changes on: trunk/matplotlib/examples/data/lena.png ___ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5308] trunk/matplotlib
Revision: 5308
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5308&view=rev
Author: jdh2358
Date: 2008-05-29 13:29:54 -0700 (Thu, 29 May 2008)
Log Message:
---
Merged revisions 5304-5306 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_91_maint
r5304 | jdh2358 | 2008-05-29 13:25:15 -0500 (Thu, 29 May 2008) | 1 line
added clippath support for ps
r5305 | jdh2358 | 2008-05-29 13:25:58 -0500 (Thu, 29 May 2008) | 1 line
added clippath support for ps
r5306 | jdh2358 | 2008-05-29 15:17:32 -0500 (Thu, 29 May 2008) | 1 line
imread via pil now returns lumininance or rgb if possible
Modified Paths:
--
trunk/matplotlib/API_CHANGES
trunk/matplotlib/CHANGELOG
trunk/matplotlib/examples/pylab/image_demo3.py
trunk/matplotlib/lib/matplotlib/image.py
Property Changed:
trunk/matplotlib/
Property changes on: trunk/matplotlib
___
Name: svnmerge-integrated
- /branches/v0_91_maint:1-5299
+ /branches/v0_91_maint:1-5307
Modified: trunk/matplotlib/API_CHANGES
===
--- trunk/matplotlib/API_CHANGES2008-05-29 20:18:41 UTC (rev 5307)
+++ trunk/matplotlib/API_CHANGES2008-05-29 20:29:54 UTC (rev 5308)
@@ -1,4 +1,8 @@
+matplotlib.image.imread now no longer always returns RGBA -- if
+the image is luminance or RGB, it will return a MxN or MxNx3 array
+if possible. Also uint8 is no longer always forced to float.
+
Rewrote the cm.ScalarMappable callback infrastructure to use
cbook.CallbackRegistry rather than custom callback handling. Amy
users of add_observer/notify of the cm.ScalarMappable should uae
@@ -197,6 +201,9 @@
END OF TRANSFORMS REFACTORING
+
+
+
0.91.2 Released
For csv2rec, checkrows=0 is the new default indicating all rows
Modified: trunk/matplotlib/CHANGELOG
===
--- trunk/matplotlib/CHANGELOG 2008-05-29 20:18:41 UTC (rev 5307)
+++ trunk/matplotlib/CHANGELOG 2008-05-29 20:29:54 UTC (rev 5308)
@@ -1,3 +1,10 @@
+2008-05-29 matplotlib.image.imread now no longer always returns RGBA
+ -- if the image is luminance or RGB, it will return a MxN
+ or MxNx3 array if possible. Also uint8 is no longer always
+ forced to float.
+
+2008-05-29 Implement path clipping in PS backend - JDH
+
2008-05-29 Fixed two bugs in texmanager.py:
improved comparison of dvipng versions
fixed a bug introduced when get_grey method was added
Modified: trunk/matplotlib/examples/pylab/image_demo3.py
===
--- trunk/matplotlib/examples/pylab/image_demo3.py 2008-05-29 20:18:41 UTC
(rev 5307)
+++ trunk/matplotlib/examples/pylab/image_demo3.py 2008-05-29 20:29:54 UTC
(rev 5308)
@@ -3,14 +3,15 @@
try:
import Image
except ImportError, exc:
-raise SystemExit("PIL must be loaded to run this example")
+raise SystemExit("PIL must be installed to run this example")
lena = Image.open('../data/lena.jpg')
dpi = rcParams['figure.dpi']
figsize = lena.size[0]/dpi, lena.size[1]/dpi
figure(figsize=figsize)
-
+ax = axes([0,0,1,1], frameon=False)
+ax.set_axis_off()
im = imshow(lena, origin='lower')
#savefig('image_demo3')
Modified: trunk/matplotlib/lib/matplotlib/image.py
===
--- trunk/matplotlib/lib/matplotlib/image.py2008-05-29 20:18:41 UTC (rev
5307)
+++ trunk/matplotlib/lib/matplotlib/image.py2008-05-29 20:29:54 UTC (rev
5308)
@@ -650,11 +650,15 @@
"""
return image file in fname as numpy array
-Return value is a MxNx4 array of 0-1 normalized floats
+return value is a numpy array. For grayscale images, the return
+array is MxN. For RGB images, the return value is MxNx3. For
+RGBA images the return value is MxNx4
matplotlib can only read PNGs natively, but if PIL is installed,
-it will use it to load the image and return an RGBA if possible
+it will use it to load the image and return an array (if possible)
which can be used with imshow
+
+TODO: support RGB and grayscale return values in _image.readpng
"""
def pilread():
@@ -682,15 +686,39 @@
def pil_to_array( pilImage ):
+"""
+load a PIL image and return it as a numpy array of uint8. For
+grayscale images, the return array is MxN. For RGB images, the
+return value is MxNx3. For RGBA images the return value is MxNx4
+"""
+def toarray(im)
+'return a 1D array of floats'
+x_str = im.tostring('raw',im.mode,0,-1)
+x = np.fromstring(x_str,np.uint8)
+return x
+
if pilImage.mode in ('RGBA', 'RGBX'):
-im = pilImage # no need to co
SF.net SVN: matplotlib: [5309] trunk/matplotlib/lib/matplotlib/image.py
Revision: 5309
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5309&view=rev
Author: jdh2358
Date: 2008-05-29 13:33:07 -0700 (Thu, 29 May 2008)
Log Message:
---
fixed an image bug
Modified Paths:
--
trunk/matplotlib/lib/matplotlib/image.py
Modified: trunk/matplotlib/lib/matplotlib/image.py
===
--- trunk/matplotlib/lib/matplotlib/image.py2008-05-29 20:29:54 UTC (rev
5308)
+++ trunk/matplotlib/lib/matplotlib/image.py2008-05-29 20:33:07 UTC (rev
5309)
@@ -691,7 +691,7 @@
grayscale images, the return array is MxN. For RGB images, the
return value is MxNx3. For RGBA images the return value is MxNx4
"""
-def toarray(im)
+def toarray(im):
'return a 1D array of floats'
x_str = im.tostring('raw',im.mode,0,-1)
x = np.fromstring(x_str,np.uint8)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5310] trunk/matplotlib/examples/api/ path_patch_demo.py
Revision: 5310 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5310&view=rev Author: jdh2358 Date: 2008-05-29 14:12:59 -0700 (Thu, 29 May 2008) Log Message: --- added demo showing how to use curvy paths directly Added Paths: --- trunk/matplotlib/examples/api/path_patch_demo.py Added: trunk/matplotlib/examples/api/path_patch_demo.py === --- trunk/matplotlib/examples/api/path_patch_demo.py (rev 0) +++ trunk/matplotlib/examples/api/path_patch_demo.py2008-05-29 21:12:59 UTC (rev 5310) @@ -0,0 +1,34 @@ +import numpy as np +import matplotlib.path as mpath +import matplotlib.patches as mpatches +import matplotlib.pyplot as plt + +Path = mpath.Path + +pathdata = [ +(Path.MOVETO, (0, 0)), +(Path.CURVE4, (-1, 0)), +(Path.CURVE4, (-1, 1)), +(Path.CURVE4, (0, 1)), +(Path.LINETO, (2, 1)), +(Path.CURVE4, (3, 1)), +(Path.CURVE4, (3, 0)), +(Path.CURVE4, (2, 0)), +(Path.CLOSEPOLY, (0, 0)), +] + +codes, verts = zip(*pathdata) +path = mpath.Path(verts, codes) + +patch = mpatches.PathPatch(path, facecolor='green', edgecolor='yellow', alpha=0.5) + +fig = plt.figure() +ax = fig.add_subplot(111) +ax.add_patch(patch) + +ax.set_xlim(-5,5) +ax.set_ylim(-5,5) + +plt.show() + + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5311] trunk/matplotlib/examples
Revision: 5311
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5311&view=rev
Author: jdh2358
Date: 2008-05-29 14:37:55 -0700 (Thu, 29 May 2008)
Log Message:
---
added path editor
Modified Paths:
--
trunk/matplotlib/examples/api/path_patch_demo.py
Added Paths:
---
trunk/matplotlib/examples/event_handling/path_editor.py
Modified: trunk/matplotlib/examples/api/path_patch_demo.py
===
--- trunk/matplotlib/examples/api/path_patch_demo.py2008-05-29 21:12:59 UTC
(rev 5310)
+++ trunk/matplotlib/examples/api/path_patch_demo.py2008-05-29 21:37:55 UTC
(rev 5311)
@@ -5,6 +5,9 @@
Path = mpath.Path
+fig = plt.figure()
+ax = fig.add_subplot(111)
+
pathdata = [
(Path.MOVETO, (0, 0)),
(Path.CURVE4, (-1, 0)),
@@ -19,13 +22,10 @@
codes, verts = zip(*pathdata)
path = mpath.Path(verts, codes)
-
patch = mpatches.PathPatch(path, facecolor='green', edgecolor='yellow',
alpha=0.5)
-
-fig = plt.figure()
-ax = fig.add_subplot(111)
ax.add_patch(patch)
+
ax.set_xlim(-5,5)
ax.set_ylim(-5,5)
Added: trunk/matplotlib/examples/event_handling/path_editor.py
===
--- trunk/matplotlib/examples/event_handling/path_editor.py
(rev 0)
+++ trunk/matplotlib/examples/event_handling/path_editor.py 2008-05-29
21:37:55 UTC (rev 5311)
@@ -0,0 +1,145 @@
+import numpy as np
+import matplotlib.path as mpath
+import matplotlib.patches as mpatches
+import matplotlib.pyplot as plt
+import matplotlib.mlab as mlab
+
+Path = mpath.Path
+
+fig = plt.figure()
+ax = fig.add_subplot(111)
+
+pathdata = [
+(Path.MOVETO, (0, 0)),
+(Path.CURVE4, (-1, 0.1)),
+(Path.CURVE4, (-1, 0.9)),
+(Path.CURVE4, (0, 1)),
+(Path.LINETO, (2, 1)),
+(Path.CURVE4, (3, 0.9)),
+(Path.CURVE4, (3, 0.1)),
+(Path.CURVE4, (2, 0)),
+(Path.CLOSEPOLY, (0, 0)),
+]
+
+codes, verts = zip(*pathdata)
+path = mpath.Path(verts, codes)
+patch = mpatches.PathPatch(path, facecolor='green', edgecolor='yellow',
alpha=0.5)
+ax.add_patch(patch)
+
+
+class PathInteractor:
+"""
+An path editor.
+
+Key-bindings
+
+ 't' toggle vertex markers on and off. When vertex markers are on,
+ you can move them, delete them
+
+
+"""
+
+showverts = True
+epsilon = 5 # max pixel distance to count as a vertex hit
+
+def __init__(self, pathpatch):
+
+self.ax = pathpatch.axes
+canvas = self.ax.figure.canvas
+self.pathpatch = pathpatch
+self.pathpatch.set_animated(True)
+
+x, y = zip(*self.pathpatch.get_path().vertices)
+
+self.line, = ax.plot(x,y,marker='o', markerfacecolor='r',
animated=True)
+
+self._ind = None # the active vert
+
+canvas.mpl_connect('draw_event', self.draw_callback)
+canvas.mpl_connect('button_press_event', self.button_press_callback)
+canvas.mpl_connect('key_press_event', self.key_press_callback)
+canvas.mpl_connect('button_release_event',
self.button_release_callback)
+canvas.mpl_connect('motion_notify_event', self.motion_notify_callback)
+self.canvas = canvas
+
+
+def draw_callback(self, event):
+self.background = self.canvas.copy_from_bbox(self.ax.bbox)
+self.ax.draw_artist(self.pathpatch)
+self.ax.draw_artist(self.line)
+self.canvas.blit(self.ax.bbox)
+
+def pathpatch_changed(self, pathpatch):
+'this method is called whenever the pathpatchgon object is called'
+# only copy the artist props to the line (except visibility)
+vis = self.line.get_visible()
+Artist.update_from(self.line, pathpatch)
+self.line.set_visible(vis) # don't use the pathpatch visibility state
+
+
+def get_ind_under_point(self, event):
+'get the index of the vertex under point if within epsilon tolerance'
+
+# display coords
+xy = np.asarray(self.pathpatch.get_path().vertices)
+xyt = self.pathpatch.get_transform().transform(xy)
+xt, yt = xyt[:, 0], xyt[:, 1]
+d = np.sqrt((xt-event.x)**2 + (yt-event.y)**2)
+ind = d.argmin()
+
+if d[ind]>=self.epsilon:
+ind = None
+
+return ind
+
+def button_press_callback(self, event):
+'whenever a mouse button is pressed'
+if not self.showverts: return
+if event.inaxes==None: return
+if event.button != 1: return
+self._ind = self.get_ind_under_point(event)
+
+def button_release_callback(self, event):
+'whenever a mouse button is released'
+if not self.showverts: return
+if event.button != 1: return
+self._ind = None
+
+def key_press_callback(self, event):
+'whenever a key is pressed'
+if not event.inaxes: return
+if event.key=='t':
+self.showverts = not self.showverts
+
SF.net SVN: matplotlib: [5312] branches/v0_91_maint
Revision: 5312 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5312&view=rev Author: cmoad Date: 2008-05-29 15:59:43 -0700 (Thu, 29 May 2008) Log Message: --- tagging new version Modified Paths: -- branches/v0_91_maint/CHANGELOG branches/v0_91_maint/lib/matplotlib/__init__.py Modified: branches/v0_91_maint/CHANGELOG === --- branches/v0_91_maint/CHANGELOG 2008-05-29 21:37:55 UTC (rev 5311) +++ branches/v0_91_maint/CHANGELOG 2008-05-29 22:59:43 UTC (rev 5312) @@ -1,3 +1,5 @@ +=== 2008-01-06 Released 0.91.3 at revision 5312 + 2008-05-29 matplotlib.image.imread now no longer always returns RGBA -- if the image is luminance or RGB, it will return a MxN or MxNx3 array if possible. Also uint8 is no longer always Modified: branches/v0_91_maint/lib/matplotlib/__init__.py === --- branches/v0_91_maint/lib/matplotlib/__init__.py 2008-05-29 21:37:55 UTC (rev 5311) +++ branches/v0_91_maint/lib/matplotlib/__init__.py 2008-05-29 22:59:43 UTC (rev 5312) @@ -55,7 +55,7 @@ """ from __future__ import generators -__version__ = '0.91.2svn' +__version__ = '0.91.3svn' __revision__ = '$Revision$' __date__ = '$Date$' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5313] branches/v0_91_maint
Revision: 5313 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5313&view=rev Author: cmoad Date: 2008-05-29 20:07:39 -0700 (Thu, 29 May 2008) Log Message: --- minor rev bump Modified Paths: -- branches/v0_91_maint/CHANGELOG branches/v0_91_maint/lib/matplotlib/__init__.py Modified: branches/v0_91_maint/CHANGELOG === --- branches/v0_91_maint/CHANGELOG 2008-05-29 22:59:43 UTC (rev 5312) +++ branches/v0_91_maint/CHANGELOG 2008-05-30 03:07:39 UTC (rev 5313) @@ -1,4 +1,5 @@ -=== 2008-01-06 Released 0.91.3 at revision 5312 +=== +2008-05-29 Released 0.91.3 at revision 5313 2008-05-29 matplotlib.image.imread now no longer always returns RGBA -- if the image is luminance or RGB, it will return a MxN Modified: branches/v0_91_maint/lib/matplotlib/__init__.py === --- branches/v0_91_maint/lib/matplotlib/__init__.py 2008-05-29 22:59:43 UTC (rev 5312) +++ branches/v0_91_maint/lib/matplotlib/__init__.py 2008-05-30 03:07:39 UTC (rev 5313) @@ -55,7 +55,7 @@ """ from __future__ import generators -__version__ = '0.91.3svn' +__version__ = '0.91.3' __revision__ = '$Revision$' __date__ = '$Date$' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib: [5314] trunk/matplotlib
Revision: 5314 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5314&view=rev Author: cmoad Date: 2008-05-29 20:09:53 -0700 (Thu, 29 May 2008) Log Message: --- new release prep Modified Paths: -- trunk/matplotlib/CHANGELOG trunk/matplotlib/MANIFEST.in trunk/matplotlib/lib/matplotlib/__init__.py Modified: trunk/matplotlib/CHANGELOG === --- trunk/matplotlib/CHANGELOG 2008-05-30 03:07:39 UTC (rev 5313) +++ trunk/matplotlib/CHANGELOG 2008-05-30 03:09:53 UTC (rev 5314) @@ -1,3 +1,6 @@ +=== +2008-05-29 Released 0.98.0 at revision 5314 + 2008-05-29 matplotlib.image.imread now no longer always returns RGBA -- if the image is luminance or RGB, it will return a MxN or MxNx3 array if possible. Also uint8 is no longer always Modified: trunk/matplotlib/MANIFEST.in === --- trunk/matplotlib/MANIFEST.in2008-05-30 03:07:39 UTC (rev 5313) +++ trunk/matplotlib/MANIFEST.in2008-05-30 03:09:53 UTC (rev 5314) @@ -18,7 +18,7 @@ prune examples/_tmp_* recursive-include src *.cpp *.c *.h recursive-include CXX *.cxx *.hxx *.c *.h -recursive-include agg23 * +recursive-include agg24 * recursive-include lib * recursive-include swig * recursive-include ttconv *.cpp *.h Modified: trunk/matplotlib/lib/matplotlib/__init__.py === --- trunk/matplotlib/lib/matplotlib/__init__.py 2008-05-30 03:07:39 UTC (rev 5313) +++ trunk/matplotlib/lib/matplotlib/__init__.py 2008-05-30 03:09:53 UTC (rev 5314) @@ -55,7 +55,7 @@ """ from __future__ import generators -__version__ = '0.98pre' +__version__ = '0.98.0' __revision__ = '$Revision$' __date__ = '$Date$' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
