From de7154e8e96e59083aec78bbf5a504c16dfdaf9e Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Fri, 27 Mar 2020 09:56:07 +0100
Subject: [PATCH] Gerber plotter: Non horiz or vertical oval pads: better plot
 output: These pads were plotted as a segment. This is not the right way. Pads
 must be flashed or plotted as regions, not painted. They are now plotted as
 Gerber regions round rectangle pads. These regions are similar to flashed
 pads.

---
 common/plotters/GERBER_plotter.cpp | 47 +++++++++++++-----------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/common/plotters/GERBER_plotter.cpp b/common/plotters/GERBER_plotter.cpp
index 3f81acbc75..96c93f39a8 100644
--- a/common/plotters/GERBER_plotter.cpp
+++ b/common/plotters/GERBER_plotter.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2019 Jean-Pierre Charras, jp.charras at wanadoo.fr
- * Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors.
+ * Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -794,33 +794,28 @@ void GERBER_PLOTTER::FlashPadOval( const wxPoint& pos, const wxSize& aSize, doub
     else    // Plot pad as region.
             // Only regions and flashed items accept a object attribute TO.P for the pin name
     {
-        if( size.x > size.y )
-        {
-            std::swap( size.x, size.y );
-
-            if( orient < 2700 )
-                orient += 900;
-            else
-                orient -= 2700;
-        }
-
         if( trace_mode == FILLED )
         {
-            // TODO: use an aperture macro to declare the rotated pad
-            // to be able to flash the shape
-            // For now, the pad is drawn as thick segment (painted with only one segment)
-
-            // The pad is reduced to an segment with dy > dx
-            int delta = size.y - size.x;
-            wxPoint p0( 0, -delta / 2 );
-            wxPoint p1( 0, delta / 2 );
-            RotatePoint( &p0.x, &p0.y, orient );
-            RotatePoint( &p1.x, &p1.y, orient );
-
-            ThickSegment( pos + p0, pos + p1, size.x, trace_mode, gbr_metadata );
+            // Draw the oval as round rect pad with a radius = 50% min size)
+            // In gerber file, it will be drawn as a region with arcs, and can be
+            // detected as pads (similar to a flashed pad)
+            FlashPadRoundRect( pos, aSize, std::min( aSize.x, aSize.y ) /2,
+                               orient, FILLED, aData );
         }
-        else
+        else    // Non filled shape: plot outlines:
+        {
+            if( size.x > size.y )
+            {
+                std::swap( size.x, size.y );
+
+                if( orient < 2700 )
+                    orient += 900;
+                else
+                    orient -= 2700;
+            }
+
             sketchOval( pos, size, orient, -1 );
+        }
     }
 }
 
@@ -869,7 +864,7 @@ void GERBER_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& aSize,
         break;
 
     default: // plot pad shape as Gerber region
-    {
+        {
         wxPoint coord[4];
         // coord[0] is assumed the lower left
         // coord[1] is assumed the upper left
@@ -886,7 +881,7 @@ void GERBER_PLOTTER::FlashPadRect( const wxPoint& pos, const wxSize& aSize,
         coord[3].y = size.y/2;
 
         FlashPadTrapez( pos, coord, orient, trace_mode, aData );
-    }
+        }
     break;
     }
 }