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

Make sure secondary drivers are followed-up on after absorption

This commit is contained in:
Jon Evans 2019-05-12 20:23:16 -04:00
parent 019f63cd95
commit ee095a6711
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eeschema/connection_graph.cpp
View File

@ -1107,6 +1107,10 @@ void CONNECTION_GRAPH::buildConnectionGraph()
auto c = std::make_shared<SCH_CONNECTION>( possible_driver, auto c = std::make_shared<SCH_CONNECTION>( possible_driver,
aSubgraph->m_sheet ); aSubgraph->m_sheet );
c->SetName( static_cast<SCH_PIN *>( possible_driver )->GetName() ); c->SetName( static_cast<SCH_PIN *>( possible_driver )->GetName() );
if( c->Name( true ) == aSubgraph->m_driver_connection->Name( true ) )
continue;
connections_to_check.push_back( c ); connections_to_check.push_back( c );
wxLogTrace( "CONN", "%lu (%s): Adding secondary pin %s", wxLogTrace( "CONN", "%lu (%s): Adding secondary pin %s",
aSubgraph->m_code, aSubgraph->m_code,
@ -1123,6 +1127,10 @@ void CONNECTION_GRAPH::buildConnectionGraph()
auto c = std::make_shared<SCH_CONNECTION>( possible_driver, auto c = std::make_shared<SCH_CONNECTION>( possible_driver,
aSubgraph->m_sheet ); aSubgraph->m_sheet );
c->SetName( static_cast<SCH_TEXT*>( possible_driver )->GetShownText() ); c->SetName( static_cast<SCH_TEXT*>( possible_driver )->GetShownText() );
if( c->Name( true ) == aSubgraph->m_driver_connection->Name( true ) )
continue;
connections_to_check.push_back( c ); connections_to_check.push_back( c );
wxLogTrace( "CONN", "%lu (%s): Adding secondary label %s", wxLogTrace( "CONN", "%lu (%s): Adding secondary label %s",
aSubgraph->m_code, aSubgraph->m_code,
@ -1219,13 +1227,13 @@ void CONNECTION_GRAPH::buildConnectionGraph()
{ {
wxLogTrace( "CONN", "%lu (%s) absorbs neighbor %lu (%s)", wxLogTrace( "CONN", "%lu (%s) absorbs neighbor %lu (%s)",
subgraph->m_code, connection->Name(), subgraph->m_code, connection->Name(),
candidate->m_code, member->Name() ); candidate->m_code, candidate->m_driver_connection->Name() );
// Candidate may have other non-chosen drivers we need to follow
add_connections_to_check( candidate );
subgraph->Absorb( candidate ); subgraph->Absorb( candidate );
invalidated_subgraphs.insert( subgraph ); invalidated_subgraphs.insert( subgraph );
// Candidate may have other non-chosen drivers we need to follow
add_connections_to_check( subgraph );
} }
} }
} }