AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-03-30 06:06:55 +00:00
Files Issues Releases Activity

Process non-copper keepouts in footprints.

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/20405
This commit is contained in:
Jeff Young 2025-03-25 11:37:36 +00:00
parent e48ad06cab
commit ab43c3c6b5
2 changed files with 39 additions and 21 deletions

58
pcbnew/zone_filler.cpp
View File

@ -1936,30 +1936,48 @@ bool ZONE_FILLER::fillNonCopperZone( const ZONE* aZone, PCB_LAYER_ID aLayer,
aFillPolys = aSmoothedOutline;
aFillPolys.BooleanSubtract( clearanceHoles );
auto subtractKeepout =
[&]( ZONE* candidate )
{
if( !candidate->GetIsRuleArea() )
return;
if( !candidate->HasKeepoutParametersSet() )
return;
if( candidate->GetDoNotAllowCopperPour() && candidate->IsOnLayer( aLayer ) )
{
if( candidate->GetBoundingBox().Intersects( zone_boundingbox ) )
{
if( candidate->Outline()->ArcCount() == 0 )
{
aFillPolys.BooleanSubtract( *candidate->Outline() );
}
else
{
SHAPE_POLY_SET keepoutOutline( *candidate->Outline() );
keepoutOutline.ClearArcs();
aFillPolys.BooleanSubtract( keepoutOutline );
}
}
}
};
for( ZONE* keepout : m_board->Zones() )
{
if( !keepout->GetIsRuleArea() )
continue;
if( checkForCancel( m_progressReporter ) )
return false;
if( !keepout->HasKeepoutParametersSet() )
continue;
subtractKeepout( keepout );
}
if( keepout->GetDoNotAllowCopperPour() && keepout->IsOnLayer( aLayer ) )
{
if( keepout->GetBoundingBox().Intersects( zone_boundingbox ) )
{
if( keepout->Outline()->ArcCount() == 0 )
{
aFillPolys.BooleanSubtract( *keepout->Outline() );
}
else
{
SHAPE_POLY_SET keepoutOutline( *keepout->Outline() );
keepoutOutline.ClearArcs();
aFillPolys.BooleanSubtract( keepoutOutline );
}
}
}
for( FOOTPRINT* footprint : m_board->Footprints() )
{
if( checkForCancel( m_progressReporter ) )
return false;
for( ZONE* keepout : footprint->Zones() )
subtractKeepout( keepout );
}
// Features which are min_width should survive pruning; features that are *less* than

2
pcbnew/zone_filler.h
View File

@ -94,7 +94,7 @@ private:
const SHAPE_POLY_SET& aSmoothedOutline,
const SHAPE_POLY_SET& aMaxExtents, SHAPE_POLY_SET& aFillPolys );
bool fillNonCopperZone( const ZONE* aZone, PCB_LAYER_ID aLayer,
bool fillNonCopperZone( const ZONE* candidate, PCB_LAYER_ID aLayer,
const SHAPE_POLY_SET& aSmoothedOutline, SHAPE_POLY_SET& aFillPolys );
/**
* Function buildThermalSpokes