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

Disentangle copper- and board-edge-clearances in Clearance Resolution... 

Fixes https://gitlab.com/kicad/code/kicad/issues/6983
This commit is contained in:
Jeff Young 2021-01-09 16:43:13 +00:00
parent 9546ad88b5
commit ed7b3373d1
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pcbnew/tools/board_inspection_tool.cpp
View File

@ -242,24 +242,8 @@ void BOARD_INSPECTION_TOOL::reportClearance( DRC_CONSTRAINT_T aClearanceType, PC
footprint->BuildPolyCourtyards(); footprint->BuildPolyCourtyards();
} }
int clearance = 0;
if( aClearanceType == CLEARANCE_CONSTRAINT )
{
if( ( aA && ( aA->GetLayerSet() & LSET( 2, Edge_Cuts, Margin ) ).any() )
|| ( aB && ( aB->GetLayerSet() & LSET( 2, Edge_Cuts, Margin ) ).any() ) )
{
auto edgeConstraint = drcEngine.EvalRulesForItems( EDGE_CLEARANCE_CONSTRAINT, aA, aB,
aLayer, r );
clearance = edgeConstraint.m_Value.HasMin() ? edgeConstraint.m_Value.Min() : 0;
}
}
auto constraint = drcEngine.EvalRulesForItems( aClearanceType, aA, aB, aLayer, r ); auto constraint = drcEngine.EvalRulesForItems( aClearanceType, aA, aB, aLayer, r );
int clearance = constraint.m_Value.Min();
if( constraint.m_Value.HasMin() && constraint.m_Value.Min() > clearance )
clearance = constraint.m_Value.Min();
wxString clearanceStr = StringFromValue( r->GetUnits(), clearance, true ); wxString clearanceStr = StringFromValue( r->GetUnits(), clearance, true );
@ -381,6 +365,17 @@ int BOARD_INSPECTION_TOOL::InspectClearance( const TOOL_EVENT& aEvent )
b->GetSelectMenuText( r->GetUnits() ), b->GetSelectMenuText( r->GetUnits() ),
m_frame->GetBoard()->GetLayerName( layer ) ) ); m_frame->GetBoard()->GetLayerName( layer ) ) );
} }
else if( a->GetLayer() == Edge_Cuts || a->GetLayer() == Margin
|| b->GetLayer() == Edge_Cuts || b->GetLayer() == Margin )
{
r->Report( "<h7>" + _( "Edge clearance resolution for:" ) + "</h7>" );
r->Report( wxString::Format( "<ul><li>%s</li><li>%s</li></ul>",
EscapeHTML( getItemDescription( a ) ),
EscapeHTML( getItemDescription( b ) ) ) );
reportClearance( EDGE_CLEARANCE_CONSTRAINT, layer, a, b, r );
}
else else
{ {
r->Report( "<h7>" + _( "Clearance resolution for:" ) + "</h7>" ); r->Report( "<h7>" + _( "Clearance resolution for:" ) + "</h7>" );