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

Cleanup loading of arc shapes in Symbol and Schematic editors

This commit is contained in:
Roberto Fernandez Bautista 2022-08-27 02:14:22 +01:00
parent 8279add470
commit 6ceddb185b
1 changed files with 1 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -992,33 +992,6 @@ LIB_SHAPE* SCH_SEXPR_PARSER::parseArc()
if( hasMidPoint ) if( hasMidPoint )
{ {
arc->SetArcGeometry( startPoint, midPoint, endPoint); arc->SetArcGeometry( startPoint, midPoint, endPoint);
#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
* 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.
* 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, arc_angle;
arc->CalcArcAngles( arc_start, arc_end );
arc_angle = arc_end - arc_start;
// So a workaround is to slightly change the arc angle to
// avoid it == 180 deg after correction
if( arc_angle == ANGLE_180 )
{
VECTOR2I new_center = CalcArcCenter( arc->GetStart(), arc->GetEnd(),
EDA_ANGLE( 179.5, DEGREES_T ) );
arc->SetCenter( new_center );
arc->SetCachedArcData( startPoint, midPoint, endPoint, new_center );
}
#endif
} }
else if( hasAngles ) else if( hasAngles )
{ {
@ -3215,25 +3188,7 @@ SCH_SHAPE* SCH_SEXPR_PARSER::parseSchArc()
} }
} }
arc->SetStart( startPoint ); arc->SetArcGeometry( startPoint, midPoint, endPoint );
arc->SetEnd( endPoint );
arc->SetCenter( CalcArcCenter( arc->GetStart(), midPoint, arc->GetEnd() ) );
/**
* 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 ends if they
* don't match what we're expecting. (Note that what we're expecting is backwards from the
* LIB_SHAPE case because LibEdit has an upside-down coordinate system.)
*/
EDA_ANGLE arc_start, arc_end;
arc->CalcArcAngles( arc_start, arc_end );
if( arc_start > arc_end )
{
VECTOR2I temp = arc->GetStart();
arc->SetStart( arc->GetEnd() );
arc->SetEnd( temp );
}
return arc.release(); return arc.release();
} }