realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 10:13:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check for zone and pad bounding boxes, prevent spoke double counting.

Browse Source
This commit is contained in:
Daniel Treffenstädt 2025-02-19 18:37:47 +01:00
parent 7a6a701960
commit b011ca8a75
No known key found for this signature in database
GPG Key ID: 3D92CAF477537F3E
1 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pcbnew/drc/drc_test_provider_fanout_checks.cpp
View File

@ -329,33 +329,40 @@ bool DRC_TEST_PROVIDER_FANOUT_CHECKS::Run()
{ {
for( PCB_LAYER_ID layer : pad->GetLayerSet() ) for( PCB_LAYER_ID layer : pad->GetLayerSet() )
{ {
if( ! zone->IsOnLayer( layer ) ) if( !zone->IsOnLayer( layer ) )
continue; continue;
int actual; if( !zone->GetBoundingBox().Intersects( pad->GetBoundingBox() ) )
continue;
const std::shared_ptr<SHAPE_POLY_SET>& zoneFill = zone->GetFilledPolysList( layer ); const std::shared_ptr<SHAPE_POLY_SET>& zoneFill = zone->GetFilledPolysList( layer );
if( zoneFill->IsEmpty() ) if( zoneFill->IsEmpty() )
continue; continue;
auto padOutline = pad->GetEffectivePolygon( layer )->Outline( 0 ); auto padOutline = pad->GetEffectivePolygon( layer )->Outline( 0 );
auto padBBox = pad->GetBoundingBox(); auto padBBox = pad->GetBoundingBox();
int spoke_half_width = m_drcEngine->EvalRules( THERMAL_SPOKE_WIDTH_CONSTRAINT, pad, zone, layer ).m_Value.Min() / 2; int spoke_width = m_drcEngine
->EvalRules( THERMAL_SPOKE_WIDTH_CONSTRAINT, pad,
zone, layer )
.m_Value.Min();
int actual{ 0 };
for( int jj = 0; jj < zoneFill->OutlineCount(); ++jj ) for( int jj = 0; jj < zoneFill->OutlineCount(); ++jj )
{ {
std::vector<SHAPE_LINE_CHAIN::INTERSECTION> intersections; std::vector<SHAPE_LINE_CHAIN::INTERSECTION> intersections;
zoneFill->Outline( jj ).Intersect( padOutline, intersections, true, &padBBox ); // We only need to check for one spoke since the width will be the same for the same zone.
if( zoneFill->Outline( jj ).Intersect( padOutline, intersections, true,
if( intersections.size() < 2 ) &padBBox ) >= 2 )
continue; {
actual = spoke_width;
actual = spoke_half_width * intersections.size(); break;
}
} }
const auto& size_vec = pad->GetSize( layer ); const auto& size_vec = pad->GetSize( layer );
int size = size_vec.x < size_vec.y ? size_vec.x : size_vec.y; int size = size_vec.x < size_vec.y ? size_vec.x : size_vec.y;
@ -457,11 +464,14 @@ bool DRC_TEST_PROVIDER_FANOUT_CHECKS::Run()
{ {
for( PCB_LAYER_ID layer : pad->GetLayerSet() ) for( PCB_LAYER_ID layer : pad->GetLayerSet() )
{ {
if( ! zone->IsOnLayer( layer ) ) if( !zone->IsOnLayer( layer ) )
continue;
if( !zone->GetBoundingBox().Intersects( pad->GetBoundingBox() ) )
continue; continue;
// Only external copper layers are interesting for this test, since it is ultimately about solderability.
const std::shared_ptr<SHAPE_POLY_SET>& zoneFill = zone->GetFilledPolysList( layer ); const std::shared_ptr<SHAPE_POLY_SET>& zoneFill = zone->GetFilledPolysList( layer );
if( zoneFill->IsEmpty() ) if( zoneFill->IsEmpty() )
continue; continue;
@ -479,10 +489,19 @@ bool DRC_TEST_PROVIDER_FANOUT_CHECKS::Run()
if( intersections.size() < 2 ) if( intersections.size() < 2 )
continue; continue;
std::set<int> our_indices;
for( auto intersection : intersections ) for( auto intersection : intersections )
{ {
// Don't double count spoke edges.
if( our_indices.contains( intersection.index_our ) )
continue;
our_indices.emplace( intersection.index_our );
SEG seg = zoneFill->Outline( jj ).Segment( intersection.index_our ); SEG seg = zoneFill->Outline( jj ).Segment( intersection.index_our );
VECTOR2D direction; VECTOR2D direction;
if( padOutline.PointInside( seg.A ) ) if( padOutline.PointInside( seg.A ) )
direction = seg.B - intersection.p; direction = seg.B - intersection.p;
else else