matplotlib-checkins — Commit notification. DO NOT POST to this list, just subscribe to it.

SF.net SVN: matplotlib:[6912] branches/v0_98_5_maint/lib/matplotlib/axes.py

[<ry...@us...>]

Revision: 6912
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6912&view=rev
Author:   ryanmay
Date:     2009-02-13 18:17:31 +0000 (Fri, 13 Feb 2009)

Log Message:
-----------
Typo in docstring

Modified Paths:
--------------
    branches/v0_98_5_maint/lib/matplotlib/axes.py

Modified: branches/v0_98_5_maint/lib/matplotlib/axes.py
===================================================================
--- branches/v0_98_5_maint/lib/matplotlib/axes.py	2009-02-13 17:54:52 UTC (rev 6911)
+++ branches/v0_98_5_maint/lib/matplotlib/axes.py	2009-02-13 18:17:31 UTC (rev 6912)
@@ -5743,7 +5743,7 @@
             corner of the axes. If *None*, default to rc ``image.origin``.
 
           *extent*: [ None | scalars (left, right, bottom, top) ]
-            Eata values of the axes.  The default assigns zero-based row,
+            Data limits for the axes.  The default assigns zero-based row,
             column indices to the *x*, *y* centers of the pixels.
 
           *shape*: [ None | scalars (columns, rows) ]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6911] branches/v0_98_5_maint/lib/matplotlib/units. py

[<ry...@us...>]

Revision: 6911
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6911&view=rev
Author:   ryanmay
Date:     2009-02-13 17:54:52 +0000 (Fri, 13 Feb 2009)

Log Message:
-----------
Backport fix for infinite recursion when finding the appropriate converter for a string.  A lot of users seem to be hitting this.

Modified Paths:
--------------
    branches/v0_98_5_maint/lib/matplotlib/units.py

Modified: branches/v0_98_5_maint/lib/matplotlib/units.py
===================================================================
--- branches/v0_98_5_maint/lib/matplotlib/units.py	2009-02-12 21:24:36 UTC (rev 6910)
+++ branches/v0_98_5_maint/lib/matplotlib/units.py	2009-02-13 17:54:52 UTC (rev 6911)
@@ -44,7 +44,7 @@
 
 """
 import numpy as np
-from matplotlib.cbook import iterable, is_numlike
+from matplotlib.cbook import iterable, is_numlike, is_string_like
 
 class AxisInfo:
     'information to support default axis labeling and tick labeling'
@@ -127,7 +127,10 @@
         if classx is not None:
             converter = self.get(classx)
 
-        if converter is None and iterable(x):
+        # Check explicity for strings here because they would otherwise
+        # lead to an infinite recursion, because a single character will
+        # pass the iterable() check.
+        if converter is None and iterable(x) and not is_string_like(x):
             # if this is anything but an object array, we'll assume
             # there are no custom units
             if isinstance(x, np.ndarray) and x.dtype != np.object:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6910] trunk/matplotlib

[<ry...@us...>]

Revision: 6910
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6910&view=rev
Author:   ryanmay
Date:     2009-02-12 21:24:36 +0000 (Thu, 12 Feb 2009)

Log Message:
-----------
Merged revisions 6906-6907,6909 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint

........
  r6906 | ryanmay | 2009-02-12 14:05:10 -0600 (Thu, 12 Feb 2009) | 1 line
  
  Add a demo for getting notified of an Axes' change in view limits.
........
  r6907 | ryanmay | 2009-02-12 14:06:50 -0600 (Thu, 12 Feb 2009) | 1 line
  
  Remove trailing whitespace.
........
  r6909 | ryanmay | 2009-02-12 15:20:09 -0600 (Thu, 12 Feb 2009) | 1 line
  
  Make viewlims demo more interesting by using events to regenerate a fractal.
........

Modified Paths:
--------------
    trunk/matplotlib/doc/users/event_handling.rst

Added Paths:
-----------
    trunk/matplotlib/examples/event_handling/viewlims.py

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6892
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6909
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909

Modified: trunk/matplotlib/doc/users/event_handling.rst
===================================================================
--- trunk/matplotlib/doc/users/event_handling.rst	2009-02-12 21:20:09 UTC (rev 6909)
+++ trunk/matplotlib/doc/users/event_handling.rst	2009-02-12 21:24:36 UTC (rev 6910)
@@ -552,11 +552,4 @@
 
     fig.canvas.mpl_connect('pick_event', onpick)
 
-    plt.show()
-
-
-
-
-
-
-
+    plt.show()

Copied: trunk/matplotlib/examples/event_handling/viewlims.py (from rev 6909, branches/v0_98_5_maint/examples/event_handling/viewlims.py)
===================================================================
--- trunk/matplotlib/examples/event_handling/viewlims.py	                        (rev 0)
+++ trunk/matplotlib/examples/event_handling/viewlims.py	2009-02-12 21:24:36 UTC (rev 6910)
@@ -0,0 +1,79 @@
+# Creates two identical panels.  Zooming in on the right panel will show
+# a rectangle in the first panel, denoting the zoomed region.
+import numpy as np
+import matplotlib.pyplot as plt
+from matplotlib.patches import Rectangle
+
+# We just subclass Rectangle so that it can be called with an Axes
+# instance, causing the rectangle to update its shape to match the
+# bounds of the Axes
+class UpdatingRect(Rectangle):
+    def __call__(self, ax):
+        self.set_bounds(*ax.viewLim.bounds)
+        ax.figure.canvas.draw_idle()
+
+# A class that will regenerate a fractal set as we zoom in, so that you
+# can actually see the increasing detail.  A box in the left panel will show
+# the area to which we are zoomed.
+class MandlebrotDisplay(object):
+    def __init__(self, h=500, w=500, niter=50, radius=2., power=2):
+        self.height = h
+        self.width = w
+        self.niter = niter
+        self.radius = radius
+        self.power = power
+
+    def __call__(self, xstart, xend, ystart, yend):
+        self.x = np.linspace(xstart, xend, self.width)
+        self.y = np.linspace(ystart, yend, self.height).reshape(-1,1)
+        c = self.x + 1.0j * self.y
+        threshold_time = np.zeros((self.height, self.width))
+        z = np.zeros(threshold_time.shape, dtype=np.complex)
+        mask = np.ones(threshold_time.shape, dtype=np.bool)
+        for i in xrange(self.niter):
+            z[mask] = z[mask]**self.power + c[mask]
+            mask = (np.abs(z) < self.radius)
+            threshold_time += mask
+        return threshold_time
+
+    def ax_update(self, ax):
+        ax.set_autoscale_on(False) # Otherwise, infinite loop
+
+        #Get the number of points from the number of pixels in the window
+        dims = ax.axesFrame.get_window_extent().bounds
+        self.width = int(dims[2] + 0.5)
+        self.height = int(dims[2] + 0.5)
+
+        #Get the range for the new area
+        xstart,ystart,xdelta,ydelta = ax.viewLim.bounds
+        xend = xstart + xdelta
+        yend = ystart + ydelta
+
+        # Update the image object with our new data and extent
+        im = ax.images[-1]
+        im.set_data(self.__call__(xstart, xend, ystart, yend))
+        im.set_extent((xstart, xend, ystart, yend))
+        ax.figure.canvas.draw_idle()
+
+md = MandlebrotDisplay()
+Z = md(-2., 0.5, -1.25, 1.25)
+
+fig = plt.figure()
+ax1 = fig.add_subplot(1, 2, 1)
+ax1.imshow(Z, origin='lower', extent=(md.x.min(), md.x.max(), md.y.min(), md.y.max()))
+
+ax2 = fig.add_subplot(1, 2, 2)
+ax2.imshow(Z, origin='lower', extent=(md.x.min(), md.x.max(), md.y.min(), md.y.max()))
+
+rect = UpdatingRect([0, 0], 0, 0, facecolor='None', edgecolor='black')
+rect.set_bounds(*ax2.viewLim.bounds)
+ax1.add_patch(rect)
+
+# Connect for changing the view limits
+ax2.callbacks.connect('xlim_changed', rect)
+ax2.callbacks.connect('ylim_changed', rect)
+
+ax2.callbacks.connect('xlim_changed', md.ax_update)
+ax2.callbacks.connect('ylim_changed', md.ax_update)
+
+plt.show()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6909] branches/v0_98_5_maint/examples/ event_handling/viewlims.py

[<ry...@us...>]

Revision: 6909
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6909&view=rev
Author:   ryanmay
Date:     2009-02-12 21:20:09 +0000 (Thu, 12 Feb 2009)

Log Message:
-----------
Make viewlims demo more interesting by using events to regenerate a fractal.

Modified Paths:
--------------
    branches/v0_98_5_maint/examples/event_handling/viewlims.py

Modified: branches/v0_98_5_maint/examples/event_handling/viewlims.py
===================================================================
--- branches/v0_98_5_maint/examples/event_handling/viewlims.py	2009-02-12 20:59:53 UTC (rev 6908)
+++ branches/v0_98_5_maint/examples/event_handling/viewlims.py	2009-02-12 21:20:09 UTC (rev 6909)
@@ -12,16 +12,58 @@
         self.set_bounds(*ax.viewLim.bounds)
         ax.figure.canvas.draw_idle()
 
-x = np.linspace(-3., 3., 20)
-y = np.linspace(-3., 3., 20).reshape(-1,1)
-Z = (1- x/2 + x**5 + y**3)*np.exp(-x**2-y**2)
+# A class that will regenerate a fractal set as we zoom in, so that you
+# can actually see the increasing detail.  A box in the left panel will show
+# the area to which we are zoomed.
+class MandlebrotDisplay(object):
+    def __init__(self, h=500, w=500, niter=50, radius=2., power=2):
+        self.height = h
+        self.width = w
+        self.niter = niter
+        self.radius = radius
+        self.power = power
 
+    def __call__(self, xstart, xend, ystart, yend):
+        self.x = np.linspace(xstart, xend, self.width)
+        self.y = np.linspace(ystart, yend, self.height).reshape(-1,1)
+        c = self.x + 1.0j * self.y
+        threshold_time = np.zeros((self.height, self.width))
+        z = np.zeros(threshold_time.shape, dtype=np.complex)
+        mask = np.ones(threshold_time.shape, dtype=np.bool)
+        for i in xrange(self.niter):
+            z[mask] = z[mask]**self.power + c[mask]
+            mask = (np.abs(z) < self.radius)
+            threshold_time += mask
+        return threshold_time
+
+    def ax_update(self, ax):
+        ax.set_autoscale_on(False) # Otherwise, infinite loop
+
+        #Get the number of points from the number of pixels in the window
+        dims = ax.axesFrame.get_window_extent().bounds
+        self.width = int(dims[2] + 0.5)
+        self.height = int(dims[2] + 0.5)
+
+        #Get the range for the new area
+        xstart,ystart,xdelta,ydelta = ax.viewLim.bounds
+        xend = xstart + xdelta
+        yend = ystart + ydelta
+
+        # Update the image object with our new data and extent
+        im = ax.images[-1]
+        im.set_data(self.__call__(xstart, xend, ystart, yend))
+        im.set_extent((xstart, xend, ystart, yend))
+        ax.figure.canvas.draw_idle()
+
+md = MandlebrotDisplay()
+Z = md(-2., 0.5, -1.25, 1.25)
+
 fig = plt.figure()
 ax1 = fig.add_subplot(1, 2, 1)
-ax1.pcolor(x, y, Z)
+ax1.imshow(Z, origin='lower', extent=(md.x.min(), md.x.max(), md.y.min(), md.y.max()))
 
 ax2 = fig.add_subplot(1, 2, 2)
-ax2.pcolor(x, y, Z)
+ax2.imshow(Z, origin='lower', extent=(md.x.min(), md.x.max(), md.y.min(), md.y.max()))
 
 rect = UpdatingRect([0, 0], 0, 0, facecolor='None', edgecolor='black')
 rect.set_bounds(*ax2.viewLim.bounds)
@@ -31,4 +73,7 @@
 ax2.callbacks.connect('xlim_changed', rect)
 ax2.callbacks.connect('ylim_changed', rect)
 
+ax2.callbacks.connect('xlim_changed', md.ax_update)
+ax2.callbacks.connect('ylim_changed', md.ax_update)
+
 plt.show()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6908] trunk/matplotlib/lib/matplotlib/image.py

[<ry...@us...>]

Revision: 6908
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6908&view=rev
Author:   ryanmay
Date:     2009-02-12 20:59:53 +0000 (Thu, 12 Feb 2009)

Log Message:
-----------
Update AxesImage for independent autoscaling of x and y axes.

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/image.py

Modified: trunk/matplotlib/lib/matplotlib/image.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/image.py	2009-02-12 20:06:50 UTC (rev 6907)
+++ trunk/matplotlib/lib/matplotlib/image.py	2009-02-12 20:59:53 UTC (rev 6908)
@@ -317,8 +317,9 @@
         xmin, xmax, ymin, ymax = extent
         corners = (xmin, ymin), (xmax, ymax)
         self.axes.update_datalim(corners)
-        if self.axes._autoscaleon:
+        if self.axes._autoscaleXon:
             self.axes.set_xlim((xmin, xmax))
+        if self.axes._autoscaleYon:
             self.axes.set_ylim((ymin, ymax))
 
     def get_interpolation(self):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6907] branches/v0_98_5_maint/doc/users/ event_handling.rst

[<ry...@us...>]

Revision: 6907
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6907&view=rev
Author:   ryanmay
Date:     2009-02-12 20:06:50 +0000 (Thu, 12 Feb 2009)

Log Message:
-----------
Remove trailing whitespace.

Modified Paths:
--------------
    branches/v0_98_5_maint/doc/users/event_handling.rst

Modified: branches/v0_98_5_maint/doc/users/event_handling.rst
===================================================================
--- branches/v0_98_5_maint/doc/users/event_handling.rst	2009-02-12 20:05:10 UTC (rev 6906)
+++ branches/v0_98_5_maint/doc/users/event_handling.rst	2009-02-12 20:06:50 UTC (rev 6907)
@@ -552,11 +552,4 @@
 
     fig.canvas.mpl_connect('pick_event', onpick)
 
-    plt.show()
-
-
-
-
-
-
-
+    plt.show()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6906] branches/v0_98_5_maint/examples/ event_handling/viewlims.py

[<ry...@us...>]

Revision: 6906
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6906&view=rev
Author:   ryanmay
Date:     2009-02-12 20:05:10 +0000 (Thu, 12 Feb 2009)

Log Message:
-----------
Add a demo for getting notified of an Axes' change in view limits.

Added Paths:
-----------
    branches/v0_98_5_maint/examples/event_handling/viewlims.py

Added: branches/v0_98_5_maint/examples/event_handling/viewlims.py
===================================================================
--- branches/v0_98_5_maint/examples/event_handling/viewlims.py	                        (rev 0)
+++ branches/v0_98_5_maint/examples/event_handling/viewlims.py	2009-02-12 20:05:10 UTC (rev 6906)
@@ -0,0 +1,34 @@
+# Creates two identical panels.  Zooming in on the right panel will show
+# a rectangle in the first panel, denoting the zoomed region.
+import numpy as np
+import matplotlib.pyplot as plt
+from matplotlib.patches import Rectangle
+
+# We just subclass Rectangle so that it can be called with an Axes
+# instance, causing the rectangle to update its shape to match the
+# bounds of the Axes
+class UpdatingRect(Rectangle):
+    def __call__(self, ax):
+        self.set_bounds(*ax.viewLim.bounds)
+        ax.figure.canvas.draw_idle()
+
+x = np.linspace(-3., 3., 20)
+y = np.linspace(-3., 3., 20).reshape(-1,1)
+Z = (1- x/2 + x**5 + y**3)*np.exp(-x**2-y**2)
+
+fig = plt.figure()
+ax1 = fig.add_subplot(1, 2, 1)
+ax1.pcolor(x, y, Z)
+
+ax2 = fig.add_subplot(1, 2, 2)
+ax2.pcolor(x, y, Z)
+
+rect = UpdatingRect([0, 0], 0, 0, facecolor='None', edgecolor='black')
+rect.set_bounds(*ax2.viewLim.bounds)
+ax1.add_patch(rect)
+
+# Connect for changing the view limits
+ax2.callbacks.connect('xlim_changed', rect)
+ax2.callbacks.connect('ylim_changed', rect)
+
+plt.show()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6905] trunk/matplotlib/unit/test_pdf_use14corefonts .py

[<jo...@us...>]

Revision: 6905
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6905&view=rev
Author:   jouni
Date:     2009-02-12 18:00:55 +0000 (Thu, 12 Feb 2009)

Log Message:
-----------
Small fixes to test_pdf_use14corefonts.py, thanks to Nicolas Grilly

Modified Paths:
--------------
    trunk/matplotlib/unit/test_pdf_use14corefonts.py

Modified: trunk/matplotlib/unit/test_pdf_use14corefonts.py
===================================================================
--- trunk/matplotlib/unit/test_pdf_use14corefonts.py	2009-02-10 22:16:35 UTC (rev 6904)
+++ trunk/matplotlib/unit/test_pdf_use14corefonts.py	2009-02-12 18:00:55 UTC (rev 6905)
@@ -1,16 +1,31 @@
-# encoding: utf-8
+# -*- encoding: utf-8 -*-
+"""
+Test the PDF backend with the option use14corefonts=True.
 
-import matplotlib
-matplotlib.use('PDF')
+Font cache issue
+----------------
 
+The font cache doesn't record whether it was build with
+pdf.use14corefonts enabled or not, and the font name "Helvetica"
+happens to match "Helvetica Narrow", whose metrics are included with
+matplotlib, and using that AFM file without including the font itself
+breaks the output.
+
+As a workaround, please reset the font cache by deleting
+~/.matplotlib/fontList.cache each time you enable or disable
+use14corefonts.
+"""
+
 from matplotlib import rcParams
-import pylab
 
+rcParams['backend'] = 'pdf'
 rcParams['pdf.use14corefonts'] = True
 rcParams['font.family'] = 'sans-serif'
 rcParams['font.size'] = 8
 rcParams['font.sans-serif'] = ['Helvetica']
 
+import pylab
+
 title = u'Test PDF backend with option use14corefonts=True'
 
 text = u'''A three-line text positioned just above a blue line


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6904] trunk/matplotlib

[<jo...@us...>]

Revision: 6904
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6904&view=rev
Author:   jouni
Date:     2009-02-10 22:16:35 +0000 (Tue, 10 Feb 2009)

Log Message:
-----------
Commit Nicolas Grilly's use14corefonts patch

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py

Added Paths:
-----------
    trunk/matplotlib/unit/test_pdf_use14corefonts.py

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2009-02-10 16:09:38 UTC (rev 6903)
+++ trunk/matplotlib/CHANGELOG	2009-02-10 22:16:35 UTC (rev 6904)
@@ -1,3 +1,7 @@
+2009-02-10 Fixed a bug in backend_pdf so it doesn't break when the setting
+           pdf.use14corefonts=True is used. Added test case in
+           unit/test_pdf_use14corefonts.py. - NGR
+
 2009-02-08 Added a new imsave function to image.py and exposed it in
            the pyplot interface - GR
 

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py	2009-02-10 16:09:38 UTC (rev 6903)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py	2009-02-10 22:16:35 UTC (rev 6904)
@@ -1465,7 +1465,7 @@
             self.draw_path(boxgc, path, mytrans, gc._rgb)
 
     def encode_string(self, s, fonttype):
-        if fonttype == 3:
+        if fonttype in (1, 3):
             return s.encode('cp1252', 'replace')
         return s.encode('utf-16be', 'replace')
 
@@ -1492,7 +1492,7 @@
             font = self._get_font_afm(prop)
             l, b, w, h = font.get_str_bbox(s)
             descent = -b * fontsize / 1000
-            fonttype = 42
+            fonttype = 1
         else:
             font = self._get_font_ttf(prop)
             self.track_characters(font, s)
@@ -1627,9 +1627,9 @@
             font = self._get_font_afm(prop)
             l, b, w, h, d = font.get_str_bbox_and_descent(s)
             scale = prop.get_size_in_points()
-            w *= scale
-            h *= scale
-            d *= scale
+            w *= scale / 1000
+            h *= scale / 1000
+            d *= scale / 1000
         else:
             font = self._get_font_ttf(prop)
             font.set_text(s, 0.0, flags=LOAD_NO_HINTING)

Added: trunk/matplotlib/unit/test_pdf_use14corefonts.py
===================================================================
--- trunk/matplotlib/unit/test_pdf_use14corefonts.py	                        (rev 0)
+++ trunk/matplotlib/unit/test_pdf_use14corefonts.py	2009-02-10 22:16:35 UTC (rev 6904)
@@ -0,0 +1,25 @@
+# encoding: utf-8
+
+import matplotlib
+matplotlib.use('PDF')
+
+from matplotlib import rcParams
+import pylab
+
+rcParams['pdf.use14corefonts'] = True
+rcParams['font.family'] = 'sans-serif'
+rcParams['font.size'] = 8
+rcParams['font.sans-serif'] = ['Helvetica']
+
+title = u'Test PDF backend with option use14corefonts=True'
+
+text = u'''A three-line text positioned just above a blue line
+and containing some French characters and the euro symbol:
+"Merci pépé pour les 10 €"'''
+
+pylab.figure(figsize=(6, 4))
+pylab.title(title)
+pylab.text(0.5, 0.5, text, horizontalalignment='center')
+pylab.axhline(0.5, linewidth=0.5)
+pylab.savefig('test_pdf_use14corefonts.pdf')
+pylab.close()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6903] trunk/matplotlib/src/path_converters.h

[<md...@us...>]

Revision: 6903
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6903&view=rev
Author:   mdboom
Date:     2009-02-10 16:09:38 +0000 (Tue, 10 Feb 2009)

Log Message:
-----------
Minor comment and indentation fixes.

Modified Paths:
--------------
    trunk/matplotlib/src/path_converters.h

Modified: trunk/matplotlib/src/path_converters.h
===================================================================
--- trunk/matplotlib/src/path_converters.h	2009-02-10 04:47:57 UTC (rev 6902)
+++ trunk/matplotlib/src/path_converters.h	2009-02-10 16:09:38 UTC (rev 6903)
@@ -162,7 +162,8 @@
                     return code;
                 }
 
-                if (needs_move_to) {
+                if (needs_move_to)
+                {
                     queue_push(agg::path_cmd_move_to, *x, *y);
                 }
 
@@ -185,6 +186,9 @@
 
                 queue_clear();
 
+                /* If the last point is finite, we use that for the
+                   moveto, otherwise, we'll use the first vertex of
+                   the next curve. */
                 if (!(MPL_notisfinite64(*x) || MPL_notisfinite64(*y)))
                 {
                     queue_push(agg::path_cmd_move_to, *x, *y);
@@ -318,8 +322,8 @@
                     m_lastY = *y;
                     unsigned moved = agg::clip_line_segment(&x0, &y0, &x1, &y1, m_cliprect);
                     // moved >= 4 - Fully clipped
-                    // moved != 0 - First point has been moved
-                    // moved != 0 - Second point has been moved
+                    // moved & 1 != 0 - First point has been moved
+                    // moved & 2 != 0 - Second point has been moved
                     if (moved < 4)
                     {
                         if (moved & 1)
@@ -480,7 +484,7 @@
         m_lastMax(false), m_nextX(0.0), m_nextY(0.0),
         m_lastWrittenX(0.0), m_lastWrittenY(0.0)
     {
-      // empty
+        // empty
     }
 
     inline void rewind(unsigned path_id)
@@ -719,7 +723,8 @@
 
         /* If we clipped some segments between this line and the next line
            we are starting, we also need to move to the last point. */
-        if (m_clipped) {
+        if (m_clipped)
+        {
             queue_push(agg::path_cmd_move_to, m_lastx, m_lasty);
         }
         else if (!m_lastMax)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6902] trunk/matplotlib/lib/matplotlib/axes.py

[<as...@us...>]

Revision: 6902
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6902&view=rev
Author:   astraw
Date:     2009-02-10 04:47:57 +0000 (Tue, 10 Feb 2009)

Log Message:
-----------
axes.py: add comment describing separation of XY plots and polar plots

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/axes.py

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2009-02-10 04:47:43 UTC (rev 6901)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2009-02-10 04:47:57 UTC (rev 6902)
@@ -594,11 +594,20 @@
         :class:`~matplotlib.transforms.Bbox` attributes and the
         *transScale*, *transData*, *transLimits* and *transAxes*
         transformations.
+
+        .. note::
+            This method is primarily used by rectilinear projections
+            of the :class:`~matplotlib.axes.Axes` class, and is meant
+            to be overridden by new kinds of projection axes that need
+            different transformations and limits. (See
+            :class:`~matplotlib.projections.polar.PolarAxes` for an
+            example.
         """
         self.transAxes = mtransforms.BboxTransformTo(self.bbox)
 
-        # Transforms the x and y axis separately by a scale factor
+        # Transforms the x and y axis separately by a scale factor.
         # It is assumed that this part will have non-linear components
+        # (e.g. for a log scale).
         self.transScale = mtransforms.TransformWrapper(
             mtransforms.IdentityTransform())
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6901] trunk/matplotlib/lib/matplotlib/axes.py

[<as...@us...>]

Revision: 6901
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6901&view=rev
Author:   astraw
Date:     2009-02-10 04:47:43 +0000 (Tue, 10 Feb 2009)

Log Message:
-----------
axes.py: eliminate redundant attribute lookup

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/axes.py

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2009-02-10 04:47:29 UTC (rev 6900)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2009-02-10 04:47:43 UTC (rev 6901)
@@ -613,9 +613,9 @@
         self.transData = self.transScale + (self.transLimits + self.transAxes)
 
         self._xaxis_transform = mtransforms.blended_transform_factory(
-                self.axes.transData, self.axes.transAxes)
+                self.transData, self.transAxes)
         self._yaxis_transform = mtransforms.blended_transform_factory(
-                self.axes.transAxes, self.axes.transData)
+                self.transAxes, self.transData)
 
     def get_xaxis_transform(self):
         """


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6900] trunk/matplotlib/lib/matplotlib/axes.py

[<as...@us...>]

Revision: 6900
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6900&view=rev
Author:   astraw
Date:     2009-02-10 04:47:29 +0000 (Tue, 10 Feb 2009)

Log Message:
-----------
doc bug: update axvline docstring

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/axes.py

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2009-02-10 04:43:23 UTC (rev 6899)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2009-02-10 04:47:29 UTC (rev 6900)
@@ -2880,8 +2880,8 @@
         Draw a vertical line at *x* from *ymin* to *ymax*.  With the
         default values of *ymin* = 0 and *ymax* = 1, this line will
         always span the vertical extent of the axes, regardless of the
-        xlim settings, even if you change them, eg. with the
-        :meth:`set_xlim` command.  That is, the vertical extent is in
+        ylim settings, even if you change them, eg. with the
+        :meth:`set_ylim` command.  That is, the vertical extent is in
         axes coords: 0=bottom, 0.5=middle, 1.0=top but the *x* location
         is in data coordinates.
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6899] trunk/matplotlib

[<as...@us...>]

Revision: 6899
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6899&view=rev
Author:   astraw
Date:     2009-02-10 04:43:23 +0000 (Tue, 10 Feb 2009)

Log Message:
-----------
Add imsave() to matplotlib.image, pyplot, and pylab. Patch from Gary Ruben.

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/doc/_templates/index.html
    trunk/matplotlib/doc/api/api_changes.rst
    trunk/matplotlib/lib/matplotlib/image.py
    trunk/matplotlib/lib/matplotlib/pylab.py
    trunk/matplotlib/lib/matplotlib/pyplot.py

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2009-02-09 23:05:22 UTC (rev 6898)
+++ trunk/matplotlib/CHANGELOG	2009-02-10 04:43:23 UTC (rev 6899)
@@ -1,3 +1,6 @@
+2009-02-08 Added a new imsave function to image.py and exposed it in
+           the pyplot interface - GR
+
 2009-02-04 Some reorgnization of the legend code. anchored_text.py
            added as an example. - JJL
 

Modified: trunk/matplotlib/doc/_templates/index.html
===================================================================
--- trunk/matplotlib/doc/_templates/index.html	2009-02-09 23:05:22 UTC (rev 6898)
+++ trunk/matplotlib/doc/_templates/index.html	2009-02-10 04:43:23 UTC (rev 6899)
@@ -567,6 +567,17 @@
     </tr>
     <tr>
       <th align="left">
+        <a href="api/pyplot_api.html#matplotlib.pyplot.imsave">imsave</a>
+
+      </th>
+
+      <td align="left">
+        save array as an image file
+      </td>
+
+    </tr>
+    <tr>
+      <th align="left">
         <a href="api/pyplot_api.html#matplotlib.pyplot.imshow">imshow</a>
 
       </th>

Modified: trunk/matplotlib/doc/api/api_changes.rst
===================================================================
--- trunk/matplotlib/doc/api/api_changes.rst	2009-02-09 23:05:22 UTC (rev 6898)
+++ trunk/matplotlib/doc/api/api_changes.rst	2009-02-10 04:43:23 UTC (rev 6899)
@@ -19,6 +19,9 @@
 
 Changes for 0.98.x
 ==================
+* Added new :func:`matplotlib.image.imsave` and exposed it to the
+  :mod:`matplotlib.pyplot` interface.
+
 * Remove support for pyExcelerator in exceltools -- use xlwt
   instead 
 

Modified: trunk/matplotlib/lib/matplotlib/image.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/image.py	2009-02-09 23:05:22 UTC (rev 6898)
+++ trunk/matplotlib/lib/matplotlib/image.py	2009-02-10 04:43:23 UTC (rev 6899)
@@ -747,7 +747,43 @@
     return handler(fname)
 
 
+def imsave(fname, arr, vmin=None, vmax=None, cmap=None, format=None, origin=None):
+    """
+    Saves a 2D :class:`numpy.array` as an image with one pixel per element.
+    The output formats available depend on the backend being used.
 
+    Arguments:
+      *fname*:
+        A string containing a path to a filename, or a Python file-like object.
+        If *format* is *None* and *fname* is a string, the output
+        format is deduced from the extension of the filename.
+      *arr*:
+        A 2D array.
+    Keyword arguments:
+      *vmin*/*vmax*: [ None | scalar ]
+        *vmin* and *vmax* set the color scaling for the image by fixing the
+        values that map to the colormap color limits. If either *vmin* or *vmax*
+        is None, that limit is determined from the *arr* min/max value.
+      *cmap*:
+        cmap is a colors.Colormap instance, eg cm.jet.
+        If None, default to the rc image.cmap value.
+      *format*:
+        One of the file extensions supported by the active
+        backend.  Most backends support png, pdf, ps, eps and svg.
+      *origin*
+        [ 'upper' | 'lower' ] Indicates where the [0,0] index of
+        the array is in the upper left or lower left corner of
+        the axes. Defaults to the rc image.origin value.
+    """
+    from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
+    from matplotlib.figure import Figure
+
+    fig = Figure(figsize=arr.shape[::-1], dpi=1, frameon=False)
+    canvas = FigureCanvas(fig)
+    fig.figimage(arr, cmap=cmap, vmin=vmin, vmax=vmax, origin=origin)
+    fig.savefig(fname, dpi=1, format=format)
+
+
 def pil_to_array( pilImage ):
     """
     load a PIL image and return it as a numpy array of uint8.  For

Modified: trunk/matplotlib/lib/matplotlib/pylab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/pylab.py	2009-02-09 23:05:22 UTC (rev 6898)
+++ trunk/matplotlib/lib/matplotlib/pylab.py	2009-02-10 04:43:23 UTC (rev 6899)
@@ -50,6 +50,7 @@
   ion      - turn interaction mode on
   isinteractive - return True if interaction mode is on
   imread   - load image file into array
+  imsave   - save array as an image file
   imshow   - plot image data
   ishold   - return the hold state of the current axes
   legend   - make an axes legend

Modified: trunk/matplotlib/lib/matplotlib/pyplot.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/pyplot.py	2009-02-09 23:05:22 UTC (rev 6898)
+++ trunk/matplotlib/lib/matplotlib/pyplot.py	2009-02-10 04:43:23 UTC (rev 6899)
@@ -6,6 +6,7 @@
 from matplotlib.figure import Figure, figaspect
 from matplotlib.backend_bases import FigureCanvasBase
 from matplotlib.image import imread as _imread
+from matplotlib.image import imsave as _imsave
 from matplotlib import rcParams, rcParamsDefault, get_backend
 from matplotlib.rcsetup import interactive_bk as _interactive_bk
 from matplotlib.artist import getp, get, Artist
@@ -1181,6 +1182,7 @@
     legend          add a legend to the axes
     loglog          a log log plot
     imread          load image file into array
+    imsave          save array as an image file
     imshow          plot image data
     matshow         display a matrix in a new figure preserving aspect
     pcolor          make a pseudocolor plot
@@ -1230,7 +1232,7 @@
 def get_plot_commands(): return ( 'axes', 'axis', 'bar', 'boxplot', 'cla', 'clf',
     'close', 'colorbar', 'cohere', 'csd', 'draw', 'errorbar',
     'figlegend', 'figtext', 'figimage', 'figure', 'fill', 'gca',
-    'gcf', 'gci', 'get', 'gray', 'barh', 'jet', 'hist', 'hold', 'imread',
+    'gcf', 'gci', 'get', 'gray', 'barh', 'jet', 'hist', 'hold', 'imread', 'imsave',
     'imshow', 'legend', 'loglog', 'quiver', 'rc', 'pcolor', 'pcolormesh', 'plot', 'psd',
     'savefig', 'scatter', 'set', 'semilogx', 'semilogy', 'show',
     'specgram', 'stem', 'subplot', 'table', 'text', 'title', 'xlabel',
@@ -1370,6 +1372,11 @@
 if _imread.__doc__ is not None:
     imread.__doc__ = dedent(_imread.__doc__)
 
+def imsave(*args, **kwargs):
+    return _imsave(*args, **kwargs)
+if _imsave.__doc__ is not None:
+    imsave.__doc__ = dedent(_imsave.__doc__)
+
 def matshow(A, fignum=None, **kw):
     """
     Display an array as a matrix in a new figure window.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6898] trunk/matplotlib/lib/matplotlib/axes.py

[<jr...@us...>]

Revision: 6898
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6898&view=rev
Author:   jrevans
Date:     2009-02-09 23:05:22 +0000 (Mon, 09 Feb 2009)

Log Message:
-----------
Fixed the bar plot code to use the proper unit conversion interface code.

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/axes.py

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2009-02-09 20:06:49 UTC (rev 6897)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2009-02-09 23:05:22 UTC (rev 6898)
@@ -4094,18 +4094,12 @@
         # lets do some conversions now since some types cannot be
         # subtracted uniformly
         if self.xaxis is not None:
-            xconv = self.xaxis.converter
-            if xconv is not None:
-                units = self.xaxis.get_units()
-                left = xconv.convert( left, units )
-                width = xconv.convert( width, units )
+            left = self.convert_xunits( left )
+            width = self.convert_xunits( width )
 
         if self.yaxis is not None:
-            yconv = self.yaxis.converter
-            if yconv is not None :
-                units = self.yaxis.get_units()
-                bottom = yconv.convert( bottom, units )
-                height = yconv.convert( height, units )
+            bottom = self.convert_yunits( bottom )
+            height = self.convert_yunits( height )
 
         if align == 'edge':
             pass


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6897] trunk/matplotlib/src

[<md...@us...>]

Revision: 6897
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6897&view=rev
Author:   mdboom
Date:     2009-02-09 20:06:49 +0000 (Mon, 09 Feb 2009)

Log Message:
-----------
Fix indentation.

Modified Paths:
--------------
    trunk/matplotlib/src/path_cleanup.cpp
    trunk/matplotlib/src/path_cleanup.h

Modified: trunk/matplotlib/src/path_cleanup.cpp
===================================================================
--- trunk/matplotlib/src/path_cleanup.cpp	2009-02-09 20:06:32 UTC (rev 6896)
+++ trunk/matplotlib/src/path_cleanup.cpp	2009-02-09 20:06:49 UTC (rev 6897)
@@ -7,7 +7,8 @@
 #include "agg_py_transforms.h"
 #include "path_converters.h"
 
-class PathCleanupIterator {
+class PathCleanupIterator
+{
     typedef agg::conv_transform<PathIterator>  transformed_path_t;
     typedef PathNanRemover<transformed_path_t> nan_removal_t;
     typedef PathClipper<nan_removal_t>         clipped_t;
@@ -49,36 +50,36 @@
 };
 
 extern "C" {
-  void*
-  get_path_iterator(
-    PyObject* path, PyObject* trans, int remove_nans, int do_clip,
-    double rect[4], e_quantize_mode quantize_mode, int do_simplify)
-  {
-    agg::trans_affine agg_trans = py_to_agg_transformation_matrix(trans, false);
-    agg::rect_base<double> clip_rect(rect[0], rect[1], rect[2], rect[3]);
+    void*
+    get_path_iterator(
+        PyObject* path, PyObject* trans, int remove_nans, int do_clip,
+        double rect[4], e_quantize_mode quantize_mode, int do_simplify)
+    {
+        agg::trans_affine agg_trans = py_to_agg_transformation_matrix(trans, false);
+        agg::rect_base<double> clip_rect(rect[0], rect[1], rect[2], rect[3]);
 
-    PathCleanupIterator* pipeline = new PathCleanupIterator(
-      path, agg_trans, remove_nans != 0, do_clip != 0,
-      clip_rect, quantize_mode, do_simplify != 0);
+        PathCleanupIterator* pipeline = new PathCleanupIterator(
+            path, agg_trans, remove_nans != 0, do_clip != 0,
+            clip_rect, quantize_mode, do_simplify != 0);
 
-    return (void*)pipeline;
-  }
+        return (void*)pipeline;
+    }
 
-  unsigned
-  get_vertex(void* pipeline, double* x, double* y)
-  {
-    PathCleanupIterator* pipeline_iter = (PathCleanupIterator*)pipeline;
+    unsigned
+    get_vertex(void* pipeline, double* x, double* y)
+    {
+        PathCleanupIterator* pipeline_iter = (PathCleanupIterator*)pipeline;
 
-    unsigned code = pipeline_iter->vertex(x, y);
-    return code;
-  }
+        unsigned code = pipeline_iter->vertex(x, y);
+        return code;
+    }
 
-  void
-  free_path_iterator(void* pipeline)
-  {
-    PathCleanupIterator* pipeline_iter = (PathCleanupIterator*)pipeline;
+    void
+    free_path_iterator(void* pipeline)
+    {
+        PathCleanupIterator* pipeline_iter = (PathCleanupIterator*)pipeline;
 
-    delete pipeline_iter;
-  }
+        delete pipeline_iter;
+    }
 }
 

Modified: trunk/matplotlib/src/path_cleanup.h
===================================================================
--- trunk/matplotlib/src/path_cleanup.h	2009-02-09 20:06:32 UTC (rev 6896)
+++ trunk/matplotlib/src/path_cleanup.h	2009-02-09 20:06:49 UTC (rev 6897)
@@ -12,8 +12,8 @@
 
 void*
 get_path_iterator(
-  PyObject* path, PyObject* trans, int remove_nans, int do_clip,
-  double rect[4], e_quantize_mode quantize_mode, int do_simplify);
+    PyObject* path, PyObject* trans, int remove_nans, int do_clip,
+    double rect[4], e_quantize_mode quantize_mode, int do_simplify);
 
 unsigned
 get_vertex(void* pipeline, double* x, double* y);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6896] trunk/matplotlib/src/path_converters.h

[<md...@us...>]

Revision: 6896
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6896&view=rev
Author:   mdboom
Date:     2009-02-09 20:06:32 +0000 (Mon, 09 Feb 2009)

Log Message:
-----------
Add comment about how nan-removal on curves works.

Modified Paths:
--------------
    trunk/matplotlib/src/path_converters.h

Modified: trunk/matplotlib/src/path_converters.h
===================================================================
--- trunk/matplotlib/src/path_converters.h	2009-02-09 18:49:49 UTC (rev 6895)
+++ trunk/matplotlib/src/path_converters.h	2009-02-09 20:06:32 UTC (rev 6896)
@@ -151,6 +151,10 @@
 
             bool needs_move_to = false;
             while (true) {
+                /* The approach here is to push each full curve
+                   segment into the queue.  If any non-finite values
+                   are found along the way, the queue is emptied, and
+                   the next curve segment is handled. */
                 code = m_source->vertex(x, y);
                 if (code == agg::path_cmd_stop ||
                     code == (agg::path_cmd_end_poly | agg::path_flags_close))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6895] trunk/matplotlib/lib/matplotlib/axes.py

[<md...@us...>]

Revision: 6895
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6895&view=rev
Author:   mdboom
Date:     2009-02-09 18:49:49 +0000 (Mon, 09 Feb 2009)

Log Message:
-----------
Very minor indentation fix.

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/axes.py

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2009-02-09 18:23:56 UTC (rev 6894)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2009-02-09 18:49:49 UTC (rev 6895)
@@ -140,7 +140,8 @@
         self.colors = _process_plot_var_args.defaultColors[:]
         # if the default line color is a color format string, move it up
         # in the que
-        try: ind = self.colors.index(rcParams['lines.color'])
+        try:
+            ind = self.colors.index(rcParams['lines.color'])
         except ValueError:
             self.firstColor = rcParams['lines.color']
         else:
@@ -7415,7 +7416,7 @@
         return the tight bounding box of the axes.
         The dimension of the Bbox in canvas coordinate.
         """
-        
+
         artists = []
         bb = []
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6894] trunk/matplotlib/src/_path.cpp

[<md...@us...>]

Revision: 6894
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6894&view=rev
Author:   mdboom
Date:     2009-02-09 18:23:56 +0000 (Mon, 09 Feb 2009)

Log Message:
-----------
Avoid use of "not found everywhere" uint8_t with npy_uint8, since we do include and rely on Numpy.

Modified Paths:
--------------
    trunk/matplotlib/src/_path.cpp

Modified: trunk/matplotlib/src/_path.cpp
===================================================================
--- trunk/matplotlib/src/_path.cpp	2009-02-09 13:32:34 UTC (rev 6893)
+++ trunk/matplotlib/src/_path.cpp	2009-02-09 18:23:56 UTC (rev 6894)
@@ -1205,7 +1205,7 @@
 template<class VertexSource>
 void __cleanup_path(VertexSource& source,
                     std::vector<double>& vertices,
-                    std::vector<uint8_t>& codes) {
+                    std::vector<npy_uint8>& codes) {
     unsigned code;
     double x, y;
     do
@@ -1213,7 +1213,7 @@
         code = source.vertex(&x, &y);
         vertices.push_back(x);
         vertices.push_back(y);
-        codes.push_back((uint8_t)code);
+        codes.push_back((npy_uint8)code);
     } while (code != agg::path_cmd_stop);
 }
 
@@ -1222,7 +1222,7 @@
                    const agg::rect_base<double>& rect,
                    e_quantize_mode quantize_mode, bool do_simplify,
                    bool return_curves, std::vector<double>& vertices,
-                   std::vector<uint8_t>& codes) {
+                   std::vector<npy_uint8>& codes) {
     typedef agg::conv_transform<PathIterator>  transformed_path_t;
     typedef PathNanRemover<transformed_path_t> nan_removal_t;
     typedef PathClipper<nan_removal_t>         clipped_t;
@@ -1306,7 +1306,7 @@
     bool return_curves = args[6].isTrue();
 
     std::vector<double> vertices;
-    std::vector<uint8_t> codes;
+    std::vector<npy_uint8> codes;
 
     _cleanup_path(path, trans, remove_nans, do_clip, clip_rect, quantize_mode,
                   simplify, return_curves, vertices, codes);
@@ -1333,7 +1333,7 @@
         }
 
         memcpy(PyArray_DATA(vertices_obj), &vertices[0], sizeof(double) * 2 * length);
-        memcpy(PyArray_DATA(codes_obj), &codes[0], sizeof(uint8_t) * length);
+        memcpy(PyArray_DATA(codes_obj), &codes[0], sizeof(npy_uint8) * length);
 
         result[0] = Py::Object((PyObject*)vertices_obj, true);
         result[1] = Py::Object((PyObject*)codes_obj, true);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6893] trunk/matplotlib

[<md...@us...>]

Revision: 6893
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6893&view=rev
Author:   mdboom
Date:     2009-02-09 13:32:34 +0000 (Mon, 09 Feb 2009)

Log Message:
-----------
Merged revisions 6890-6891 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint

........
  r6890 | jdh2358 | 2009-02-08 15:29:42 -0500 (Sun, 08 Feb 2009) | 1 line
  
  bumped the version number for bugfix release
........
  r6891 | mdboom | 2009-02-09 08:15:45 -0500 (Mon, 09 Feb 2009) | 2 lines
  
  Fix URLs in matplotlibrc.template (thanks, Sandro Tosi)
........

Modified Paths:
--------------
    trunk/matplotlib/matplotlibrc.template

Property Changed:
----------------
    trunk/matplotlib/
    trunk/matplotlib/doc/pyplots/README
    trunk/matplotlib/doc/sphinxext/gen_gallery.py
    trunk/matplotlib/doc/sphinxext/gen_rst.py


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6886
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6892
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891


Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886
   + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891


Property changes on: trunk/matplotlib/doc/sphinxext/gen_gallery.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886
   + /branches/v0_91_maint/doc/_templates/gen_gallery.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_gallery.py:6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891


Property changes on: trunk/matplotlib/doc/sphinxext/gen_rst.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886
   + /branches/v0_91_maint/doc/examples/gen_rst.py:5753-5771
/branches/v0_98_5_maint/doc/sphinxext/gen_rst.py:6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891

Modified: trunk/matplotlib/matplotlibrc.template
===================================================================
--- trunk/matplotlib/matplotlibrc.template	2009-02-09 13:31:18 UTC (rev 6892)
+++ trunk/matplotlib/matplotlibrc.template	2009-02-09 13:32:34 UTC (rev 6893)
@@ -35,7 +35,7 @@
 # you if backend_fallback is True
 #backend_fallback: True
 numerix      : %(numerix)s  # numpy, Numeric or numarray
-#interactive  : False      # see http://matplotlib.sourceforge.net/interactive.html
+#interactive  : False
 #toolbar      : toolbar2   # None | classic | toolbar2
 #timezone     : UTC        # a pytz timezone string, eg US/Central or Europe/Paris
 
@@ -45,7 +45,7 @@
 
 
 ### LINES
-# See http://matplotlib.sourceforge.net/matplotlib.lines.html for more
+# See http://matplotlib.sourceforge.net/api/artist_api.html#module-matplotlib.lines for more
 # information on line properties.
 #lines.linewidth   : 1.0     # line width in points
 #lines.linestyle   : -       # solid line
@@ -62,7 +62,7 @@
 ### PATCHES
 # Patches are graphical objects that fill 2D space, like polygons or
 # circles.  See
-# http://matplotlib.sourceforge.net/matplotlib.patches.html for more
+# http://matplotlib.sourceforge.net/api/artist_api.html#module-matplotlib.patches
 # information on patch properties
 #patch.linewidth   	: 1.0     # edge width in points
 #patch.facecolor  	: blue
@@ -72,7 +72,7 @@
 ### FONT
 #
 # font properties used by text.Text.  See
-# http://matplotlib.sourceforge.net/matplotlib.font_manager.html for more
+# http://matplotlib.sourceforge.net/api/font_manager_api.html for more
 # information on font properties.  The 6 font properties used for font
 # matching are given below with their default values.
 #
@@ -123,7 +123,7 @@
 
 ### TEXT
 # text properties used by text.Text.  See
-# http://matplotlib.sourceforge.net/matplotlib.text.html for more
+# http://matplotlib.sourceforge.net/api/artist_api.html#module-matplotlib.text for more
 # information on text properties
 
 #text.color          : black
@@ -193,7 +193,7 @@
 ### AXES
 # default face and edge color, default tick sizes,
 # default fontsizes for ticklabels, and so on.  See
-# http://matplotlib.sourceforge.net/matplotlib.axes.html#Axes
+# http://matplotlib.sourceforge.net/api/axes_api.html#module-matplotlib.axes
 #axes.hold           : True    # whether to clear the axes by default on
 #axes.facecolor      : white   # axes background color
 #axes.edgecolor      : black   # axes edge color
@@ -213,7 +213,7 @@
 #polaraxes.grid      : True    # display grid on polar axes
 
 ### TICKS
-# see http://matplotlib.sourceforge.net/matplotlib.axis.html#Ticks
+# see http://matplotlib.sourceforge.net/api/axis_api.html#matplotlib.axis.Tick
 #xtick.major.size     : 4      # major tick size in points
 #xtick.minor.size     : 2      # minor tick size in points
 #xtick.major.pad      : 4      # distance to major tick label in points
@@ -253,7 +253,7 @@
 #legend.shadow        : False
 
 ### FIGURE
-# See http://matplotlib.sourceforge.net/matplotlib.figure.html#Figure
+# See http://matplotlib.sourceforge.net/api/figure_api.html#matplotlib.figure.Figure
 #figure.figsize   : 8, 6    # figure size in inches
 #figure.dpi       : 80      # figure dots per inch
 #figure.facecolor : 0.75    # figure facecolor; 0.75 is scalar gray


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6892] trunk/matplotlib/src/path_converters.h

[<md...@us...>]

Revision: 6892
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6892&view=rev
Author:   mdboom
Date:     2009-02-09 13:31:18 +0000 (Mon, 09 Feb 2009)

Log Message:
-----------
Remove extraneous "public:"

Modified Paths:
--------------
    trunk/matplotlib/src/path_converters.h

Modified: trunk/matplotlib/src/path_converters.h
===================================================================
--- trunk/matplotlib/src/path_converters.h	2009-02-09 13:15:45 UTC (rev 6891)
+++ trunk/matplotlib/src/path_converters.h	2009-02-09 13:31:18 UTC (rev 6892)
@@ -366,7 +366,6 @@
 template<class VertexSource>
 class PathQuantizer
 {
- public:
  private:
     VertexSource* m_source;
     bool          m_quantize;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6891] branches/v0_98_5_maint/matplotlibrc.template

[<md...@us...>]

Revision: 6891
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6891&view=rev
Author:   mdboom
Date:     2009-02-09 13:15:45 +0000 (Mon, 09 Feb 2009)

Log Message:
-----------
Fix URLs in matplotlibrc.template (thanks, Sandro Tosi)

Modified Paths:
--------------
    branches/v0_98_5_maint/matplotlibrc.template

Modified: branches/v0_98_5_maint/matplotlibrc.template
===================================================================
--- branches/v0_98_5_maint/matplotlibrc.template	2009-02-08 20:29:42 UTC (rev 6890)
+++ branches/v0_98_5_maint/matplotlibrc.template	2009-02-09 13:15:45 UTC (rev 6891)
@@ -38,7 +38,7 @@
 #maskedarray : False       # True to use external maskedarray module
                            # instead of numpy.ma; this is a temporary
                            # setting for testing maskedarray.
-#interactive  : False      # see http://matplotlib.sourceforge.net/interactive.html
+#interactive  : False
 #toolbar      : toolbar2   # None | classic | toolbar2
 #timezone     : UTC        # a pytz timezone string, eg US/Central or Europe/Paris
 
@@ -48,7 +48,7 @@
 
 
 ### LINES
-# See http://matplotlib.sourceforge.net/matplotlib.lines.html for more
+# See http://matplotlib.sourceforge.net/api/artist_api.html#module-matplotlib.lines for more
 # information on line properties.
 #lines.linewidth   : 1.0     # line width in points
 #lines.linestyle   : -       # solid line
@@ -65,7 +65,7 @@
 ### PATCHES
 # Patches are graphical objects that fill 2D space, like polygons or
 # circles.  See
-# http://matplotlib.sourceforge.net/matplotlib.patches.html for more
+# http://matplotlib.sourceforge.net/api/artist_api.html#module-matplotlib.patches
 # information on patch properties
 #patch.linewidth   	: 1.0     # edge width in points
 #patch.facecolor  	: blue
@@ -75,7 +75,7 @@
 ### FONT
 #
 # font properties used by text.Text.  See
-# http://matplotlib.sourceforge.net/matplotlib.font_manager.html for more
+# http://matplotlib.sourceforge.net/api/font_manager_api.html for more
 # information on font properties.  The 6 font properties used for font
 # matching are given below with their default values.
 #
@@ -126,7 +126,7 @@
 
 ### TEXT
 # text properties used by text.Text.  See
-# http://matplotlib.sourceforge.net/matplotlib.text.html for more
+# http://matplotlib.sourceforge.net/api/artist_api.html#module-matplotlib.text for more
 # information on text properties
 
 #text.color          : black
@@ -191,7 +191,7 @@
 ### AXES
 # default face and edge color, default tick sizes,
 # default fontsizes for ticklabels, and so on.  See
-# http://matplotlib.sourceforge.net/matplotlib.axes.html#Axes
+# http://matplotlib.sourceforge.net/api/axes_api.html#module-matplotlib.axes
 #axes.hold           : True    # whether to clear the axes by default on
 #axes.facecolor      : white   # axes background color
 #axes.edgecolor      : black   # axes edge color
@@ -211,7 +211,7 @@
 #polaraxes.grid      : True    # display grid on polar axes
 
 ### TICKS
-# see http://matplotlib.sourceforge.net/matplotlib.axis.html#Ticks
+# see http://matplotlib.sourceforge.net/api/axis_api.html#matplotlib.axis.Tick
 #xtick.major.size     : 4      # major tick size in points
 #xtick.minor.size     : 2      # minor tick size in points
 #xtick.major.pad      : 4      # distance to major tick label in points
@@ -251,7 +251,7 @@
 #legend.shadow        : False
 
 ### FIGURE
-# See http://matplotlib.sourceforge.net/matplotlib.figure.html#Figure
+# See http://matplotlib.sourceforge.net/api/figure_api.html#matplotlib.figure.Figure
 #figure.figsize   : 8, 6    # figure size in inches
 #figure.dpi       : 80      # figure dots per inch
 #figure.facecolor : 0.75    # figure facecolor; 0.75 is scalar gray


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6890] branches/v0_98_5_maint/lib/matplotlib/ __init__.py

[<jd...@us...>]

Revision: 6890
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6890&view=rev
Author:   jdh2358
Date:     2009-02-08 20:29:42 +0000 (Sun, 08 Feb 2009)

Log Message:
-----------
bumped the version number for bugfix release

Modified Paths:
--------------
    branches/v0_98_5_maint/lib/matplotlib/__init__.py

Modified: branches/v0_98_5_maint/lib/matplotlib/__init__.py
===================================================================
--- branches/v0_98_5_maint/lib/matplotlib/__init__.py	2009-02-07 21:19:11 UTC (rev 6889)
+++ branches/v0_98_5_maint/lib/matplotlib/__init__.py	2009-02-08 20:29:42 UTC (rev 6890)
@@ -89,7 +89,7 @@
 """
 from __future__ import generators
 
-__version__  = '0.98.5.2'
+__version__  = '0.98.5.3'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6889] trunk/matplotlib

[<ef...@us...>]

Revision: 6889
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6889&view=rev
Author:   efiring
Date:     2009-02-07 21:19:11 +0000 (Sat, 07 Feb 2009)

Log Message:
-----------
Restore interpolation in polar_bar plot, and update docstring in pyplot

Modified Paths:
--------------
    trunk/matplotlib/examples/pylab_examples/polar_bar.py
    trunk/matplotlib/lib/matplotlib/pyplot.py

Modified: trunk/matplotlib/examples/pylab_examples/polar_bar.py
===================================================================
--- trunk/matplotlib/examples/pylab_examples/polar_bar.py	2009-02-06 13:12:38 UTC (rev 6888)
+++ trunk/matplotlib/examples/pylab_examples/polar_bar.py	2009-02-07 21:19:11 UTC (rev 6889)
@@ -7,7 +7,7 @@
 
 # force square figure and square axes looks better for polar, IMO
 fig = figure(figsize=(8,8))
-ax = fig.add_axes([0.1, 0.1, 0.8, 0.8], polar=True)
+ax = fig.add_axes([0.1, 0.1, 0.8, 0.8], polar=True, resolution=50)
 
 N = 20
 theta = np.arange(0.0, 2*np.pi, 2*np.pi/N)

Modified: trunk/matplotlib/lib/matplotlib/pyplot.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/pyplot.py	2009-02-06 13:12:38 UTC (rev 6888)
+++ trunk/matplotlib/lib/matplotlib/pyplot.py	2009-02-07 21:19:11 UTC (rev 6889)
@@ -1418,8 +1418,8 @@
     with format strings, as in :func:`~matplotlib.pyplot.plot`.
 
     An optional kwarg *resolution* sets the number of vertices to
-    interpolate between each pair of points.  Set to 1 to disable
-    interpolation.
+    interpolate between each pair of points.  The default is 1,
+    which disables interpolation.
     """
     resolution = kwargs.pop('resolution', None)
     ax = gca(polar=True, resolution=resolution)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

SF.net SVN: matplotlib:[6888] trunk/toolkits/basemap/lib/mpl_toolkits/ basemap/__init__.py

[<js...@us...>]

Revision: 6888
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6888&view=rev
Author:   jswhit
Date:     2009-02-06 13:12:38 +0000 (Fri, 06 Feb 2009)

Log Message:
-----------
import cm into basemap namespace 

Modified Paths:
--------------
    trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py

Modified: trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py
===================================================================
--- trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2009-02-06 02:51:24 UTC (rev 6887)
+++ trunk/toolkits/basemap/lib/mpl_toolkits/basemap/__init__.py	2009-02-06 13:12:38 UTC (rev 6888)
@@ -41,6 +41,7 @@
 import numpy.ma as ma
 from shapelib import ShapeFile
 import _geoslib, netcdftime
+import cm
 
 # basemap data files now installed in lib/matplotlib/toolkits/basemap/data
 # check to see if environment variable BASEMAPDATA set to a directory,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.