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

Don't zero out width of shapes on Margin, only Edge_Cuts. 

Fixes https://gitlab.com/kicad/code/kicad/issues/11967
This commit is contained in:
Jeff Young 2022-07-07 19:30:57 -06:00
parent 654740b90d
commit 521b231873
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pcbnew/drc/drc_test_provider_edge_clearance.cpp
View File

@ -173,9 +173,12 @@ bool DRC_TEST_PROVIDER_EDGE_CLEARANCE::Run()
[&]( BOARD_ITEM *item ) -> bool [&]( BOARD_ITEM *item ) -> bool
{ {
PCB_SHAPE* shape = static_cast<PCB_SHAPE*>( item ); PCB_SHAPE* shape = static_cast<PCB_SHAPE*>( item );
STROKE_PARAMS stroke( 0 ); STROKE_PARAMS stroke = shape->GetStroke();
if( shape->GetShape() == SHAPE_T::RECT ) if( item->IsOnLayer( Edge_Cuts ) )
stroke.SetWidth( 0 );
if( shape->GetShape() == SHAPE_T::RECT && !shape->IsFilled() )
{ {
// A single rectangle for the board would make the RTree useless, so convert // A single rectangle for the board would make the RTree useless, so convert
// to 4 edges // to 4 edges
@ -195,9 +198,8 @@ bool DRC_TEST_PROVIDER_EDGE_CLEARANCE::Run()
edges.back()->SetShape( SHAPE_T::SEGMENT ); edges.back()->SetShape( SHAPE_T::SEGMENT );
edges.back()->SetStartY( shape->GetEndY() ); edges.back()->SetStartY( shape->GetEndY() );
edges.back()->SetStroke( stroke ); edges.back()->SetStroke( stroke );
return true;
} }
else if( shape->GetShape() == SHAPE_T::POLY ) else if( shape->GetShape() == SHAPE_T::POLY && !shape->IsFilled() )
{ {
// A single polygon for the board would make the RTree useless, so convert // A single polygon for the board would make the RTree useless, so convert
// to n edges. // to n edges.
@ -213,9 +215,12 @@ bool DRC_TEST_PROVIDER_EDGE_CLEARANCE::Run()
edges.back()->SetStroke( stroke ); edges.back()->SetStroke( stroke );
} }
} }
else
{
edges.emplace_back( static_cast<PCB_SHAPE*>( shape->Clone() ) );
edges.back()->SetStroke( stroke );
}
edges.emplace_back( static_cast<PCB_SHAPE*>( shape->Clone() ) );
edges.back()->SetStroke( stroke );
return true; return true;
} ); } );
@ -280,25 +285,25 @@ bool DRC_TEST_PROVIDER_EDGE_CLEARANCE::Run()
if( testCopper && item->IsOnCopperLayer() ) if( testCopper && item->IsOnCopperLayer() )
{ {
edgesTree.QueryColliding( item, UNDEFINED_LAYER, testLayer, nullptr, edgesTree.QueryColliding( item, UNDEFINED_LAYER, testLayer, nullptr,
[&]( BOARD_ITEM* edge ) -> bool [&]( BOARD_ITEM* edge ) -> bool
{ {
return testAgainstEdge( item, itemShape.get(), edge, return testAgainstEdge( item, itemShape.get(), edge,
EDGE_CLEARANCE_CONSTRAINT, EDGE_CLEARANCE_CONSTRAINT,
DRCE_EDGE_CLEARANCE ); DRCE_EDGE_CLEARANCE );
}, },
m_largestEdgeClearance ); m_largestEdgeClearance );
} }
if( testSilk && ( item->IsOnLayer( F_SilkS ) || item->IsOnLayer( B_SilkS ) ) ) if( testSilk && ( item->IsOnLayer( F_SilkS ) || item->IsOnLayer( B_SilkS ) ) )
{ {
if( edgesTree.QueryColliding( item, UNDEFINED_LAYER, testLayer, nullptr, if( edgesTree.QueryColliding( item, UNDEFINED_LAYER, testLayer, nullptr,
[&]( BOARD_ITEM* edge ) -> bool [&]( BOARD_ITEM* edge ) -> bool
{ {
return testAgainstEdge( item, itemShape.get(), edge, return testAgainstEdge( item, itemShape.get(), edge,
SILK_CLEARANCE_CONSTRAINT, SILK_CLEARANCE_CONSTRAINT,
DRCE_SILK_EDGE_CLEARANCE ); DRCE_SILK_EDGE_CLEARANCE );
}, },
m_largestEdgeClearance ) ) m_largestEdgeClearance ) )
{ {
// violations reported during QueryColliding // violations reported during QueryColliding
} }