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

STEP export: handle small segments connecting two arcs better. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/17499

(cherry picked from commit 75037dd1d1)
This commit is contained in:
Alex Shvartzkop 2024-03-19 22:53:28 +03:00
parent b40d19eb79
commit 3a5a911012
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pcbnew/exporters/step/step_pcb_model.cpp
View File

@ -686,8 +686,11 @@ bool STEP_PCB_MODEL::MakeShapes( std::vector<TopoDS_Shape>& aShapes, const SHAPE
{ {
try try
{ {
auto addSegment = [&]( const VECTOR2D& aPt0, const VECTOR2D& aPt1 ) -> bool auto addSegment = [&]( const VECTOR2I& aPt0, const VECTOR2I& aPt1 ) -> bool
{ {
if( aPt0 == aPt1 )
return false;
gp_Pnt start = toPoint( aPt0 ); gp_Pnt start = toPoint( aPt0 );
gp_Pnt end = toPoint( aPt1 ); gp_Pnt end = toPoint( aPt1 );
@ -718,7 +721,7 @@ bool STEP_PCB_MODEL::MakeShapes( std::vector<TopoDS_Shape>& aShapes, const SHAPE
return true; return true;
}; };
auto addArc = [&]( const SHAPE_ARC& aArc ) -> bool auto addArc = [&]( const VECTOR2I& aPt0, const SHAPE_ARC& aArc ) -> bool
{ {
// Do not export too short segments: they create broken shape because OCC thinks // Do not export too short segments: they create broken shape because OCC thinks
Handle( Geom_Curve ) curve; Handle( Geom_Curve ) curve;
@ -733,7 +736,7 @@ bool STEP_PCB_MODEL::MakeShapes( std::vector<TopoDS_Shape>& aShapes, const SHAPE
} }
else else
{ {
curve = GC_MakeArcOfCircle( toPoint( aArc.GetP0() ), curve = GC_MakeArcOfCircle( toPoint( aPt0 ),
toPoint( aArc.GetArcMid() ), toPoint( aArc.GetArcMid() ),
toPoint( aArc.GetP1() ) ) toPoint( aArc.GetP1() ) )
.Value(); .Value();
@ -789,10 +792,10 @@ bool STEP_PCB_MODEL::MakeShapes( std::vector<TopoDS_Shape>& aShapes, const SHAPE
lastPt = firstPt; lastPt = firstPt;
} }
if( lastPt != currentArc.GetP0() ) if( addSegment( lastPt, currentArc.GetP0() ) )
addSegment( lastPt, currentArc.GetP0() ); lastPt = currentArc.GetP0();
if( addArc( currentArc ) ) if( addArc( lastPt, currentArc ) )
lastPt = currentArc.GetP1(); lastPt = currentArc.GetP1();
} }
else if( !isArc ) else if( !isArc )
@ -805,10 +808,10 @@ bool STEP_PCB_MODEL::MakeShapes( std::vector<TopoDS_Shape>& aShapes, const SHAPE
lastPt = firstPt; lastPt = firstPt;
} }
if( lastPt != seg.A ) if( addSegment( lastPt, seg.A ) )
addSegment( lastPt, seg.A ); lastPt = seg.A;
if( addSegment( seg.A, seg.B ) ) if( addSegment( lastPt, seg.B ) )
lastPt = seg.B; lastPt = seg.B;
} }