From 60669e9b50fd4d314a50d9bcc3dcb7516f35c191 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Wed, 27 Jun 2018 22:38:14 +0200
Subject: [PATCH] Harmonize wxGraphicsPathData::AddArcToPoint() behaviour
 across all ports

AddArcToPoint() on macOS port is implemented with native API (CGPathAddArcToPoint) so its behaviour should be considered as a reference for generic implementation used in another ports.

Closes #18086.
---
 docs/doxygen/images/drawing-addarctopoint.png | Bin 0 -> 3386 bytes
 interface/wx/graphics.h                       |  11 ++++++++---
 src/common/graphcmn.cpp                       |   4 ----
 3 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 docs/doxygen/images/drawing-addarctopoint.png

diff --git a/docs/doxygen/images/drawing-addarctopoint.png b/docs/doxygen/images/drawing-addarctopoint.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3aa71932a168a6e39f4fbe5be752d77934ed77e
GIT binary patch
literal 3386
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
QyZ`_I07*qoM6N<$f&n09UH||9

literal 0
HcmV?d00001

diff --git a/interface/wx/graphics.h b/interface/wx/graphics.h
index 792821e61d..7361413c4b 100644
--- a/interface/wx/graphics.h
+++ b/interface/wx/graphics.h
@@ -50,9 +50,14 @@ public:
     //@}
 
     /**
-        Appends a an arc to two tangents connecting (current) to (@a x1,@a y1)
-        and (@a x1,@a y1) to (@a x2,@a y2), also a straight line from (current)
-        to (@a x1,@a y1).
+        Adds an arc (of a circle with radius @a r) that is tangent
+        to the line connecting current point and (@a x1, @a y1) and
+        to the line connecting (@a x1, @a y1) and (@a x2, @a y2).
+        If the current point and the starting point of the arc are different,
+        a straight line connecting these points is also appended.
+        After this call the current point will be at the ending point
+        of the arc.
+        @image html drawing-addarctopoint.png
     */
     virtual void AddArcToPoint(wxDouble x1, wxDouble y1, wxDouble x2,
                                wxDouble y2, wxDouble r);
diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp
index a48d03c37d..3d70b9a202 100644
--- a/src/common/graphcmn.cpp
+++ b/src/common/graphcmn.cpp
@@ -479,7 +479,6 @@ void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2,
          alpha == 0 || alpha == 180 || r == 0 )
     {
         AddLineToPoint(p1.m_x, p1.m_y);
-        AddLineToPoint(p2.m_x, p2.m_y);
         return;
     }
 
@@ -489,8 +488,6 @@ void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2,
     alpha = wxDegToRad(alpha);
     wxDouble distT = r / sin(alpha) * (1.0 + cos(alpha)); // = r / tan(a/2) =  r / sin(a/2) * cos(a/2)
     wxDouble distC = r / sin(alpha / 2.0);
-    wxASSERT_MSG( distT <= v1Length && distT <= v2Length,
-                  wxS("Radius is too big to fit the arc to given points") );
     // Calculate tangential points
     v1.Normalize();
     v2.Normalize();
@@ -513,7 +510,6 @@ void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2,
 
     AddLineToPoint(t1.m_x, t1.m_y);
     AddArc(c.m_x, c.m_y, r, wxDegToRad(a1), wxDegToRad(a2), drawClockwiseArc);
-    AddLineToPoint(p2.m_x, p2.m_y);
 }
 
 //-----------------------------------------------------------------------------