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

SCH_SEXPR_PARSER::parseArc(): fix a very annoying issue: each time the lib or 

sch files are saved and reopened, 180 deg arcs were flipped.
This fix is a workaround, but avoid flipped arcs after saving/reopening these files.
This commit is contained in:
jean-pierre charras 2022-01-26 09:57:43 +01:00
parent 9af365b5b3
commit 8a17fb8d19
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
eeschema/sch_plugins/kicad/sch_sexpr_parser.cpp
View File

@ -985,20 +985,31 @@ LIB_SHAPE* SCH_SEXPR_PARSER::parseArc()
{ {
arc->SetCenter( CalcArcCenter( arc->GetStart(), midPoint, arc->GetEnd() ) ); arc->SetCenter( CalcArcCenter( arc->GetStart(), midPoint, arc->GetEnd() ) );
/** #if 1 // This code will be removed if the current code in Eeschema is modified to allow
// full support of arcs >= 180 deg without issue.
// For now the arcs are just modified to be < 180 degrees to do not break
// some other functions ( Draw, Plot, HitTest)
/*
* Current file format stores start-mid-end and so doesn't care about winding. We * Current file format stores start-mid-end and so doesn't care about winding. We
* store start-end with an implied winding internally though, so we need to swap the * store start-end with an implied winding internally though, so we need to swap the
* ends if they don't match what we're expecting. * ends if they don't match what we're expecting.
* This issue is only for 180 deg arcs, because 180 deg are a limit to handle arcs in
* previous versions of Kicad
*/ */
EDA_ANGLE arc_start, arc_end; EDA_ANGLE arc_start, arc_end, arc_angle;
arc->CalcArcAngles( arc_start, arc_end ); arc->CalcArcAngles( arc_start, arc_end );
arc_angle = arc_end - arc_start;
if( arc_start < arc_end ) // So a workaround is to slightly change the arc angle to
// avoid it == 180 deg after correction
if( arc_angle == ANGLE_180 )
{ {
VECTOR2I temp = arc->GetStart(); VECTOR2I new_center = CalcArcCenter( arc->GetStart(), arc->GetEnd(),
arc->SetStart( arc->GetEnd() ); EDA_ANGLE( 179.5, DEGREES_T ) );
arc->SetEnd( temp ); arc->SetCenter( new_center );
} }
#endif
} }
else if( hasAngles ) else if( hasAngles )
{ {