matplotlib · jklymak · May 28, 2018 · May 28, 2018 · jklymak · May 28, 2018
diff --git a/lib/matplotlib/bezier.py b/lib/matplotlib/bezier.py
@@ -31,8 +31,9 @@ def get_intersection(cx1, cy1, cos_t1, sin_t1,
    c, d = sin_t2, -cos_t2

    ad_bc = a * d - b * c
-    if ad_bc == 0.:
-        raise ValueError("Given lines do not intersect")
+    if np.abs(ad_bc) < 1.0e-12:
+        raise ValueError("Given lines do not intersect. Please verify that "
+                         "the angles are not equal or differ by 180 degrees.")

    # rhs_inverse
    a_, b_ = d, -b

diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -2789,8 +2789,8 @@ class Angle3(_Base):
        """
        Creates a simple quadratic Bezier curve between two
        points. The middle control points is placed at the
-        intersecting point of two lines which crosses the start (or
-        end) point and has a angle of angleA (or angleB).
+        intersecting point of two lines which cross the start and
+        end point, and have a slope of angleA and angleB, respectively.
        """

        def __init__(self, angleA=90, angleB=0):
@@ -2827,9 +2827,9 @@ class Angle(_Base):
        """
        Creates a piecewise continuous quadratic Bezier path between
        two points. The path has a one passing-through point placed at
-        the intersecting point of two lines which crosses the start
-        (or end) point and has a angle of angleA (or angleB).  The
-        connecting edges are rounded with *rad*.
+        the intersecting point of two lines which cross the start
+        and end point, and have a slope of angleA and angleB, respectively.
+        The connecting edges are rounded with *rad*.
        """

        def __init__(self, angleA=90, angleB=0, rad=0.):

diff --git a/lib/matplotlib/tests/baseline_images/test_arrow_patches/connection_styles.png b/lib/matplotlib/tests/baseline_images/test_arrow_patches/connection_styles.png
diff --git a/lib/matplotlib/tests/test_arrow_patches.py b/lib/matplotlib/tests/test_arrow_patches.py
@@ -1,3 +1,4 @@
+import pytest
 import matplotlib.pyplot as plt
 from matplotlib.testing.decorators import image_comparison
 import matplotlib.patches as mpatches
@@ -133,3 +134,34 @@ def test_arrow_styles():
                                         arrowstyle=stylename,
                                         mutation_scale=25)
        ax.add_patch(patch)
+
+
+@image_comparison(baseline_images=['connection_styles'], extensions=['png'],
+                  style='mpl20', remove_text=True)
+def test_connection_styles():
+    styles = mpatches.ConnectionStyle.get_styles()
+
+    n = len(styles)
+    fig, ax = plt.subplots(figsize=(6, 10))
+    ax.set_xlim(0, 1)
+    ax.set_ylim(-1, n)
+
+    for i, stylename in enumerate(sorted(styles)):
+        patch = mpatches.FancyArrowPatch((0.1, i), (0.8, i + 0.5),
+                                         arrowstyle="->",
+                                         connectionstyle=stylename,
+                                         mutation_scale=25)
+        ax.add_patch(patch)
+
+
+def test_invalid_intersection():
+    conn_style_1 = mpatches.ConnectionStyle.Angle3(angleA=20, angleB=200)
+    p1 = mpatches.FancyArrowPatch((.2, .2), (.5, .5),
+                                  connectionstyle=conn_style_1)
+    with pytest.raises(ValueError):
+        plt.gca().add_patch(p1)
+
+    conn_style_2 = mpatches.ConnectionStyle.Angle3(angleA=20, angleB=199.9)
+    p2 = mpatches.FancyArrowPatch((.2, .2), (.5, .5),
+                                  connectionstyle=conn_style_2)
+    plt.gca().add_patch(p2)
-Original file line number
+Diff line change
@@ -31,8 +31,9 @@ def get_intersection(cx1, cy1, cos_t1, sin_t1,
         c, d = sin_t2, -cos_t2
         ad_bc = a * d - b * c
-        if ad_bc == 0.:
-            raise ValueError("Given lines do not intersect")
+        if np.abs(ad_bc) < 1.0e-12:
             Copy link

  
      
    
  

  
      

  
  Member


      

  

  
    
      

      
            jklymak
  

      

      

      


        May 28, 2018


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      np.allclose?  https://docs.scipy.org/doc/numpy/reference/generated/numpy.allclose.html
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



    
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      

  
  Member


      

  Author


  

  
    
      

      
            ImportanceOfBeingErnest
  

      

      

      


        May 28, 2018


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      What's the difference between

np.abs(ad_bc) < 1.0e-12
np.isclose([0], [ad_bc], atol=1.0e-12)

Why would I prefer the longer over the shorter?
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
+            raise ValueError("Given lines do not intersect. Please verify that "
+                             "the angles are not equal or differ by 180 degrees.")
         # rhs_inverse
         a_, b_ = d, -b
-          Expand Down