Gerbview: fix incorrect rendering of oval vertical standard aperture with hole.

Fix also incorrect display of dcode size in toolbal: was Y size  X size.
Now is X size Y size, as expected.
This commit is contained in:
jean-pierre charras
2020-04-10 16:02:15 +02:00
parent 962aa73e12
commit 9e656fe5eb
3 changed files with 10 additions and 11 deletions
+4 -7
View File
@@ -224,14 +224,14 @@ void D_CODE::DrawFlashedShape( GERBER_DRAW_ITEM* aParent,
int delta = (m_Size.x - m_Size.y) / 2;
start.x -= delta;
end.x += delta;
radius = m_Size.y;
radius = m_Size.y; // Width in fact
}
else // horizontal oval
else // vertical oval
{
int delta = (m_Size.y - m_Size.x) / 2;
start.y -= delta;
end.y += delta;
radius = m_Size.x;
radius = m_Size.x; // Width in fact
}
start = aParent->GetABPosition( start );
@@ -375,10 +375,7 @@ void D_CODE::ConvertShapeToPolygon()
m_Polygon.Append( VECTOR2I( initialpos ) ); // close outline
if( m_Size.y > m_Size.x ) // vertical oval, rotate polygon.
{
for( auto it = m_Polygon.Iterate( 0 ); it; ++it )
it->Rotate( -M_PI / 2 );
}
m_Polygon.Rotate( -M_PI / 2 );
addHoleToPolygon( &m_Polygon, m_DrillShape, m_Drill, initialpos );
}