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

Use full names for bus membership ERC checking 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/7522
This commit is contained in:
Jon Evans 2021-02-13 10:09:16 -05:00
parent 08922e01aa
commit 7015f4cf75
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
eeschema/connection_graph.cpp
View File

@ -2417,9 +2417,9 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH
{
conflict = true; // Assume a conflict; we'll reset if we find it's OK
bus_name = bus_wire->Connection( &sheet )->Name( true );
bus_name = bus_wire->Connection( &sheet )->Name();
wxString test_name = bus_entry->Connection( &sheet )->Name( true );
wxString test_name = bus_entry->Connection( &sheet )->Name();
for( const auto& member : bus_wire->Connection( &sheet )->Members() )
{
@ -2427,11 +2427,11 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH
{
for( const auto& sub_member : member->Members() )
{
if( sub_member->Name( true ) == test_name )
if( sub_member->Name() == test_name )
conflict = false;
}
}
else if( member->Name( true ) == test_name )
else if( member->Name() == test_name )
{
conflict = false;
}
@ -2447,7 +2447,7 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH
if( conflict )
{
wxString netName = aSubgraph->m_driver_connection->Name( true );
wxString netName = aSubgraph->m_driver_connection->Name();
wxString msg = wxString::Format( _( "Net %s is graphically connected to bus %s but is not a"
" member of that bus" ),
UnescapeString( netName ),