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

cairo: Fix pcbnew arc drawing 

Chord should be positive 90° off the arc
This commit is contained in:
Seth Hillbrand 2019-02-18 17:02:33 -08:00
parent 3b3c674c1a
commit 467d37e3f0
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/gal/cairo/cairo_gal.cpp
View File

@ -274,23 +274,20 @@ void CAIRO_GAL_BASE::DrawArc( const VECTOR2D& aCenterPoint, double aRadius, doub
auto mid = ( startPointS + endPointS ) * 0.5; auto mid = ( startPointS + endPointS ) * 0.5;
auto chord = endPointS - startPointS; auto chord = endPointS - startPointS;
double c = chord.EuclideanNorm() / 2.0; double c = chord.EuclideanNorm() / 2.0;
auto d = chord.Rotate( (centerAngle > M_PI ? -M_PI : M_PI) / 2.0 ).Resize( c ); auto d = chord.Rotate( M_PI / 2.0 ).Resize( c );
VECTOR2D centerS;
if( centerAngle == 0.0 ) if( centerAngle != 0.0 )
centerS = mid; mid += d * ( 1.0 / tan( centerAngle / 2.0 ) );
else
centerS = mid + d * ( 1.0 / tan( centerAngle / 2.0 ) );
auto rS = (centerS - startPointS).EuclideanNorm(); auto rS = ( mid - startPointS ).EuclideanNorm();
cairo_set_line_width( currentContext, lineWidthInPixels ); cairo_set_line_width( currentContext, lineWidthInPixels );
cairo_new_sub_path( currentContext ); cairo_new_sub_path( currentContext );
if( isFillEnabled ) if( isFillEnabled )
cairo_move_to( currentContext, centerS.x, centerS.y ); cairo_move_to( currentContext, mid.x, mid.y );
cairo_arc( currentContext, centerS.x, centerS.y, rS, startAngleS, endAngleS ); cairo_arc( currentContext, mid.x, mid.y, rS, startAngleS, endAngleS );
if( isFillEnabled ) if( isFillEnabled )
cairo_close_path( currentContext ); cairo_close_path( currentContext );