Menu
▾
▴
matplotlib-checkins
|
From: <md...@us...> - 2009-09-14 17:11:21
|
Revision: 7756
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7756&view=rev
Author: mdboom
Date: 2009-09-14 17:11:06 +0000 (Mon, 14 Sep 2009)
Log Message:
-----------
Minor doc fixes
Modified Paths:
--------------
branches/v0_99_maint/doc/users/image_tutorial.rst
branches/v0_99_maint/lib/matplotlib/axes.py
branches/v0_99_maint/lib/matplotlib/font_manager.py
branches/v0_99_maint/lib/matplotlib/mlab.py
Modified: branches/v0_99_maint/doc/users/image_tutorial.rst
===================================================================
--- branches/v0_99_maint/doc/users/image_tutorial.rst 2009-09-14 17:02:32 UTC (rev 7755)
+++ branches/v0_99_maint/doc/users/image_tutorial.rst 2009-09-14 17:11:06 UTC (rev 7756)
@@ -179,7 +179,7 @@
In [6]: lum_img = img[:,:,0]
-This is array slicing. You can read more `here
+This is array slicing. You can read more in the `Numpy tutorial
<http://www.scipy.org/Tentative_NumPy_Tutorial>`_.
.. sourcecode:: ipython
@@ -229,8 +229,8 @@
imgplot = plt.imshow(lum_img)
imgplot.set_cmap('spectral')
-There are many other colormap schemes available. See a list and
-images of the colormaps `here
+There are many other colormap schemes available. See the `list and
+images of the colormaps
<http://matplotlib.sourceforge.net/examples/pylab_examples/show_colormaps.html>`_.
.. _Color Bars
Modified: branches/v0_99_maint/lib/matplotlib/axes.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/axes.py 2009-09-14 17:02:32 UTC (rev 7755)
+++ branches/v0_99_maint/lib/matplotlib/axes.py 2009-09-14 17:11:06 UTC (rev 7756)
@@ -7438,8 +7438,8 @@
window = mlab.window_hanning, noverlap=0, pad_to=None,
sides='default', scale_by_freq=None, **kwargs)
- cohere the coherence between *x* and *y*. Coherence is the normalized
- cross spectral density:
+ :meth:`cohere` the coherence between *x* and *y*. Coherence
+ is the normalized cross spectral density:
.. math::
Modified: branches/v0_99_maint/lib/matplotlib/font_manager.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/font_manager.py 2009-09-14 17:02:32 UTC (rev 7755)
+++ branches/v0_99_maint/lib/matplotlib/font_manager.py 2009-09-14 17:11:06 UTC (rev 7756)
@@ -12,12 +12,12 @@
font specification <http://www.w3.org/TR/1998/REC-CSS2-19980512/>`_.
Future versions may implement the Level 2 or 2.1 specifications.
-Experimental support is included for using `fontconfig
-<http://www.fontconfig.org>`_ on Unix variant plaforms (Linux, OS X,
-Solaris). To enable it, set the constant ``USE_FONTCONFIG`` in this
-file to ``True``. Fontconfig has the advantage that it is the
-standard way to look up fonts on X11 platforms, so if a font is
-installed, it is much more likely to be found.
+Experimental support is included for using `fontconfig` on Unix
+variant platforms (Linux, OS X, Solaris). To enable it, set the
+constant ``USE_FONTCONFIG`` in this file to ``True``. Fontconfig has
+the advantage that it is the standard way to look up fonts on X11
+platforms, so if a font is installed, it is much more likely to be
+found.
"""
"""
@@ -707,7 +707,7 @@
def __hash__(self):
l = [(k, getattr(self, "get" + k)()) for k in sorted(self.__dict__)]
return hash(repr(l))
-
+
def __str__(self):
return self.get_fontconfig_pattern()
Modified: branches/v0_99_maint/lib/matplotlib/mlab.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/mlab.py 2009-09-14 17:02:32 UTC (rev 7755)
+++ branches/v0_99_maint/lib/matplotlib/mlab.py 2009-09-14 17:11:06 UTC (rev 7756)
@@ -362,12 +362,16 @@
*x*
Array or sequence containing the data
+
%(PSD)s
+
Returns the tuple (*Pxx*, *freqs*).
Refs:
+
Bendat & Piersol -- Random Data: Analysis and Measurement
Procedures, John Wiley & Sons (1986)
+
"""
Pxx,freqs = csd(x, x, NFFT, Fs, detrend, window, noverlap, pad_to, sides,
scale_by_freq)
@@ -391,7 +395,9 @@
*x*, *y*
Array or sequence containing the data
+
%(PSD)s
+
Returns the tuple (*Pxy*, *freqs*).
Refs:
@@ -418,7 +424,9 @@
If *x* is real (i.e. non-complex) only the spectrum of the positive
frequencie is returned. If *x* is complex then the complete
spectrum is returned.
+
%(PSD)s
+
Returns a tuple (*Pxx*, *freqs*, *t*):
- *Pxx*: 2-D array, columns are the periodograms of
@@ -462,11 +470,13 @@
*x*, *y*
Array or sequence containing the data
+
%(PSD)s
+
The return value is the tuple (*Cxy*, *f*), where *f* are the
frequencies of the coherence vector. For cohere, scaling the
- individual densities by the sampling frequency has no effect, since
- the factors cancel out.
+ individual densities by the sampling frequency has no effect,
+ since the factors cancel out.
.. seealso::
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-09-15 13:22:21
|
Revision: 7762
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7762&view=rev
Author: jouni
Date: 2009-09-15 12:12:19 +0000 (Tue, 15 Sep 2009)
Log Message:
-----------
Don't fail on AFM files containing floating-point bounding boxes
Modified Paths:
--------------
branches/v0_99_maint/CHANGELOG
branches/v0_99_maint/lib/matplotlib/afm.py
Modified: branches/v0_99_maint/CHANGELOG
===================================================================
--- branches/v0_99_maint/CHANGELOG 2009-09-14 21:52:24 UTC (rev 7761)
+++ branches/v0_99_maint/CHANGELOG 2009-09-15 12:12:19 UTC (rev 7762)
@@ -1,3 +1,5 @@
+2009-09-15 Don't fail on AFM files containing floating-point bounding boxes - JKS
+
2009-08-06 Tagging the 0.99.0 release at svn r7397 - JDH
* fixed an alpha colormapping bug posted on sf 2832575
Modified: branches/v0_99_maint/lib/matplotlib/afm.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/afm.py 2009-09-14 21:52:24 UTC (rev 7761)
+++ branches/v0_99_maint/lib/matplotlib/afm.py 2009-09-15 12:12:19 UTC (rev 7762)
@@ -165,7 +165,8 @@
num = _to_int(vals[0].split()[1])
wx = _to_float(vals[1].split()[1])
name = vals[2].split()[1]
- bbox = _to_list_of_ints(vals[3][2:])
+ bbox = _to_list_of_floats(vals[3][2:])
+ bbox = map(int, bbox)
# Workaround: If the character name is 'Euro', give it the corresponding
# character code, according to WinAnsiEncoding (see PDF Reference).
if name == 'Euro':
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-09-20 12:30:39
|
Revision: 7794
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7794&view=rev
Author: jouni
Date: 2009-09-20 12:30:22 +0000 (Sun, 20 Sep 2009)
Log Message:
-----------
Prevent exception in case of missing height and depth information in a TeX font
Modified Paths:
--------------
branches/v0_99_maint/CHANGELOG
branches/v0_99_maint/lib/matplotlib/dviread.py
Modified: branches/v0_99_maint/CHANGELOG
===================================================================
--- branches/v0_99_maint/CHANGELOG 2009-09-19 23:49:24 UTC (rev 7793)
+++ branches/v0_99_maint/CHANGELOG 2009-09-20 12:30:22 UTC (rev 7794)
@@ -1,3 +1,7 @@
+2009-09-20 Prevent exception in case of missing height and depth information
+ in a TeX font - this doesn't make the typesetting right, but prevents
+ the crash - JKS
+
2009-09-15 Don't fail on AFM files containing floating-point bounding boxes - JKS
2009-08-06 Tagging the 0.99.0 release at svn r7397 - JDH
Modified: branches/v0_99_maint/lib/matplotlib/dviread.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/dviread.py 2009-09-19 23:49:24 UTC (rev 7793)
+++ branches/v0_99_maint/lib/matplotlib/dviread.py 2009-09-20 12:30:22 UTC (rev 7794)
@@ -88,8 +88,7 @@
e = 0 # zero depth
else: # glyph
x,y,font,g,w = elt
- h = _mul2012(font._scale, font._tfm.height[g])
- e = _mul2012(font._scale, font._tfm.depth[g])
+ h,e = font._height_depth_of(g)
minx = min(minx, x)
miny = min(miny, y - h)
maxx = max(maxx, x + w)
@@ -443,6 +442,24 @@
'debug')
return 0
+ def _height_depth_of(self, char):
+ """
+ Height and depth of char in dvi units. For internal use by dviread.py.
+ """
+
+ result = []
+ for metric,name in ((self._tfm.height, "height"),
+ (self._tfm.depth, "depth")):
+ value = metric.get(char, None)
+ if value is None:
+ matplotlib.verbose.report(
+ 'No %s for char %d in font %s' % (name, char, self.texname),
+ 'debug')
+ result.append(0)
+ else:
+ result.append(_mul2012(value, self._scale))
+ return result
+
class Vf(Dvi):
"""
A virtual font (\*.vf file) containing subroutines for dvi files.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-09-20 13:19:33
|
Revision: 7796
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7796&view=rev
Author: jouni
Date: 2009-09-20 13:19:25 +0000 (Sun, 20 Sep 2009)
Log Message:
-----------
Fix off-by-one error in dviread.Tfm
Modified Paths:
--------------
branches/v0_99_maint/CHANGELOG
branches/v0_99_maint/lib/matplotlib/dviread.py
Modified: branches/v0_99_maint/CHANGELOG
===================================================================
--- branches/v0_99_maint/CHANGELOG 2009-09-20 13:07:15 UTC (rev 7795)
+++ branches/v0_99_maint/CHANGELOG 2009-09-20 13:19:25 UTC (rev 7796)
@@ -1,6 +1,5 @@
-2009-09-20 Prevent exception in case of missing height and depth information
- in a TeX font - this doesn't make the typesetting right, but prevents
- the crash - JKS
+2009-09-20 Fix off-by-one error in dviread.Tfm, and additionally protect
+ against exceptions in case a dvi font is missing some metrics - JKS
2009-09-15 Don't fail on AFM files containing floating-point bounding boxes - JKS
Modified: branches/v0_99_maint/lib/matplotlib/dviread.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/dviread.py 2009-09-20 13:07:15 UTC (rev 7795)
+++ branches/v0_99_maint/lib/matplotlib/dviread.py 2009-09-20 13:19:25 UTC (rev 7796)
@@ -415,7 +415,7 @@
scale, tfm, texname, vf
self.size = scale * (72.0 / (72.27 * 2**16))
try:
- nchars = max(tfm.width.iterkeys())
+ nchars = max(tfm.width.iterkeys()) + 1
except ValueError:
nchars = 0
self.widths = [ (1000*tfm.width.get(char, 0)) >> 20
@@ -619,12 +619,11 @@
widths, heights, depths = \
[ struct.unpack('!%dI' % (len(x)/4), x)
for x in (widths, heights, depths) ]
- for i in range(ec-bc):
- self.width[bc+i] = _fix2comp(widths[ord(char_info[4*i])])
- self.height[bc+i] = _fix2comp(heights[ord(char_info[4*i+1]) >> 4])
- self.depth[bc+i] = _fix2comp(depths[ord(char_info[4*i+1]) & 0xf])
+ for idx, char in enumerate(range(bc, ec+1)):
+ self.width[char] = _fix2comp(widths[ord(char_info[4*idx])])
+ self.height[char] = _fix2comp(heights[ord(char_info[4*idx+1]) >> 4])
+ self.depth[char] = _fix2comp(depths[ord(char_info[4*idx+1]) & 0xf])
-
class PsfontsMap(object):
"""
A psfonts.map formatted file, mapping TeX fonts to PS fonts.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jo...@us...> - 2009-09-20 19:47:54
|
Revision: 7800
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7800&view=rev
Author: jouni
Date: 2009-09-20 19:47:46 +0000 (Sun, 20 Sep 2009)
Log Message:
-----------
Fix usetex spacing errors in pdf backend.
Modified Paths:
--------------
branches/v0_99_maint/CHANGELOG
branches/v0_99_maint/lib/matplotlib/backends/backend_pdf.py
Modified: branches/v0_99_maint/CHANGELOG
===================================================================
--- branches/v0_99_maint/CHANGELOG 2009-09-20 17:05:15 UTC (rev 7799)
+++ branches/v0_99_maint/CHANGELOG 2009-09-20 19:47:46 UTC (rev 7800)
@@ -1,5 +1,7 @@
+2009-09-20 Fix usetex spacing errors in pdf backend. - JKS
+
2009-09-20 Fix off-by-one error in dviread.Tfm, and additionally protect
- against exceptions in case a dvi font is missing some metrics - JKS
+ against exceptions in case a dvi font is missing some metrics. - JKS
2009-09-15 Don't fail on AFM files containing floating-point bounding boxes - JKS
Modified: branches/v0_99_maint/lib/matplotlib/backends/backend_pdf.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/backends/backend_pdf.py 2009-09-20 17:05:15 UTC (rev 7799)
+++ branches/v0_99_maint/lib/matplotlib/backends/backend_pdf.py 2009-09-20 19:47:46 UTC (rev 7800)
@@ -1416,7 +1416,14 @@
dvi.close()
# Gather font information and do some setup for combining
- # characters into strings.
+ # characters into strings. The variable seq will contain a
+ # sequence of font and text entries. A font entry is a list
+ # ['font', name, size] where name is a Name object for the
+ # font. A text entry is ['text', x, y, glyphs, x+w] where x
+ # and y are the starting coordinates, w is the width, and
+ # glyphs is a list; in this phase it will always contain just
+ # one one-character string, but later it may have longer
+ # strings interspersed with kern amounts.
oldfont, seq = None, []
for x1, y1, dvifont, glyph, width in page.text:
if dvifont != oldfont:
@@ -1436,16 +1443,18 @@
# Find consecutive text strings with constant y coordinate and
# combine into a sequence of strings and kerns, or just one
# string (if any kerns would be less than 0.1 points).
- i, curx = 0, 0
+ i, curx, fontsize = 0, 0, None
while i < len(seq)-1:
elt, next = seq[i:i+2]
- if elt[0] == next[0] == 'text' and elt[2] == next[2]:
+ if elt[0] == 'font':
+ fontsize = elt[2]
+ elif elt[0] == next[0] == 'text' and elt[2] == next[2]:
offset = elt[4] - next[1]
if abs(offset) < 0.1:
elt[3][-1] += next[3][0]
elt[4] += next[4]-next[1]
else:
- elt[3] += [offset*1000.0/dvifont.size, next[3][0]]
+ elt[3] += [offset*1000.0/fontsize, next[3][0]]
elt[4] = next[4]
del seq[i+1]
continue
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ry...@us...> - 2009-09-21 16:30:19
|
Revision: 7808
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7808&view=rev
Author: ryanmay
Date: 2009-09-21 16:30:11 +0000 (Mon, 21 Sep 2009)
Log Message:
-----------
Correct typo of subtitle() -> suptitle().
Modified Paths:
--------------
branches/v0_99_maint/CHANGELOG
branches/v0_99_maint/lib/matplotlib/figure.py
Modified: branches/v0_99_maint/CHANGELOG
===================================================================
--- branches/v0_99_maint/CHANGELOG 2009-09-21 12:11:21 UTC (rev 7807)
+++ branches/v0_99_maint/CHANGELOG 2009-09-21 16:30:11 UTC (rev 7808)
@@ -890,7 +890,7 @@
2008-06-05 Fix image drawing so there is no extra space to the right
or bottom - MGD
-2006-06-04 Added a figure title command subtitle as a Figure method
+2006-06-04 Added a figure title command suptitle as a Figure method
and pyplot command -- see examples/figure_title.py - JDH
2008-06-02 Added support for log to hist with histtype='step' and fixed
Modified: branches/v0_99_maint/lib/matplotlib/figure.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/figure.py 2009-09-21 12:11:21 UTC (rev 7807)
+++ branches/v0_99_maint/lib/matplotlib/figure.py 2009-09-21 16:30:11 UTC (rev 7808)
@@ -298,7 +298,7 @@
Example::
- fig.subtitle('this is the figure title', fontsize=12)
+ fig.suptitle('this is the figure title', fontsize=12)
"""
x = kwargs.pop('x', 0.5)
y = kwargs.pop('y', 0.98)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-09-21 17:12:54
|
Revision: 7813
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7813&view=rev
Author: jdh2358
Date: 2009-09-21 17:12:47 +0000 (Mon, 21 Sep 2009)
Log Message:
-----------
tag for 0.99.1 release
Modified Paths:
--------------
branches/v0_99_maint/CHANGELOG
branches/v0_99_maint/doc/_templates/indexsidebar.html
branches/v0_99_maint/lib/matplotlib/__init__.py
Modified: branches/v0_99_maint/CHANGELOG
===================================================================
--- branches/v0_99_maint/CHANGELOG 2009-09-21 17:09:55 UTC (rev 7812)
+++ branches/v0_99_maint/CHANGELOG 2009-09-21 17:12:47 UTC (rev 7813)
@@ -1,3 +1,6 @@
+===============================================
+2009-09-21 Tagged for release 0.99.1
+
2009-09-20 Fix usetex spacing errors in pdf backend. - JKS
2009-09-20 Fix off-by-one error in dviread.Tfm, and additionally protect
Modified: branches/v0_99_maint/doc/_templates/indexsidebar.html
===================================================================
--- branches/v0_99_maint/doc/_templates/indexsidebar.html 2009-09-21 17:09:55 UTC (rev 7812)
+++ branches/v0_99_maint/doc/_templates/indexsidebar.html 2009-09-21 17:12:47 UTC (rev 7813)
@@ -2,8 +2,11 @@
<p>Please <a href="http://sourceforge.net/project/project_donations.php?group_id=80706">donate</a>
to support matplotlib development.</p>
-
-<p>matplotlib 0.99 is available for <a href="http://sourceforge.net/projects/matplotlib">download</a>. See <a href="{{ pathto('users/whats_new') }}">what's new</a> and tips on <a href="{{
+
+<p>We have a release candidate of matplotlib 0.99.1 <a href="http://drop.io/xortel1">available</a> for testing. Please report any problems on the <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</a> and <a href="http://sourceforge.net/mail/?group_id=80706">mailing list</a>.
+</p>
+
+<p>matplotlib 0.99.0 is available for <a href="http://sourceforge.net/projects/matplotlib">download</a>. See <a href="{{ pathto('users/whats_new') }}">what's new</a> and tips on <a href="{{
pathto('users/installing') }}">installing</a>
</p>
Modified: branches/v0_99_maint/lib/matplotlib/__init__.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/__init__.py 2009-09-21 17:09:55 UTC (rev 7812)
+++ branches/v0_99_maint/lib/matplotlib/__init__.py 2009-09-21 17:12:47 UTC (rev 7813)
@@ -89,7 +89,7 @@
"""
from __future__ import generators
-__version__ = '0.99.1rc1'
+__version__ = '0.99.1'
__revision__ = '$Revision$'
__date__ = '$Date$'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-09-24 03:00:35
|
Revision: 7818
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7818&view=rev
Author: jdh2358
Date: 2009-09-24 03:00:28 +0000 (Thu, 24 Sep 2009)
Log Message:
-----------
try statically linking in the deps for OSX
Modified Paths:
--------------
branches/v0_99_maint/lib/matplotlib/__init__.py
branches/v0_99_maint/make.osx
Modified: branches/v0_99_maint/lib/matplotlib/__init__.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/__init__.py 2009-09-23 17:21:25 UTC (rev 7817)
+++ branches/v0_99_maint/lib/matplotlib/__init__.py 2009-09-24 03:00:28 UTC (rev 7818)
@@ -89,7 +89,7 @@
"""
from __future__ import generators
-__version__ = '0.99.1'
+__version__ = '0.99.1.1'
__revision__ = '$Revision$'
__date__ = '$Date$'
Modified: branches/v0_99_maint/make.osx
===================================================================
--- branches/v0_99_maint/make.osx 2009-09-23 17:21:25 UTC (rev 7817)
+++ branches/v0_99_maint/make.osx 2009-09-24 03:00:28 UTC (rev 7818)
@@ -1,8 +1,8 @@
# build mpl into a local install dir with
# PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install
-MPLVERSION=0.99.1rc1
-PYVERSION=2.6
+MPLVERSION=0.99.1.1
+PYVERSION=2.5
PYTHON=python${PYVERSION}
ZLIBVERSION=1.2.3
PNGVERSION=1.2.33
@@ -90,6 +90,7 @@
cp release/osx/data/setup.cfg release/osx/data/ReadMe.txt . &&\
export CFLAGS=${CFLAGS} &&\
export LDFLAGS=${LDFLAGS} &&\
+ rm -f ${PREFIX}/lib/*.dylib &&\
/Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/bdist_mpkg --readme=ReadMe.txt &&\
hdiutil create -srcdir dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.dmg &&\
${PYTHON} setupegg.py bdist_egg
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-09-24 03:57:38
|
Revision: 7819
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7819&view=rev
Author: jdh2358
Date: 2009-09-24 03:57:31 +0000 (Thu, 24 Sep 2009)
Log Message:
-----------
applied a fix for sf bug 2865490; is there something more elegant?
Modified Paths:
--------------
branches/v0_99_maint/make.osx
branches/v0_99_maint/src/_backend_agg.cpp
Modified: branches/v0_99_maint/make.osx
===================================================================
--- branches/v0_99_maint/make.osx 2009-09-24 03:00:28 UTC (rev 7818)
+++ branches/v0_99_maint/make.osx 2009-09-24 03:57:31 UTC (rev 7819)
@@ -2,7 +2,7 @@
# PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install
MPLVERSION=0.99.1.1
-PYVERSION=2.5
+PYVERSION=2.6
PYTHON=python${PYVERSION}
ZLIBVERSION=1.2.3
PNGVERSION=1.2.33
Modified: branches/v0_99_maint/src/_backend_agg.cpp
===================================================================
--- branches/v0_99_maint/src/_backend_agg.cpp 2009-09-24 03:00:28 UTC (rev 7818)
+++ branches/v0_99_maint/src/_backend_agg.cpp 2009-09-24 03:57:31 UTC (rev 7819)
@@ -607,6 +607,14 @@
x = (double)(int)x; y = (double)(int)y;
+ // if x or y is close to the width or height, the filled
+ // region could be inside the boundary even if the center is
+ // out. But at some point we need to cull these points
+ // because they can create segfaults of they overflow; eg
+ // https://sourceforge.net/tracker/?func=detail&aid=2865490&group_id=80706&atid=560720
+ if (fabs(x)>(2*width)) continue;
+ if (fabs(y)>(2*height)) continue;
+
pixfmt_amask_type pfa(pixFmt, alphaMask);
amask_ren_type r(pfa);
amask_aa_renderer_type ren(r);
@@ -628,6 +636,14 @@
x = (double)(int)x; y = (double)(int)y;
+ // if x or y is close to the width or height, the filled
+ // region could be inside the boundary even if the center is
+ // out. But at some point we need to cull these points
+ // because they can create segfaults of they overflow; eg
+ // https://sourceforge.net/tracker/?func=detail&aid=2865490&group_id=80706&atid=560720
+ if (fabs(x)>(2*width)) continue;
+ if (fabs(y)>(2*height)) continue;
+
if (face.first) {
rendererAA.color(face.second);
sa.init(fillCache, fillSize, x, y);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2009-11-03 15:46:26
|
Revision: 7919
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7919&view=rev
Author: mdboom
Date: 2009-11-03 15:46:14 +0000 (Tue, 03 Nov 2009)
Log Message:
-----------
[2890979] Close paths correctly in PolyCollection
Modified Paths:
--------------
branches/v0_99_maint/lib/matplotlib/collections.py
branches/v0_99_maint/src/_backend_agg.cpp
Modified: branches/v0_99_maint/lib/matplotlib/collections.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/collections.py 2009-11-03 13:53:57 UTC (rev 7918)
+++ branches/v0_99_maint/lib/matplotlib/collections.py 2009-11-03 15:46:14 UTC (rev 7919)
@@ -676,14 +676,19 @@
if closed:
self._paths = []
for xy in verts:
- if np.ma.isMaskedArray(xy):
- if len(xy) and (xy[0] != xy[-1]).any():
- xy = np.ma.concatenate([xy, [xy[0]]])
+ if len(xy):
+ if np.ma.isMaskedArray(xy):
+ xy = np.ma.concatenate([xy, np.zeros((1,2))])
+ else:
+ xy = np.asarray(xy)
+ xy = np.concatenate([xy, np.zeros((1,2))])
+ codes = np.empty(xy.shape[0], dtype='uint8')
+ codes[:] = mpath.Path.LINETO
+ codes[0] = mpath.Path.MOVETO
+ codes[-1] = mpath.Path.CLOSEPOLY
+ self._paths.append(mpath.Path(xy, codes))
else:
- xy = np.asarray(xy)
- if len(xy) and (xy[0] != xy[-1]).any():
- xy = np.concatenate([xy, [xy[0]]])
- self._paths.append(mpath.Path(xy))
+ self._paths.append(mpath.Path(xy))
else:
self._paths = [mpath.Path(xy) for xy in verts]
Modified: branches/v0_99_maint/src/_backend_agg.cpp
===================================================================
--- branches/v0_99_maint/src/_backend_agg.cpp 2009-11-03 13:53:57 UTC (rev 7918)
+++ branches/v0_99_maint/src/_backend_agg.cpp 2009-11-03 15:46:14 UTC (rev 7919)
@@ -164,7 +164,8 @@
}
GCAgg::GCAgg(double dpi) :
- dpi(dpi), isaa(true), linewidth(1.0), alpha(1.0),
+ dpi(dpi), isaa(true),
+ cap(agg::butt_cap), join(agg::round_join), linewidth(1.0), alpha(1.0),
dashOffset(0.0)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2009-11-23 21:16:25
|
Revision: 7981
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7981&view=rev
Author: jdh2358
Date: 2009-11-23 21:16:15 +0000 (Mon, 23 Nov 2009)
Log Message:
-----------
make IndexFormatter derive from Formatter
Modified Paths:
--------------
branches/v0_99_maint/doc/_templates/indexsidebar.html
branches/v0_99_maint/doc/users/image_tutorial.rst
branches/v0_99_maint/lib/matplotlib/ticker.py
Modified: branches/v0_99_maint/doc/_templates/indexsidebar.html
===================================================================
--- branches/v0_99_maint/doc/_templates/indexsidebar.html 2009-11-23 20:26:44 UTC (rev 7980)
+++ branches/v0_99_maint/doc/_templates/indexsidebar.html 2009-11-23 21:16:15 UTC (rev 7981)
@@ -3,10 +3,8 @@
<p>Please <a href="http://sourceforge.net/project/project_donations.php?group_id=80706">donate</a>
to support matplotlib development.</p>
-<p>We have a release candidate of matplotlib 0.99.1 <a href="http://drop.io/xortel1">available</a> for testing. Please report any problems on the <a href="http://sourceforge.net/tracker2/?group_id=80706">tracker</a> and <a href="http://sourceforge.net/mail/?group_id=80706">mailing list</a>.
-</p>
-<p>matplotlib 0.99.0 is available for <a href="http://sourceforge.net/projects/matplotlib">download</a>. See <a href="{{ pathto('users/whats_new') }}">what's new</a> and tips on <a href="{{
+<p>matplotlib 0.99.1 is available for <a href="https://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-0.99.1/">download</a>. See <a href="{{ pathto('users/whats_new') }}">what's new</a> and tips on <a href="{{
pathto('users/installing') }}">installing</a>
</p>
Modified: branches/v0_99_maint/doc/users/image_tutorial.rst
===================================================================
--- branches/v0_99_maint/doc/users/image_tutorial.rst 2009-11-23 20:26:44 UTC (rev 7980)
+++ branches/v0_99_maint/doc/users/image_tutorial.rst 2009-11-23 21:16:15 UTC (rev 7981)
@@ -274,7 +274,7 @@
.. sourcecode:: ipython
- In[10]: plt.hist(lum_img)
+ In[10]: plt.hist(lum_img.flatten(), 256, range=(0.0,1.0), fc='k', ec='k')
.. plot::
@@ -283,7 +283,7 @@
import numpy as np
img = mpimg.imread('_static/stinkbug.png')
lum_img = img[:,:,0]
- plt.hist(lum_img, range=(0.0,1.0))
+ plt.hist(lum_img.flatten(), 256, range=(0.0,1.0), fc='black', ec='black')
Most often, the "interesting" part of the image is around the peak,
and you can get extra contrast by clipping the regions above and/or
Modified: branches/v0_99_maint/lib/matplotlib/ticker.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/ticker.py 2009-11-23 20:26:44 UTC (rev 7980)
+++ branches/v0_99_maint/lib/matplotlib/ticker.py 2009-11-23 21:16:15 UTC (rev 7981)
@@ -206,7 +206,7 @@
"""
return s
-class IndexFormatter:
+class IndexFormatter(Formatter):
"""
format the position x to the nearest i-th label where i=int(x+0.5)
"""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2010-01-04 14:14:54
|
Revision: 8068
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8068&view=rev
Author: mdboom
Date: 2010-01-04 14:14:38 +0000 (Mon, 04 Jan 2010)
Log Message:
-----------
Fix bug in PDF, PS, SVG and OS-X backends: do not simplify filled paths.
Modified Paths:
--------------
branches/v0_99_maint/lib/matplotlib/backends/backend_pdf.py
branches/v0_99_maint/lib/matplotlib/backends/backend_ps.py
branches/v0_99_maint/lib/matplotlib/backends/backend_svg.py
branches/v0_99_maint/src/_macosx.m
Modified: branches/v0_99_maint/lib/matplotlib/backends/backend_pdf.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/backends/backend_pdf.py 2010-01-04 04:30:24 UTC (rev 8067)
+++ branches/v0_99_maint/lib/matplotlib/backends/backend_pdf.py 2010-01-04 14:14:38 UTC (rev 8068)
@@ -1043,7 +1043,8 @@
# an API change
self.output(*self.pathOperations(
Path.hatch(hatch_style[2]),
- Affine2D().scale(sidelen)))
+ Affine2D().scale(sidelen),
+ simplify=False))
self.output(Op.stroke)
self.endStream()
@@ -1124,7 +1125,7 @@
def markerObject(self, path, trans, fillp, lw):
"""Return name of a marker XObject representing the given path."""
- pathops = self.pathOperations(path, trans)
+ pathops = self.pathOperations(path, trans, simplify=False)
key = (tuple(pathops), bool(fillp))
result = self.markers.get(key)
if result is None:
@@ -1153,10 +1154,11 @@
self.endStream()
@staticmethod
- def pathOperations(path, transform, clip=None):
+ def pathOperations(path, transform, clip=None, simplify=None):
cmds = []
last_points = None
- for points, code in path.iter_segments(transform, clip=clip):
+ for points, code in path.iter_segments(transform, clip=clip,
+ simplify=simplify):
if code == Path.MOVETO:
cmds.extend(points)
cmds.append(Op.moveto)
@@ -1178,9 +1180,11 @@
def writePath(self, path, transform, clip=False):
if clip:
clip = (0.0, 0.0, self.width * 72, self.height * 72)
+ simplify = path.should_simplify
else:
clip = None
- cmds = self.pathOperations(path, transform, clip)
+ simplify = False
+ cmds = self.pathOperations(path, transform, clip, simplify=simplify)
self.output(*cmds)
def reserveObject(self, name=''):
@@ -1852,7 +1856,7 @@
if self._clippath != clippath:
path, affine = clippath.get_transformed_path_and_affine()
cmds.extend(
- PdfFile.pathOperations(path, affine) +
+ PdfFile.pathOperations(path, affine, simplify=False) +
[Op.clip, Op.endpath])
return cmds
Modified: branches/v0_99_maint/lib/matplotlib/backends/backend_ps.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/backends/backend_ps.py 2010-01-04 04:30:24 UTC (rev 8067)
+++ branches/v0_99_maint/lib/matplotlib/backends/backend_ps.py 2010-01-04 14:14:38 UTC (rev 8068)
@@ -248,7 +248,8 @@
0 setlinewidth
""" % locals())
self._pswriter.write(
- self._convert_path(Path.hatch(hatch), Affine2D().scale(72.0)))
+ self._convert_path(Path.hatch(hatch), Affine2D().scale(72.0),
+ simplify=False))
self._pswriter.write("""\
stroke
} bind
@@ -427,7 +428,7 @@
# unflip
im.flipud_out()
- def _convert_path(self, path, transform, clip=False):
+ def _convert_path(self, path, transform, clip=False, simplify=None):
ps = []
last_points = None
if clip:
@@ -435,7 +436,8 @@
self.height * 72.0)
else:
clip = None
- for points, code in path.iter_segments(transform, clip=clip):
+ for points, code in path.iter_segments(transform, clip=clip,
+ simplify=simplify):
if code == Path.MOVETO:
ps.append("%g %g m" % tuple(points))
elif code == Path.LINETO:
@@ -458,7 +460,8 @@
if id is None:
id = 'c%x' % len(self._clip_paths)
ps_cmd = ['/%s {' % id]
- ps_cmd.append(self._convert_path(clippath, clippath_transform))
+ ps_cmd.append(self._convert_path(clippath, clippath_transform,
+ simplify=False))
ps_cmd.extend(['clip', 'newpath', '} bind def\n'])
self._pswriter.write('\n'.join(ps_cmd))
self._clip_paths[(clippath, clippath_transform)] = id
@@ -468,9 +471,10 @@
"""
Draws a Path instance using the given affine transform.
"""
+ clip = (rgbFace is None and gc.get_hatch_path() is None)
+ simplify = path.should_simplify and clip
ps = self._convert_path(
- path, transform,
- clip=(rgbFace is None and gc.get_hatch_path() is None))
+ path, transform, clip=clip, simplify=simplify)
self._draw_ps(ps, gc, rgbFace)
def draw_markers(self, gc, marker_path, marker_trans, path, trans, rgbFace=None):
@@ -491,7 +495,8 @@
# construct the generic marker command:
ps_cmd = ['/o {', 'gsave', 'newpath', 'translate'] # dont want the translate to be global
- ps_cmd.append(self._convert_path(marker_path, marker_trans))
+ ps_cmd.append(self._convert_path(marker_path, marker_trans,
+ simplify=False))
if rgbFace:
ps_cmd.extend(['gsave', ps_color, 'fill', 'grestore'])
@@ -518,7 +523,7 @@
name = 'p%x_%x' % (self._path_collection_id, i)
ps_cmd = ['/%s {' % name,
'newpath', 'translate']
- ps_cmd.append(self._convert_path(path, transform))
+ ps_cmd.append(self._convert_path(path, transform, simplify=False))
ps_cmd.extend(['} bind def\n'])
write('\n'.join(ps_cmd))
path_codes.append(name)
Modified: branches/v0_99_maint/lib/matplotlib/backends/backend_svg.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/backends/backend_svg.py 2010-01-04 04:30:24 UTC (rev 8067)
+++ branches/v0_99_maint/lib/matplotlib/backends/backend_svg.py 2010-01-04 14:14:38 UTC (rev 8068)
@@ -101,7 +101,8 @@
self._svgwriter.write(' width="%d" height="%d" >\n' % (HATCH_SIZE, HATCH_SIZE))
path_data = self._convert_path(
gc.get_hatch_path(),
- Affine2D().scale(HATCH_SIZE).scale(1.0, -1.0).translate(0, HATCH_SIZE))
+ Affine2D().scale(HATCH_SIZE).scale(1.0, -1.0).translate(0, HATCH_SIZE),
+ simplify=False)
if rgbFace is None:
fill = 'none'
else:
@@ -159,7 +160,7 @@
clippath, clippath_trans = gc.get_clip_path()
if clippath is not None:
clippath_trans = self._make_flip_transform(clippath_trans)
- path_data = self._convert_path(clippath, clippath_trans)
+ path_data = self._convert_path(clippath, clippath_trans, simplify=False)
path = '<path d="%s"/>' % path_data
elif cliprect is not None:
x, y, w, h = cliprect.bounds
@@ -210,7 +211,7 @@
.scale(1.0, -1.0)
.translate(0.0, self.height))
- def _convert_path(self, path, transform, clip=False):
+ def _convert_path(self, path, transform, clip=False, simplify=None):
path_data = []
appender = path_data.append
path_commands = self._path_commands
@@ -219,7 +220,8 @@
clip = (0.0, 0.0, self.width, self.height)
else:
clip = None
- for points, code in path.iter_segments(transform, clip=clip):
+ for points, code in path.iter_segments(transform, clip=clip,
+ simplify=simplify):
if code == Path.CLOSEPOLY:
segment = 'z'
else:
@@ -234,15 +236,18 @@
def draw_path(self, gc, path, transform, rgbFace=None):
trans_and_flip = self._make_flip_transform(transform)
+ clip = (rgbFace is None and gc.get_hatch_path() is None)
+ simplify = path.should_simplify and clip
path_data = self._convert_path(
- path, trans_and_flip,
- clip=(rgbFace is None and gc.get_hatch_path() is None))
+ path, trans_and_flip, clip=clip, simplify=simplify)
self._draw_svg_element('path', 'd="%s"' % path_data, gc, rgbFace)
def draw_markers(self, gc, marker_path, marker_trans, path, trans, rgbFace=None):
write = self._svgwriter.write
- key = self._convert_path(marker_path, marker_trans + Affine2D().scale(1.0, -1.0))
+ key = self._convert_path(marker_path,
+ marker_trans + Affine2D().scale(1.0, -1.0),
+ simplify=False)
name = self._markers.get(key)
if name is None:
name = 'm%s' % md5(key).hexdigest()
@@ -276,7 +281,7 @@
for i, (path, transform) in enumerate(self._iter_collection_raw_paths(
master_transform, paths, all_transforms)):
transform = Affine2D(transform.get_matrix()).scale(1.0, -1.0)
- d = self._convert_path(path, transform)
+ d = self._convert_path(path, transform, simplify=False)
name = 'coll%x_%x_%s' % (self._path_collection_id, i,
md5(d).hexdigest())
write('<path id="%s" d="%s"/>\n' % (name, d))
Modified: branches/v0_99_maint/src/_macosx.m
===================================================================
--- branches/v0_99_maint/src/_macosx.m 2010-01-04 04:30:24 UTC (rev 8067)
+++ branches/v0_99_maint/src/_macosx.m 2010-01-04 14:14:38 UTC (rev 8068)
@@ -536,7 +536,7 @@
return NULL;
}
CGContextSetAlpha(cr, alpha);
-
+
self->color[3] = alpha;
Py_INCREF(Py_None);
@@ -881,7 +881,7 @@
0,
rect,
QUANTIZE_AUTO,
- 1);
+ rgbFace == NULL);
if (!iterator)
{
PyErr_SetString(PyExc_RuntimeError,
@@ -958,7 +958,7 @@
0,
rect,
QUANTIZE_AUTO,
- 1);
+ 0);
if (!iterator)
{
Py_DECREF(hatchpath);
@@ -1143,14 +1143,14 @@
Py_DECREF(translation);
PyErr_SetString(PyExc_ValueError,
"transform_point did not return a NumPy array");
- return false;
+ return false;
}
if (PyArray_NDIM(translation)!=1 || PyArray_DIM(translation, 0)!=2)
{
Py_DECREF(translation);
PyErr_SetString(PyExc_ValueError,
"transform_point did not return an approriate array");
- return false;
+ return false;
}
tx = (CGFloat)(*(double*)PyArray_GETPTR1(translation, 0));
ty = (CGFloat)(*(double*)PyArray_GETPTR1(translation, 1));
@@ -1261,7 +1261,7 @@
master.c = c;
master.d = d;
master.tx = tx;
- master.ty = ty;
+ master.ty = ty;
if (!ok) goto exit;
CGContextConcatCTM(cr, master);
}
@@ -1429,7 +1429,7 @@
Py_ssize_t Nlinestyles = PySequence_Size(linestyles);
Py_ssize_t Naa = PySequence_Size(antialiaseds);
if (N < Nlinestyles) Nlinestyles = N;
- if ((Nfacecolors == 0 && Nedgecolors == 0) || Np == 0) goto exit;
+ if ((Nfacecolors == 0 && Nedgecolors == 0) || Np == 0) goto exit;
/* Preset graphics context properties if possible */
if (Naa==1)
@@ -1674,7 +1674,7 @@
master.c = c;
master.d = d;
master.tx = tx;
- master.ty = ty;
+ master.ty = ty;
}
else
{
@@ -2288,7 +2288,7 @@
width = CTLineGetTypographicBounds(line, &ascent, &descent, NULL);
rect = CTLineGetImageBounds(line, cr);
-
+
CFRelease(line);
return Py_BuildValue("fff", width, rect.size.height, descent);
@@ -3044,7 +3044,7 @@
}
/* NSSize contains CGFloat; cannot use size directly */
if(!PyArg_ParseTuple(args, "u#dd",
- &characters, &n, &width, &height)) return NULL;
+ &characters, &n, &width, &height)) return NULL;
size.width = width;
size.height = height;
@@ -3058,7 +3058,7 @@
NSRect rect = [view bounds];
NSString* filename = [NSString stringWithCharacters: characters
- length: (unsigned)n];
+ length: (unsigned)n];
NSString* extension = [filename pathExtension];
/* Calling dataWithPDFInsideRect on the view causes its update status
@@ -3077,23 +3077,23 @@
if (! [extension isEqualToString: @"tiff"] &&
! [extension isEqualToString: @"tif"])
{
- NSBitmapImageFileType filetype;
- NSBitmapImageRep* bitmapRep = [NSBitmapImageRep imageRepWithData: data];
- if ([extension isEqualToString: @"bmp"])
- filetype = NSBMPFileType;
- else if ([extension isEqualToString: @"gif"])
- filetype = NSGIFFileType;
- else if ([extension isEqualToString: @"jpg"] ||
- [extension isEqualToString: @"jpeg"])
- filetype = NSJPEGFileType;
- else if ([extension isEqualToString: @"png"])
- filetype = NSPNGFileType;
- else
- { PyErr_SetString(PyExc_ValueError, "Unknown file type");
- return NULL;
- }
+ NSBitmapImageFileType filetype;
+ NSBitmapImageRep* bitmapRep = [NSBitmapImageRep imageRepWithData: data];
+ if ([extension isEqualToString: @"bmp"])
+ filetype = NSBMPFileType;
+ else if ([extension isEqualToString: @"gif"])
+ filetype = NSGIFFileType;
+ else if ([extension isEqualToString: @"jpg"] ||
+ [extension isEqualToString: @"jpeg"])
+ filetype = NSJPEGFileType;
+ else if ([extension isEqualToString: @"png"])
+ filetype = NSPNGFileType;
+ else
+ { PyErr_SetString(PyExc_ValueError, "Unknown file type");
+ return NULL;
+ }
- data = [bitmapRep representationUsingType:filetype properties:nil];
+ data = [bitmapRep representationUsingType:filetype properties:nil];
}
[data writeToFile: filename atomically: YES];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2010-02-08 17:51:02
|
Revision: 8121
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8121&view=rev
Author: jdh2358
Date: 2010-02-08 17:50:27 +0000 (Mon, 08 Feb 2010)
Log Message:
-----------
added Ariels csd patch for proper scaling at the dc component
Modified Paths:
--------------
branches/v0_99_maint/doc/faq/installing_faq.rst
branches/v0_99_maint/doc/glossary/index.rst
branches/v0_99_maint/doc/users/installing.rst
branches/v0_99_maint/lib/matplotlib/mlab.py
Modified: branches/v0_99_maint/doc/faq/installing_faq.rst
===================================================================
--- branches/v0_99_maint/doc/faq/installing_faq.rst 2010-02-08 17:11:38 UTC (rev 8120)
+++ branches/v0_99_maint/doc/faq/installing_faq.rst 2010-02-08 17:50:27 UTC (rev 8121)
@@ -146,11 +146,11 @@
others in web application servers to dynamically serve up graphs.
To support all of these use cases, matplotlib can target different
-outputs, and each of these capabililities is called a backend (the
+outputs, and each of these capabililities is called a backend; the
"frontend" is the user facing code, ie the plotting code, whereas the
"backend" does all the dirty work behind the scenes to make the
figure. There are two types of backends: user interface backends (for
-use in pygtk, wxpython, tkinter, qt or fltk) and hardcopy backends to
+use in pygtk, wxpython, tkinter, qt, macosx, or fltk) and hardcopy backends to
make image files (PNG, SVG, PDF, PS).
There are a two primary ways to configure your backend. One is to set
@@ -183,10 +183,10 @@
renderer for user interfaces is ``Agg`` which uses the `antigrain
<http://antigrain.html>`_ C++ library to make a raster (pixel) image
of the figure. All of the user interfaces can be used with agg
-rendering, eg ``WXAgg``, ``GTKAgg``, ``QTAgg``, ``TkAgg``. In
-addition, some of the user interfaces support other rendering engines.
-For example, with GTK, you can also select GDK rendering (backend
-``GTK``) or Cairo rendering (backend ``GTKCairo``).
+rendering, eg ``WXAgg``, ``GTKAgg``, ``QTAgg``, ``TkAgg``,
+``CocoaAgg``. In addition, some of the user interfaces support other
+rendering engines. For example, with GTK, you can also select GDK
+rendering (backend ``GTK``) or Cairo rendering (backend ``GTKCairo``).
For the rendering engines, one can also distinguish between `vector
<http://en.wikipedia.org/wiki/Vector_graphics>`_ or `raster
@@ -238,6 +238,7 @@
QtAgg Agg rendering to a :term:`Qt` canvas (requires PyQt_)
Qt4Agg Agg rendering to a :term:`Qt4` canvas (requires PyQt4_)
FLTKAgg Agg rendering to a :term:`FLTK` canvas (requires pyFLTK_)
+macosx Cocoa rendering in OSX windows
============ ================================================================
.. _`Anti-Grain Geometry`: http://www.antigrain.com/
Modified: branches/v0_99_maint/doc/glossary/index.rst
===================================================================
--- branches/v0_99_maint/doc/glossary/index.rst 2010-02-08 17:11:38 UTC (rev 8120)
+++ branches/v0_99_maint/doc/glossary/index.rst 2010-02-08 17:50:27 UTC (rev 8121)
@@ -14,6 +14,11 @@
Cairo
The `Cairo graphics <http://cairographics.org>`_ engine
+
+ dateutil
+ The `dateutil <http://labix.org/python-dateutil>`_ library
+ provides extensions to the standard datetime module
+
EPS
Encapsulated Postscript (`EPS <http://en.wikipedia.org/wiki/Encapsulated_PostScript>`_)
@@ -86,6 +91,14 @@
language widely used for scripting, application development, web
application servers, scientific computing and more.
+
+ pytz
+ `pytz <http://pytz.sourceforge.net/>`_ provides the Olson tz
+ database in Python. it allows accurate and cross platform
+ timezone calculations and solves the issue of ambiguous times at
+ the end of daylight savings
+
+
Qt
`Qt <http://trolltech.com/products/qt/>`__ is a cross-platform
application framework for desktop and embedded development.
Modified: branches/v0_99_maint/doc/users/installing.rst
===================================================================
--- branches/v0_99_maint/doc/users/installing.rst 2010-02-08 17:11:38 UTC (rev 8120)
+++ branches/v0_99_maint/doc/users/installing.rst 2010-02-08 17:50:27 UTC (rev 8121)
@@ -44,11 +44,30 @@
matplotlib requires numpy version 1.1 or later. Although it is not a
requirement to use matplotlib, we strongly encourage you to install
`ipython <http://ipython.scipy.org/dist>`_, which is an interactive
-shell for python that is matplotlib aware. Once you have ipython,
-numpy and matplotlib installed, in ipython's "pylab" mode you have a
-matlab-like environment that automatically handles most of the
-configuration details for you, so you can get up and running quickly::
+shell for python that is matplotlib aware.
+Next we need to get matplotlib installed. We provide prebuilt
+binaries for OS X and Windows on the matplotlib `download
+<http://sourceforge.net/projects/matplotlib/files/>`_ page. Click on
+the latest release of the "matplotlib" package, choose your python
+version (2.5 or 2.6) and your platform (macosx or win32) and you
+should be good to go. If you have any problems, please check the
+:ref:`installing-faq`, google around a little bit, and post a question
+the `mailing list
+<http://sourceforge.net/project/showfiles.php?group_id=80706>`_. If
+you are on debian/unbuntu linux, it suffices to do::
+
+ > sudo apt-get install python-matplotlib
+
+Instructions for installing our OSX binaries are found in the FAQ
+:ref:`install_osx_binaries`.
+
+
+Once you have ipython, numpy and matplotlib installed, in ipython's
+"pylab" mode you have a matlab-like environment that automatically
+handles most of the configuration details for you, so you can get up
+and running quickly::
+
johnh@flag:~> ipython -pylab
Python 2.4.5 (#4, Apr 12 2008, 09:09:16)
IPython 0.9.0 -- An enhanced Interactive Python.
@@ -60,20 +79,6 @@
In [2]: hist(x, 100)
-And a *voila*, a figure pops up. But we are putting the cart ahead of
-the horse -- first we need to get matplotlib installed. We provide
-prebuilt binaries for OS X and Windows on the matplotlib `download
-<http://sourceforge.net/projects/matplotlib/files/>`_ page. Click on
-the latest release of the "matplotlib" package, choose your python
-version (2.4 or 2.5) and your platform (macosx or win32) and you
-should be good to go. If you have any problems, please check the
-:ref:`installing-faq`, google around a little bit, and post a question
-the `mailing list
-<http://sourceforge.net/project/showfiles.php?group_id=80706>`_.
-
-Instructions for installing our OSX binaries are found in the FAQ
-ref:`install_osx_binaries`.
-
Note that when testing matplotlib installations from the interactive
python console, there are some issues relating to user interface
toolkits and interactive settings that are discussed in
@@ -85,9 +90,9 @@
======================
If you are interested perhaps in contributing to matplotlib
-development, or just like to build everything yourself, it is not
-difficult to build matplotlib from source. Grab the latest *tar.gz*
-release file from `sourceforge
+development, running the latest greatest code, or just like to
+build everything yourself, it is not difficult to build matplotlib
+from source. Grab the latest *tar.gz* release file from `sourceforge
<http://sourceforge.net/project/showfiles.php?group_id=80706>`_, or if
you want to develop matplotlib or just need the latest bugfixed
version, grab the latest svn version :ref:`install-svn`.
@@ -173,17 +178,17 @@
agg template source statically, so it will not affect anything on
your system outside of matplotlib.
-pytz 2007g or later
+:term:`pytz` 2007g or later
timezone handling for python datetime objects. By default,
matplotlib will install pytz if it isn't already installed on your
- system. To override the default, use setup.cfg to force or
+ system. To override the default, use :file:`setup.cfg to force or
prevent installation of pytz.
-dateutil 1.1 or later
- extensions to python datetime handling. By
- default, matplotlib will install dateutil if it isn't already
- installed on your system. To override the default, use setup.cfg
- to force or prevent installation of dateutil.
+:term:`dateutil` 1.1 or later
+ provides extensions to python datetime handling. By default, matplotlib
+ will install dateutil if it isn't already installed on your
+ system. To override the default, use :file:`setup.cfg` to force
+ or prevent installation of dateutil.
Modified: branches/v0_99_maint/lib/matplotlib/mlab.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/mlab.py 2010-02-08 17:11:38 UTC (rev 8120)
+++ branches/v0_99_maint/lib/matplotlib/mlab.py 2010-02-08 17:50:27 UTC (rev 8121)
@@ -273,10 +273,18 @@
Pxy[:,i] = np.conjugate(fx[:numFreqs]) * fy[:numFreqs]
# Scale the spectrum by the norm of the window to compensate for
- # windowing loss; see Bendat & Piersol Sec 11.5.2. Also include
- # scaling factors for one-sided densities and dividing by the sampling
- # frequency, if desired.
- Pxy *= scaling_factor / (np.abs(windowVals)**2).sum()
+ # windowing loss; see Bendat & Piersol Sec 11.5.2.
+ Pxy *= 1 / (np.abs(windowVals)**2).sum()
+
+ # Also include scaling factors for one-sided densities and dividing by the
+ # sampling frequency, if desired. Scale everything, except the DC component
+ # and the NFFT/2 component:
+ Pxy[1:-1] *= scaling_factor
+
+ #But do scale those components by Fs, if required
+ if scale_by_freq:
+ Pxy[[0,-1]] /= Fs
+
t = 1./Fs * (ind + NFFT / 2.)
freqs = float(Fs) / pad_to * np.arange(numFreqs)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <md...@us...> - 2010-02-22 16:22:35
|
Revision: 8146
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8146&view=rev
Author: mdboom
Date: 2010-02-22 16:22:28 +0000 (Mon, 22 Feb 2010)
Log Message:
-----------
Backporting numpy version check fix to 0.99 branch
Modified Paths:
--------------
branches/v0_99_maint/doc/make.py
branches/v0_99_maint/setupext.py
Modified: branches/v0_99_maint/doc/make.py
===================================================================
--- branches/v0_99_maint/doc/make.py 2010-02-22 14:31:45 UTC (rev 8145)
+++ branches/v0_99_maint/doc/make.py 2010-02-22 16:22:28 UTC (rev 8146)
@@ -65,8 +65,9 @@
print 'latex build has not been tested on windows'
def clean():
- shutil.rmtree("build")
- shutil.rmtree("examples")
+ for dirpath in ['build', 'examples']:
+ if os.path.exists(dirpath):
+ shutil.rmtree(dirpath)
for pattern in ['mpl_examples/api/*.png',
'mpl_examples/pylab_examples/*.png',
'mpl_examples/pylab_examples/*.pdf',
Modified: branches/v0_99_maint/setupext.py
===================================================================
--- branches/v0_99_maint/setupext.py 2010-02-22 14:31:45 UTC (rev 8145)
+++ branches/v0_99_maint/setupext.py 2010-02-22 16:22:28 UTC (rev 8146)
@@ -499,9 +499,10 @@
return False
nn = numpy.__version__.split('.')
if not (int(nn[0]) >= 1 and int(nn[1]) >= 1):
- print_message(
- 'numpy 1.1 or later is required; you have %s' % numpy.__version__)
- return False
+ if not int(nn[0]) >= 1:
+ print_message(
+ 'numpy 1.1 or later is required; you have %s' % numpy.__version__)
+ return False
module = Extension('test', [])
add_numpy_flags(module)
add_base_flags(module)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2010-03-03 16:56:31
|
Revision: 8173
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8173&view=rev
Author: jdh2358
Date: 2010-03-03 16:56:16 +0000 (Wed, 03 Mar 2010)
Log Message:
-----------
applied Mattias get_bounds patch
Modified Paths:
--------------
branches/v0_99_maint/doc/users/artists.rst
branches/v0_99_maint/lib/matplotlib/backends/backend_wxagg.py
branches/v0_99_maint/lib/matplotlib/finance.py
branches/v0_99_maint/lib/matplotlib/patches.py
Modified: branches/v0_99_maint/doc/users/artists.rst
===================================================================
--- branches/v0_99_maint/doc/users/artists.rst 2010-03-03 16:31:42 UTC (rev 8172)
+++ branches/v0_99_maint/doc/users/artists.rst 2010-03-03 16:56:16 UTC (rev 8173)
@@ -419,7 +419,7 @@
# and notice that the ax.add_patch method has set the axes
# instance
In [267]: print rect.get_axes()
- Subplot(49,81.25)
+ Axes(0.125,0.1;0.775x0.8)
# and the transformation has been set too
In [268]: print rect.get_transform()
@@ -434,7 +434,7 @@
(0.0, 1.0)
# but the data limits have been updated to encompass the rectangle
- In [271]: print ax.dataLim.get_bounds()
+ In [271]: print ax.dataLim.bounds
(1.0, 1.0, 5.0, 12.0)
# we can manually invoke the auto-scaling machinery
Modified: branches/v0_99_maint/lib/matplotlib/backends/backend_wxagg.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/backends/backend_wxagg.py 2010-03-03 16:31:42 UTC (rev 8172)
+++ branches/v0_99_maint/lib/matplotlib/backends/backend_wxagg.py 2010-03-03 16:56:16 UTC (rev 8173)
@@ -171,7 +171,7 @@
"""
Convert the region of a wx.Image bounded by bbox to a wx.Bitmap.
"""
- l, b, width, height = bbox.get_bounds()
+ l, b, width, height = bbox.bounds
r = l + width
t = b + height
@@ -238,7 +238,7 @@
Note: agg must be a backend_agg.RendererAgg instance.
"""
- l, b, width, height = bbox.get_bounds()
+ l, b, width, height = bbox.bounds
r = l + width
t = b + height
Modified: branches/v0_99_maint/lib/matplotlib/finance.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/finance.py 2010-03-03 16:31:42 UTC (rev 8172)
+++ branches/v0_99_maint/lib/matplotlib/finance.py 2010-03-03 16:56:16 UTC (rev 8173)
@@ -597,8 +597,8 @@
maxy = max([volume for d, open, close, high, low, volume in quotes])
corners = (minpy, miny), (maxx, maxy)
ax.update_datalim(corners)
- #print 'datalim', ax.dataLim.get_bounds()
- #print 'viewlim', ax.viewLim.get_bounds()
+ #print 'datalim', ax.dataLim.bounds
+ #print 'viewlim', ax.viewLim.bounds
ax.add_collection(barCollection)
ax.autoscale_view()
Modified: branches/v0_99_maint/lib/matplotlib/patches.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/patches.py 2010-03-03 16:31:42 UTC (rev 8172)
+++ branches/v0_99_maint/lib/matplotlib/patches.py 2010-03-03 16:56:16 UTC (rev 8173)
@@ -1383,12 +1383,12 @@
pad = props.pop('pad', 4)
pad = renderer.points_to_pixels(pad)
bbox = artist.get_window_extent(renderer)
- l,b,w,h = bbox.bounds
- l-=pad/2.
- b-=pad/2.
- w+=pad
- h+=pad
- r = Rectangle(xy=(l,b),
+ l, b, w, h = bbox.bounds
+ l -= pad/2.
+ b -= pad/2.
+ w += pad
+ h += pad
+ r = Rectangle(xy=(l, b),
width=w,
height=h,
fill=fill,
@@ -1407,8 +1407,8 @@
to test whether the artist is returning the correct bbox.
"""
- l,b,w,h = bbox.get_bounds()
- r = Rectangle(xy=(l,b),
+ l, b, w, h = bbox.bounds
+ r = Rectangle(xy=(l, b),
width=w,
height=h,
edgecolor=color,
@@ -3174,7 +3174,7 @@
cos_t, sin_t = get_cos_sin(x1, y1, x0, y0)
verticesA, codesA = self._get_bracket(x0, y0, cos_t, sin_t,
self.widthA*scaleA,
- self.legnthA*scaleA)
+ self.lengthA*scaleA)
vertices_list.append(verticesA)
codes_list.append(codesA)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2010-03-09 15:41:37
|
Revision: 8184
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8184&view=rev
Author: jdh2358
Date: 2010-03-09 15:41:30 +0000 (Tue, 09 Mar 2010)
Log Message:
-----------
tagging for branch release candidate
Modified Paths:
--------------
branches/v0_99_maint/lib/matplotlib/__init__.py
branches/v0_99_maint/lib/matplotlib/cbook.py
branches/v0_99_maint/make.osx
branches/v0_99_maint/release/osx/Makefile
branches/v0_99_maint/release/osx/data/setup.cfg
Modified: branches/v0_99_maint/lib/matplotlib/__init__.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/__init__.py 2010-03-09 14:19:49 UTC (rev 8183)
+++ branches/v0_99_maint/lib/matplotlib/__init__.py 2010-03-09 15:41:30 UTC (rev 8184)
@@ -89,7 +89,7 @@
"""
from __future__ import generators
-__version__ = '0.99.1.1'
+__version__ = '0.99.1.3rc1'
__revision__ = '$Revision$'
__date__ = '$Date$'
Modified: branches/v0_99_maint/lib/matplotlib/cbook.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/cbook.py 2010-03-09 14:19:49 UTC (rev 8183)
+++ branches/v0_99_maint/lib/matplotlib/cbook.py 2010-03-09 15:41:30 UTC (rev 8184)
@@ -20,8 +20,10 @@
try:
preferredencoding = locale.getpreferredencoding()
-except (ValueError, ImportError):
+except ValueError:
preferredencoding = None
+except ImportError:
+ preferredencoding = None
def unicode_safe(s):
if preferredencoding is None: return unicode(s)
Modified: branches/v0_99_maint/make.osx
===================================================================
--- branches/v0_99_maint/make.osx 2010-03-09 14:19:49 UTC (rev 8183)
+++ branches/v0_99_maint/make.osx 2010-03-09 15:41:30 UTC (rev 8184)
@@ -1,38 +1,47 @@
-# build mpl into a local install dir with
+# build mpl into a local install dir with
# PREFIX=/Users/jdhunter/dev make -f make.osx fetch deps mpl_install
-MPLVERSION=0.99.1.1
PYVERSION=2.6
PYTHON=python${PYVERSION}
ZLIBVERSION=1.2.3
-PNGVERSION=1.2.33
-FREETYPEVERSION=2.3.7
-MACOSX_DEPLOYMENT_TARGET=10.4
+PNGVERSION=1.2.39
+FREETYPEVERSION=2.3.11
+MACOSX_DEPLOYMENT_TARGET=10.6
+OSX_SDK_VER=10.6
+ARCH_FLAGS="-arch i386-arch x86_64"
+
## You shouldn't need to configure past this point
+#PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
+#CFLAGS="${ARCH_FLAGS} -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+#LDFLAGS="${ARCH_FLAGS} -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
-CFLAGS="-arch i386 -arch ppc -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
-LDFLAGS="-arch i386 -arch ppc -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
+PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
+CFLAGS="-arch i386 -arch x86_64 -I${PREFIX}/include -I${PREFIX}/include/freetype2 -isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+LDFLAGS="-arch i386 -arch x86_64 -L${PREFIX}/lib -syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+FFLAGS="-arch i386 -arch x86_64"
clean:
rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
freetype-${FREETYPEVERSION}.tar.bz2 bdist_mpkg-${BDISTMPKGVERSION}.tar.gz \
bdist_mpkg-${BDISTMPKGVERSION} \
- zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION}
+ zlib-${ZLIBVERSION} libpng-${PNGVERSION} freetype-${FREETYPEVERSION} \
+ build
+
fetch:
${PYTHON} -c 'import urllib; urllib.urlretrieve("http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")' &&\
- ${PYTHON} -c 'import urllib; urllib.urlretrieve("http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2", "libpng-${PNGVERSION}.tar.bz2")' &&\
+ ${PYTHON} -c 'import urllib; urllib.urlretrieve("http://downloads.sourceforge.net/project/libpng/libpng-stable/${PNGVERSION}/libpng-${PNGVERSION}.tar.gz", "libpng-${PNGVERSION}.tar.gz")' &&\
${PYTHON} -c 'import urllib; urllib.urlretrieve("http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2", "freetype-${FREETYPEVERSION}.tar.bz2")'
zlib:
- unset PKG_CONFIG_PATH &&\
+ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
rm -rf zlib-${ZLIBVERSION} &&\
- tar xvfz zlib-${ZLIBVERSION}.tar.gz &&\
+ tar xvfj zlib-${ZLIBVERSION}.tar.gz &&\
cd zlib-${ZLIBVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS} &&\
@@ -42,9 +51,9 @@
unset MACOSX_DEPLOYMENT_TARGET
png: zlib
- unset PKG_CONFIG_PATH &&\
+ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
rm -rf libpng-${PNGVERSION} &&\
- tar xvfj libpng-${PNGVERSION}.tar.bz2
+ tar xvfz libpng-${PNGVERSION}.tar.gz && \
cd libpng-${PNGVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS} &&\
@@ -56,7 +65,7 @@
freetype: zlib
- unset PKG_CONFIG_PATH &&\
+ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
rm -rf ${FREETYPEVERSION} &&\
tar xvfj freetype-${FREETYPEVERSION}.tar.bz2 &&\
cd freetype-${FREETYPEVERSION} &&\
@@ -73,12 +82,14 @@
echo 'all done'
mpl_build:
+ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS} &&\
export LDFLAGS=${LDFLAGS} &&\
- ${PYTHON} setup.py build
+ ${PYTHON} setup.py build
mpl_install:
+ export PKG_CONFIG_PATH=${PKG_CONFIG_PATH} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS} &&\
export LDFLAGS=${LDFLAGS} &&\
Modified: branches/v0_99_maint/release/osx/Makefile
===================================================================
--- branches/v0_99_maint/release/osx/Makefile 2010-03-09 14:19:49 UTC (rev 8183)
+++ branches/v0_99_maint/release/osx/Makefile 2010-03-09 15:41:30 UTC (rev 8184)
@@ -2,12 +2,14 @@
PYTHON=python${PYVERSION}
SRCDIR=${PWD}
ZLIBVERSION=1.2.3
-PNGVERSION=1.2.33
+PNGVERSION=1.2.39
FREETYPEVERSION=2.3.7
-MPLVERSION=0.99.0
+MPLVERSION=0.99.1.3rc1
BDISTMPKGVERSION=0.4.4
MPLSRC=matplotlib-${MPLVERSION}
-MACOSX_DEPLOYMENT_TARGET=10.4
+OSX_SDK_VER=10.6
+MACOSX_DEPLOYMENT_TARGET=10.6
+BDIST_MPKG=/Users/jdh2358/dev/bin/bdist_mpkg
## You shouldn't need to configure past this point
@@ -15,11 +17,11 @@
LDFLAGS="-arch ppc -arch i386 -L${SRCDIR}/zlib-${ZLIBVERSION} -L${SRCDIR}/libpng-${PNGVERSION} -L${SRCDIR}/freetype-${FREETYPEVERSION}"
-CFLAGS_ZLIB="-arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
-LDFLAGS_ZLIB="-arch i386 -arch ppc -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
+CFLAGS_ZLIB="-arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+LDFLAGS_ZLIB="-arch i386 -arch ppc -syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
-CFLAGS_DEPS="-arch i386 -arch ppc -I${SRCDIR}/zlib-${ZLIBVERSION} -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
-LDFLAGS_DEPS="-arch i386 -arch ppc -L${SRCDIR}/zlib-${ZLIBVERSION} -syslibroot,/Developer/SDKs/MacOSX10.4u.sdk"
+CFLAGS_DEPS="-arch i386 -arch ppc -I${SRCDIR}/zlib-${ZLIBVERSION} -isysroot /Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
+LDFLAGS_DEPS="-arch i386 -arch ppc -L${SRCDIR}/zlib-${ZLIBVERSION} -syslibroot,/Developer/SDKs/MacOSX${OSX_SDK_VER}.sdk"
clean:
rm -rf zlib-${ZLIBVERSION}.tar.gz libpng-${PNGVERSION}.tar.bz2 \
@@ -29,15 +31,14 @@
matplotlib-${MPLVERSION} *~
fetch:
- wget http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz &&\
- wget http://internap.dl.sourceforge.net/sourceforge/libpng/libpng-${PNGVERSION}.tar.bz2 &&\
- wget http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2&&\
- wget http://pypi.python.org/packages/source/b/bdist_mpkg/bdist_mpkg-${BDISTMPKGVERSION}.tar.gz&&\
- tar xvfz bdist_mpkg-${BDISTMPKGVERSION}.tar.gz &&\
- echo "You need to to install bdist_mpkg-${BDISTMPKGVERSION} now"
+ ${PYTHON} -c 'import urllib; urllib.urlretrieve("http://www.zlib.net/zlib-${ZLIBVERSION}.tar.gz", "zlib-${ZLIBVERSION}.tar.gz")' &&\
+ ${PYTHON} -c 'import urllib; urllib.urlretrieve("http://downloads.sourceforge.net/project/libpng/libpng-stable/${PNGVERSION}/libpng-${PNGVERSION}.tar.gz", "libpng-${PNGVERSION}.tar.gz")' &&\
+ ${PYTHON} -c 'import urllib; urllib.urlretrieve("http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPEVERSION}.tar.bz2", "freetype-${FREETYPEVERSION}.tar.bz2")' &&\
+ ${PYTHON} -c 'import urllib; urllib.urlretrieve("http://pypi.python.org/packages/source/b/bdist_mpkg/bdist_mpkg-${BDISTMPKGVERSION}.tar.gz", "bdist_mpkg-${BDISTMPKGVERSION}.tar.gz")'
+
zlib:
unset PKG_CONFIG_PATH &&\
rm -rf zlib-${ZLIBVERSION} &&\
@@ -53,7 +54,7 @@
png: zlib
unset PKG_CONFIG_PATH &&\
rm -rf libpng-${PNGVERSION} &&\
- tar xvfj libpng-${PNGVERSION}.tar.bz2
+ tar xvfz libpng-${PNGVERSION}.tar.gz &&\
cd libpng-${PNGVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS_DEPS} &&\
@@ -88,8 +89,8 @@
cp ../data/setup.cfg ../data/ReadMe.txt . &&\
export CFLAGS=${CFLAGS} &&\
export LDFLAGS=${LDFLAGS} &&\
- /Library/Frameworks/Python.framework/Versions/${PYVERSION}/bin/bdist_mpkg --readme=ReadMe.txt &&\
- hdiutil create -srcdir dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.mpkg dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.dmg &&\
+ ${BDIST_MPKG} --readme=ReadMe.txt &&\
+ hdiutil create -srcdir dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx${MACOSX_DEPLOYMENT_TARGET}.mpkg dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx${MACOSX_DEPLOYMENT_TARGET}.dmg &&\
${PYTHON} setupegg.py bdist_egg
upload:
@@ -97,7 +98,7 @@
mkdir upload &&\
cp matplotlib-${MPLVERSION}.tar.gz upload/ &&\
cp matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}_r0-py${PYVERSION}-macosx-10.3-fat.egg upload/matplotlib-${MPLVERSION}-macosx-py${PYVERSION}.egg &&\
- cp matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx10.5.zip upload/matplotlib-${MPLVERSION}-py${PYVERSION}-mpkg.zip&&\
+ cp matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}-py${PYVERSION}-macosx${MACOSX_DEPLOYMENT_TARGET}.zip upload/matplotlib-${MPLVERSION}-py${PYVERSION}-mpkg.zip&&\
scp upload/* jd...@fr...:uploads/
all:
Modified: branches/v0_99_maint/release/osx/data/setup.cfg
===================================================================
--- branches/v0_99_maint/release/osx/data/setup.cfg 2010-03-09 14:19:49 UTC (rev 8183)
+++ branches/v0_99_maint/release/osx/data/setup.cfg 2010-03-09 15:41:30 UTC (rev 8184)
@@ -54,7 +54,7 @@
#gtk = False
#gtkagg = False
tkagg = True
-wxagg = True
+wxagg = False
macosx = True
[rc_options]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jd...@us...> - 2010-03-09 15:44:27
|
Revision: 8185
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8185&view=rev
Author: jdh2358
Date: 2010-03-09 15:44:16 +0000 (Tue, 09 Mar 2010)
Log Message:
-----------
remove micromicro version num
Modified Paths:
--------------
branches/v0_99_maint/lib/matplotlib/__init__.py
branches/v0_99_maint/release/osx/Makefile
Modified: branches/v0_99_maint/lib/matplotlib/__init__.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/__init__.py 2010-03-09 15:41:30 UTC (rev 8184)
+++ branches/v0_99_maint/lib/matplotlib/__init__.py 2010-03-09 15:44:16 UTC (rev 8185)
@@ -89,7 +89,7 @@
"""
from __future__ import generators
-__version__ = '0.99.1.3rc1'
+__version__ = '0.99.3rc1'
__revision__ = '$Revision$'
__date__ = '$Date$'
Modified: branches/v0_99_maint/release/osx/Makefile
===================================================================
--- branches/v0_99_maint/release/osx/Makefile 2010-03-09 15:41:30 UTC (rev 8184)
+++ branches/v0_99_maint/release/osx/Makefile 2010-03-09 15:44:16 UTC (rev 8185)
@@ -4,7 +4,7 @@
ZLIBVERSION=1.2.3
PNGVERSION=1.2.39
FREETYPEVERSION=2.3.7
-MPLVERSION=0.99.1.3rc1
+MPLVERSION=0.99.3rc1
BDISTMPKGVERSION=0.4.4
MPLSRC=matplotlib-${MPLVERSION}
OSX_SDK_VER=10.6
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lee...@us...> - 2010-03-13 22:28:04
|
Revision: 8191
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8191&view=rev
Author: leejjoon
Date: 2010-03-13 22:27:57 +0000 (Sat, 13 Mar 2010)
Log Message:
-----------
fix the bug that handles for scatter are incorrectly set when dpi!=72. Thanks to Ray Speth for the bug report.
Modified Paths:
--------------
branches/v0_99_maint/CHANGELOG
branches/v0_99_maint/lib/matplotlib/legend.py
Modified: branches/v0_99_maint/CHANGELOG
===================================================================
--- branches/v0_99_maint/CHANGELOG 2010-03-13 19:27:00 UTC (rev 8190)
+++ branches/v0_99_maint/CHANGELOG 2010-03-13 22:27:57 UTC (rev 8191)
@@ -1,3 +1,6 @@
+2010-03-13 fix the bug that handles for scatter are incorrectly set when
+ dpi!=72. Thanks to Ray Speth for the bug report. -JJL
+
===============================================
2009-09-21 Tagged for release 0.99.1
Modified: branches/v0_99_maint/lib/matplotlib/legend.py
===================================================================
--- branches/v0_99_maint/lib/matplotlib/legend.py 2010-03-13 19:27:00 UTC (rev 8190)
+++ branches/v0_99_maint/lib/matplotlib/legend.py 2010-03-13 22:27:57 UTC (rev 8191)
@@ -580,6 +580,13 @@
handle = handle_list[-1]
handlebox.add_artist(handle)
+
+ # special case for collection instances
+ if isinstance(handle, RegularPolyCollection) or \
+ isinstance(handle, CircleCollection):
+ handle._transOffset = handlebox.get_transform()
+ handle.set_transform(None)
+
if hasattr(handle, "_legmarker"):
handlebox.add_artist(handle._legmarker)
handleboxes.append(handlebox)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X