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

Enforce board minimum clearance over local clearance overrides. 

Fixes https://gitlab.com/kicad/code/kicad/issues/8199
This commit is contained in:
Jeff Young 2021-04-15 21:42:12 +01:00
parent 9d94c700b0
commit 23a1f8b17a
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pcbnew/drc/drc_engine.cpp
View File

@ -765,8 +765,8 @@ DRC_CONSTRAINT DRC_ENGINE::EvalRules( DRC_CONSTRAINT_T aConstraintId, const BOAR
const DRC_CONSTRAINT* constraintRef = nullptr; const DRC_CONSTRAINT* constraintRef = nullptr;
bool implicit = false; bool implicit = false;
// Local overrides take precedence // Local overrides take precedence over everything *except* board min clearance
if( aConstraintId == CLEARANCE_CONSTRAINT || aConstraintId == HOLE_CLEARANCE_CONSTRAINT ) if( aConstraintId == CLEARANCE_CONSTRAINT )
{ {
int overrideA = 0; int overrideA = 0;
int overrideB = 0; int overrideB = 0;
@ -793,8 +793,19 @@ DRC_CONSTRAINT DRC_ENGINE::EvalRules( DRC_CONSTRAINT_T aConstraintId, const BOAR
if( overrideA || overrideB ) if( overrideA || overrideB )
{ {
int override = std::max( overrideA, overrideB );
if( override < m_designSettings->m_MinClearance )
{
override = m_designSettings->m_MinClearance;
REPORT( "" )
REPORT( wxString::Format( _( "Board minimum clearance: %s." ),
EscapeHTML( MessageTextFromValue( UNITS, override ) ) ) )
}
DRC_CONSTRAINT constraint( aConstraintId, m_msg ); DRC_CONSTRAINT constraint( aConstraintId, m_msg );
constraint.m_Value.SetMin( std::max( overrideA, overrideB ) ); constraint.m_Value.SetMin( override );
return constraint; return constraint;
} }
} }