haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix arc drawing algorithm in GerbView GAL (Fixes lp:1720384)

This commit is contained in:
Jon Evans 2017-10-25 23:30:25 -04:00 committed by jean-pierre charras
parent 1929727966
commit b18cd4cb19
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gerbview/gerbview_painter.cpp
View File

@ -294,12 +294,17 @@ void GERBVIEW_PAINTER::draw( /*const*/ GERBER_DRAW_ITEM* aItem, int aLayer )
{ {
isFilled = m_gerbviewSettings.m_lineFill; isFilled = m_gerbviewSettings.m_lineFill;
// These are swapped because wxDC fills arcs counterclockwise and GAL
// fills them clockwise.
wxPoint arcStart = aItem->m_End;
wxPoint arcEnd = aItem->m_Start;
// Gerber arcs are 3-point (start, center, end) // Gerber arcs are 3-point (start, center, end)
// GAL needs center, radius, start angle, end angle // GAL needs center, radius, start angle, end angle
double radius = GetLineLength( aItem->m_Start, aItem->m_ArcCentre ); double radius = GetLineLength( arcStart, aItem->m_ArcCentre );
VECTOR2D center = aItem->GetABPosition( aItem->m_ArcCentre ); VECTOR2D center = aItem->GetABPosition( aItem->m_ArcCentre );
VECTOR2D startVec = VECTOR2D( aItem->GetABPosition( aItem->m_Start ) ) - center; VECTOR2D startVec = VECTOR2D( aItem->GetABPosition( arcStart ) ) - center;
VECTOR2D endVec = VECTOR2D( aItem->GetABPosition( aItem->m_End ) ) - center; VECTOR2D endVec = VECTOR2D( aItem->GetABPosition( arcEnd ) ) - center;
m_gal->SetIsFill( isFilled ); m_gal->SetIsFill( isFilled );
m_gal->SetIsStroke( !isFilled ); m_gal->SetIsStroke( !isFilled );
@ -308,11 +313,14 @@ void GERBVIEW_PAINTER::draw( /*const*/ GERBER_DRAW_ITEM* aItem, int aLayer )
double startAngle = startVec.Angle(); double startAngle = startVec.Angle();
double endAngle = endVec.Angle(); double endAngle = endVec.Angle();
if( endAngle >= M_PI ) // GAL fills in direction of increasing angle, so we have to convert
endAngle *= -1; // the angle from the -PI to PI domain of atan2() to ensure that
// the arc goes in the right direction
if( ( startAngle > endAngle ) && ( endAngle < 0 ) )
endAngle += (2 * M_PI);
// 360-degree arcs are stored in the file with start equal to end // 360-degree arcs are stored in the file with start equal to end
if( aItem->m_Start == aItem->m_End ) if( arcStart == arcEnd )
{ {
startAngle = 0; startAngle = 0;
endAngle = 2 * M_PI; endAngle = 2 * M_PI;
@ -323,9 +331,9 @@ void GERBVIEW_PAINTER::draw( /*const*/ GERBER_DRAW_ITEM* aItem, int aLayer )
// Arc Debugging // Arc Debugging
// m_gal->SetLineWidth( 5 ); // m_gal->SetLineWidth( 5 );
// m_gal->SetStrokeColor( COLOR4D( 0.0, 1.0, 0.0, 1.0 ) ); // m_gal->SetStrokeColor( COLOR4D( 0.0, 1.0, 0.0, 1.0 ) );
// m_gal->DrawLine( center, aItem->GetABPosition( aItem->m_Start ) ); // m_gal->DrawLine( center, aItem->GetABPosition( arcStart ) );
// m_gal->SetStrokeColor( COLOR4D( 1.0, 0.0, 0.0, 1.0 ) ); // m_gal->SetStrokeColor( COLOR4D( 1.0, 0.0, 0.0, 1.0 ) );
// m_gal->DrawLine( center, aItem->GetABPosition( aItem->m_End ) ); // m_gal->DrawLine( center, aItem->GetABPosition( arcEnd ) );
break; break;
} }