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

Fix logic issue with sheet pin ERC 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/7592
This commit is contained in:
Jon Evans 2021-02-18 12:10:51 -05:00
parent 66b33834b5
commit d951ac5bfe
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
eeschema/connection_graph.cpp
View File

@ -2837,6 +2837,8 @@ int CONNECTION_GRAPH::ercCheckHierSheets()
}
}
std::set<wxString> matchedPins;
for( SCH_ITEM* subItem : parentSheet->GetScreen()->Items() )
{
if( subItem->Type() == SCH_HIER_LABEL_T )
@ -2845,11 +2847,14 @@ int CONNECTION_GRAPH::ercCheckHierSheets()
if( !pins.count( label->GetText() ) )
labels[label->GetText()] = label;
pins.erase( label->GetText() );
else
matchedPins.insert( label->GetText() );
}
}
for( const wxString& matched : matchedPins )
pins.erase( matched );
for( const std::pair<const wxString, SCH_SHEET_PIN*>& unmatched : pins )
{
wxString msg = wxString::Format( _( "Sheet pin %s has no matching hierarchical "
@ -2870,7 +2875,7 @@ int CONNECTION_GRAPH::ercCheckHierSheets()
for( const std::pair<const wxString, SCH_HIERLABEL*>& unmatched : labels )
{
wxString msg = wxString::Format( _( "Hierarchical label %s has no matching "
"sheet pin outside the sheet" ),
"sheet pin in the parent sheet" ),
UnescapeString( unmatched.first ) );
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_HIERACHICAL_LABEL );