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

Apply rules commutatively.

This commit is contained in:
Jeff Young 2020-09-19 17:03:14 +01:00
parent 121ccc3a10
commit db5de738ae
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pcbnew/drc/drc_rule_condition.cpp
View File

@ -55,11 +55,7 @@ bool DRC_RULE_CONDITION::EvaluateFor( const BOARD_ITEM* aItemA, const BOARD_ITEM
return false;
}
BOARD_ITEM* a = const_cast<BOARD_ITEM*>( aItemA );
BOARD_ITEM* b = aItemB ? const_cast<BOARD_ITEM*>( aItemB ) : DELETED_BOARD_ITEM::GetInstance();
PCB_EXPR_CONTEXT ctx( aLayer );
ctx.SetItems( a, b );
ctx.SetErrorCallback(
[&]( const wxString& aMessage, int aOffset )
{
@ -67,7 +63,24 @@ bool DRC_RULE_CONDITION::EvaluateFor( const BOARD_ITEM* aItemA, const BOARD_ITEM
aReporter->Report( _( "ERROR: " ) + aMessage );
} );
return m_ucode->Run( &ctx )->AsDouble() != 0.0;
BOARD_ITEM* a = const_cast<BOARD_ITEM*>( aItemA );
BOARD_ITEM* b = aItemB ? const_cast<BOARD_ITEM*>( aItemB ) : DELETED_BOARD_ITEM::GetInstance();
ctx.SetItems( a, b );
if( m_ucode->Run( &ctx )->AsDouble() != 0.0 )
{
return true;
}
else if( aItemB ) // Conditions are commutative
{
ctx.SetItems( b, a );
if( m_ucode->Run( &ctx )->AsDouble() != 0.0 )
return true;
}
return false;
}