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

Bring inspection reporting in line with zone filler 

1) "clearance" rules don't apply to NPTH holes with no copper
2) local zone clearance applies even if other item has no copper

Fixes https://gitlab.com/kicad/code/kicad/issues/14575
This commit is contained in:
Jeff Young 2023-04-28 22:15:00 +01:00
parent 16e000f2b0
commit 251161dbeb
1 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
pcbnew/drc/drc_engine.cpp
View File

@ -1075,9 +1075,23 @@ DRC_CONSTRAINT DRC_ENGINE::EvalRules( DRC_CONSTRAINT_T aConstraintType, const BO
if( c->constraint.m_Type == CLEARANCE_CONSTRAINT ) if( c->constraint.m_Type == CLEARANCE_CONSTRAINT )
{ {
if( implicit && ( a_is_non_copper || b_is_non_copper ) ) if( a_is_non_copper || b_is_non_copper )
{ {
REPORT( _( "Netclass clearances apply only between copper items." ) ); if( implicit )
{
REPORT( _( "Netclass clearances apply only between copper items." ) )
}
else if( a_is_non_copper )
{
REPORT( wxString::Format( _( "%s contains no copper. Rule ignored." ),
EscapeHTML( a->GetItemDescription( this ) ) ) )
}
else if( b_is_non_copper )
{
REPORT( wxString::Format( _( "%s contains no copper. Rule ignored." ),
EscapeHTML( b->GetItemDescription( this ) ) ) )
}
return; return;
} }
} }
@ -1301,15 +1315,21 @@ DRC_CONSTRAINT DRC_ENGINE::EvalRules( DRC_CONSTRAINT_T aConstraintType, const BO
// rule selection paradigm is "winner takes all". // rule selection paradigm is "winner takes all".
if( aConstraintType == CLEARANCE_CONSTRAINT ) if( aConstraintType == CLEARANCE_CONSTRAINT )
{ {
int global = constraint.m_Value.Min(); int global = constraint.m_Value.Min();
int localA = ac ? ac->GetLocalClearance( nullptr ) : 0; int localA = ac ? ac->GetLocalClearance( nullptr ) : 0;
int localB = bc ? bc->GetLocalClearance( nullptr ) : 0; int localB = bc ? bc->GetLocalClearance( nullptr ) : 0;
int clearance = global; int clearance = global;
bool needBlankLine = true;
if( localA > 0 ) if( localA > 0 )
{ {
REPORT( "" ) if( needBlankLine )
REPORT( wxString::Format( _( "Local clearance on %s; clearance: %s." ), {
REPORT( "" )
needBlankLine = false;
}
REPORT( wxString::Format( _( "Local clearance on %s: %s." ),
EscapeHTML( a->GetItemDescription( this ) ), EscapeHTML( a->GetItemDescription( this ) ),
MessageTextFromValue( localA ) ) ) MessageTextFromValue( localA ) ) )
@ -1325,8 +1345,13 @@ DRC_CONSTRAINT DRC_ENGINE::EvalRules( DRC_CONSTRAINT_T aConstraintType, const BO
if( localB > 0 ) if( localB > 0 )
{ {
REPORT( "" ) if( needBlankLine )
REPORT( wxString::Format( _( "Local clearance on %s; clearance: %s." ), {
REPORT( "" )
needBlankLine = false;
}
REPORT( wxString::Format( _( "Local clearance on %s: %s." ),
EscapeHTML( b->GetItemDescription( this ) ), EscapeHTML( b->GetItemDescription( this ) ),
MessageTextFromValue( localB ) ) ) MessageTextFromValue( localB ) ) )
@ -1340,22 +1365,23 @@ DRC_CONSTRAINT DRC_ENGINE::EvalRules( DRC_CONSTRAINT_T aConstraintType, const BO
} }
} }
REPORT( "" ) if( !a_is_non_copper && !b_is_non_copper )
REPORT( wxString::Format( _( "Board minimum clearance: %s." ),
MessageTextFromValue( m_designSettings->m_MinClearance ) ) )
if( clearance < m_designSettings->m_MinClearance )
{ {
constraint.SetParentRule( nullptr ); if( needBlankLine )
constraint.SetName( _( "board minimum" ) ); {
constraint.m_Value.SetMin( m_designSettings->m_MinClearance ); REPORT( "" )
} needBlankLine = false;
}
if( a_is_non_copper || b_is_non_copper ) REPORT( wxString::Format( _( "Board minimum clearance: %s." ),
{ MessageTextFromValue( m_designSettings->m_MinClearance ) ) )
REPORT( _( "Local and board clearances apply only between copper items." ) );
constraint.m_Type = NULL_CONSTRAINT; if( clearance < m_designSettings->m_MinClearance )
constraint.m_DisallowFlags = 0; {
constraint.SetParentRule( nullptr );
constraint.SetName( _( "board minimum" ) );
constraint.m_Value.SetMin( m_designSettings->m_MinClearance );
}
} }
return constraint; return constraint;