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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

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

........
  r6934 | mdboom | 2009-02-25 10:39:34 -0500 (Wed, 25 Feb 2009) | 2 lines
  
  Fix crashes with empty data and step draw style.
........

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

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


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6928
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6934
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,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928
   + /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,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934


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,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928
   + /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,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934


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,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928
   + /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,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934


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,6890-6891,6911-6912,6915-6916,6918,6920-6925,6927-6928
   + /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,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934

Modified: trunk/matplotlib/lib/matplotlib/lines.py
===================================================================

--- trunk/matplotlib/lib/matplotlib/lines.py	2009-02-25 15:39:34 UTC (rev 6934)
+++ trunk/matplotlib/lib/matplotlib/lines.py	2009-02-25 15:45:45 UTC (rev 6935)
@@ -486,10 +486,11 @@
         funcname = self._lineStyles.get(self._linestyle, '_draw_nothing')
         if funcname != '_draw_nothing':
             tpath, affine = self._transformed_path.get_transformed_path_and_affine()
-            self._lineFunc = getattr(self, funcname)
-            funcname = self.drawStyles.get(self._drawstyle, '_draw_lines')
-            drawFunc = getattr(self, funcname)
-            drawFunc(renderer, gc, tpath, affine.frozen())
+            if len(tpath.vertices):
+                self._lineFunc = getattr(self, funcname)
+                funcname = self.drawStyles.get(self._drawstyle, '_draw_lines')
+                drawFunc = getattr(self, funcname)
+                drawFunc(renderer, gc, tpath, affine.frozen())
 
         if self._marker is not None:
             gc = renderer.new_gc()
@@ -500,25 +501,25 @@
             funcname = self._markers.get(self._marker, '_draw_nothing')
             if funcname != '_draw_nothing':
                 tpath, affine = self._transformed_path.get_transformed_points_and_affine()
-
-                # subsample the markers if markevery is not None
-                markevery = self.get_markevery()
-                if markevery is not None:
-                    if iterable(markevery):
-                        startind, stride = markevery
+                if len(tpath.vertices):
+                    # subsample the markers if markevery is not None
+                    markevery = self.get_markevery()
+                    if markevery is not None:
+                        if iterable(markevery):
+                            startind, stride = markevery
+                        else:
+                            startind, stride = 0, markevery
+                        if tpath.codes is not None:
+                            codes = tpath.codes[startind::stride]
+                        else:
+                            codes = None
+                        vertices = tpath.vertices[startind::stride]
+                        subsampled = Path(vertices, codes)
                     else:
-                        startind, stride = 0, markevery
-                    if tpath.codes is not None:
-                        codes = tpath.codes[startind::stride]
-                    else:
-                        codes = None
-                    vertices = tpath.vertices[startind::stride]
-                    subsampled = Path(vertices, codes)
-                else:
-                    subsampled = tpath
+                        subsampled = tpath
 
-                markerFunc = getattr(self, funcname)
-                markerFunc(renderer, gc, subsampled, affine.frozen())
+                    markerFunc = getattr(self, funcname)
+                    markerFunc(renderer, gc, subsampled, affine.frozen())
 
         renderer.close_group('line2d')
 


Property changes on: trunk/matplotlib/lib/matplotlib/sphinxext/plot_directive.py
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925
   + /branches/v0_91_maint/doc/sphinxext/plot_directive.py:5753-5771
/branches/v0_98_5_maint/lib/matplotlib/sphinxext/plot_directive.py:6920-6925,6934


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


