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

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

Revision: 8825
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8825&view=rev
Author:   mdboom
Date:     2010-12-10 14:17:29 +0000 (Fri, 10 Dec 2010)

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

........
  r8824 | mdboom | 2010-12-10 09:16:11 -0500 (Fri, 10 Dec 2010) | 2 lines
  
  Fix polygon closing on triangle markers (Bug #3102034)
........

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

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


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8822 /trunk/matplotlib:1-7315
   + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8824 /trunk/matplotlib:1-7315

Modified: trunk/matplotlib/lib/matplotlib/lines.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/lines.py	2010-12-10 14:16:11 UTC (rev 8824)
+++ trunk/matplotlib/lib/matplotlib/lines.py	2010-12-10 14:17:29 UTC (rev 8825)
@@ -800,11 +800,11 @@
 
 
 
-        ACCEPTS: [ ``'+'`` | ``'*'`` | ``','`` | ``'.'`` 
+        ACCEPTS: [ ``'+'`` | ``'*'`` | ``','`` | ``'.'``
                  | ``'1'`` | ``'2'`` | ``'3'`` | ``'4'``
-                 | ``'<'`` | ``'>'`` | ``'D'`` | ``'H'`` 
-                 | ``'^'`` | ``'_'`` | ``'d'`` | ``'h'`` 
-                 | ``'o'`` | ``'p'`` | ``'s'`` | ``'v'`` 
+                 | ``'<'`` | ``'>'`` | ``'D'`` | ``'H'``
+                 | ``'^'`` | ``'_'`` | ``'d'`` | ``'h'``
+                 | ``'o'`` | ``'p'`` | ``'s'`` | ``'v'``
                  | ``'x'`` | ``'|'``
                  | TICKUP | TICKDOWN | TICKLEFT | TICKRIGHT
                  | CARETUP | CARETDOWN | CARETLEFT | CARETRIGHT
@@ -1072,12 +1072,17 @@
                                   path, path_trans, rgbFace_alt)
 
 
-    _triangle_path = Path([[0.0, 1.0], [-1.0, -1.0], [1.0, -1.0], [0.0, 1.0]])
+    _triangle_path = Path([[0.0, 1.0], [-1.0, -1.0], [1.0, -1.0], [0.0, 1.0]],
+                          [Path.MOVETO, Path.LINETO, Path.LINETO, Path.CLOSEPOLY])
     # Going down halfway looks to small.  Golden ratio is too far.
-    _triangle_path_u = Path([[0.0, 1.0], [-3/5., -1/5.], [3/5., -1/5.], [0.0, 1.0]])
-    _triangle_path_d = Path([[-3/5., -1/5.], [3/5., -1/5.], [1.0, -1.0], [-1.0, -1.0], [-3/5., -1/5.]])
-    _triangle_path_l = Path([[0.0, 1.0], [0.0, -1.0], [-1.0, -1.0], [0.0, 1.0]])
-    _triangle_path_r = Path([[0.0, 1.0], [0.0, -1.0], [1.0, -1.0], [0.0, 1.0]])
+    _triangle_path_u = Path([[0.0, 1.0], [-3/5., -1/5.], [3/5., -1/5.], [0.0, 1.0]],
+                            [Path.MOVETO, Path.LINETO, Path.LINETO, Path.CLOSEPOLY])
+    _triangle_path_d = Path([[-3/5., -1/5.], [3/5., -1/5.], [1.0, -1.0], [-1.0, -1.0], [-3/5., -1/5.]],
+                            [Path.MOVETO, Path.LINETO, Path.LINETO, Path.LINETO, Path.CLOSEPOLY])
+    _triangle_path_l = Path([[0.0, 1.0], [0.0, -1.0], [-1.0, -1.0], [0.0, 1.0]],
+                            [Path.MOVETO, Path.LINETO, Path.LINETO, Path.CLOSEPOLY])
+    _triangle_path_r = Path([[0.0, 1.0], [0.0, -1.0], [1.0, -1.0], [0.0, 1.0]],
+                            [Path.MOVETO, Path.LINETO, Path.LINETO, Path.CLOSEPOLY])
     def _draw_triangle(self, renderer, gc, path, path_trans, direction):
         gc.set_snap(renderer.points_to_pixels(self._markersize) >= 5.0)
         offset = 0.5*renderer.points_to_pixels(self._markersize)


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