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

ERC: Use local paths for bus<>bus entry testing 

Fixes: lp:1831365
* https://bugs.launchpad.net/kicad/+bug/1831365
This commit is contained in:
Jon Evans 2019-06-02 11:34:01 -04:00
parent dfc2fe3929
commit 256d7b0714
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

@ -2025,17 +2025,17 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH
bus_wire = bus_entry->m_connected_bus_item; bus_wire = bus_entry->m_connected_bus_item;
conflict = true; conflict = true;
auto test_name = bus_entry->Connection( sheet )->Name(); auto test_name = bus_entry->Connection( sheet )->Name( true );
for( const auto& member : bus_wire->Connection( sheet )->Members() ) for( const auto& member : bus_wire->Connection( sheet )->Members() )
{ {
if( member->Type() == CONNECTION_BUS ) if( member->Type() == CONNECTION_BUS )
{ {
for( const auto& sub_member : member->Members() ) for( const auto& sub_member : member->Members() )
if( sub_member->Name() == test_name ) if( sub_member->Name( true ) == test_name )
conflict = false; conflict = false;
} }
else if( member->Name() == test_name ) else if( member->Name( true ) == test_name )
{ {
conflict = false; conflict = false;
} }
@ -2048,9 +2048,9 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH
{ {
msg.Printf( _( "%s (%s) is connected to %s (%s) but is not a member of the bus" ), msg.Printf( _( "%s (%s) is connected to %s (%s) but is not a member of the bus" ),
bus_entry->GetSelectMenuText( m_frame->GetUserUnits() ), bus_entry->GetSelectMenuText( m_frame->GetUserUnits() ),
bus_entry->Connection( sheet )->Name(), bus_entry->Connection( sheet )->Name( true ),
bus_wire->GetSelectMenuText( m_frame->GetUserUnits() ), bus_wire->GetSelectMenuText( m_frame->GetUserUnits() ),
bus_wire->Connection( sheet )->Name() ); bus_wire->Connection( sheet )->Name( true ) );
auto marker = new SCH_MARKER(); auto marker = new SCH_MARKER();
marker->SetTimeStamp( GetNewTimeStamp() ); marker->SetTimeStamp( GetNewTimeStamp() );