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

STEP export: reverse Wire when adding it to Face as a hole. 

Better fix for https://gitlab.com/kicad/code/kicad/-/issues/17446

(cherry picked from commit 1264230973)
This commit is contained in:
Alex Shvartzkop 2024-05-19 03:51:47 +03:00
parent 6dd5c7d733
commit 1a0ce67155
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1429,6 +1429,8 @@ bool STEP_PCB_MODEL::MakeShapes( std::vector<TopoDS_Shape>& aShapes, const SHAPE
-pcbIUScale.IUTomm( aKiCoords.y - aOrigin.y ), aZposition );
};
gp_Pln basePlane( gp_Pnt( 0.0, 0.0, aZposition ), gp::DZ() );
for( const SHAPE_POLY_SET::POLYGON& polygon : simplified.CPolygons() )
{
auto makeWireFromChain = [&]( BRepLib_MakeWire& aMkWire,
@ -1654,27 +1656,33 @@ bool STEP_PCB_MODEL::MakeShapes( std::vector<TopoDS_Shape>& aShapes, const SHAPE
if( contId == 0 ) // Outline
{
if( !wire.IsNull() )
mkFace = BRepBuilderAPI_MakeFace( wire );
{
mkFace = BRepBuilderAPI_MakeFace( basePlane, wire );
}
else
{
ReportMessage( wxString::Format( _( "\n** Outline skipped **\n" ) ) );
ReportMessage( wxString::Format( wxT( "\n** Outline skipped **\n" ) ) );
ReportMessage( wxString::Format( _( "z: %g; bounding box: %s\n" ),
ReportMessage( wxString::Format( wxT( "z: %g; bounding box: %s\n" ),
aZposition,
formatBBox( polygon[contId].BBox() ) ) );
continue;
break;
}
}
else // Hole
{
if( !wire.IsNull() )
{
wire.Reverse();
mkFace.Add( wire );
}
else
{
ReportMessage( wxString::Format( _( "\n** Hole skipped **\n" ) ) );
ReportMessage( wxString::Format( wxT( "\n** Hole skipped **\n" ) ) );
ReportMessage( wxString::Format( _( "z: %g; bounding box: %s\n" ),
ReportMessage( wxString::Format( wxT( "z: %g; bounding box: %s\n" ),
aZposition,
formatBBox( polygon[contId].BBox() ) ) );
}
@ -1739,7 +1747,7 @@ bool STEP_PCB_MODEL::CreatePCB( SHAPE_POLY_SET& aOutline, VECTOR2D aOrigin, bool
double boardZPos;
getBoardBodyZPlacement( boardZPos, boardThickness );
#if 0
#if 1
// This code should work, and it is working most of time
// However there are issues if the main outline is a circle with holes:
// holes from vias and pads are not working