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

Fix hierarchical linking if parent sheet has a weak driver

This commit is contained in:
Jon Evans 2019-05-07 19:12:35 -04:00
parent a40367ce17
commit 3d3c280f22
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
eeschema/connection_graph.cpp
View File

@ -1461,14 +1461,15 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph )
for( auto candidate : m_sheet_to_subgraphs_map.at( path ) ) for( auto candidate : m_sheet_to_subgraphs_map.at( path ) )
{ {
if( !candidate->m_strong_driver || if( !candidate->m_strong_driver ||
candidate->m_hier_ports.empty() ) candidate->m_hier_ports.empty() ||
visited.count( candidate ) )
continue; continue;
for( SCH_HIERLABEL* label : candidate->m_hier_ports ) for( SCH_HIERLABEL* label : candidate->m_hier_ports )
{ {
if( label->GetShownText() == pin->GetShownText() ) if( label->GetShownText() == pin->GetShownText() )
{ {
wxLogTrace( "CONN", "Found child %lu (%s)", wxLogTrace( "CONN", "%lu: found child %lu (%s)", aParent->m_code,
candidate->m_code, candidate->m_driver_connection->Name() ); candidate->m_code, candidate->m_driver_connection->Name() );
search_list.push_back( candidate ); search_list.push_back( candidate );
@ -1488,9 +1489,10 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph )
for( auto candidate : m_sheet_to_subgraphs_map.at( path ) ) for( auto candidate : m_sheet_to_subgraphs_map.at( path ) )
{ {
if( !candidate->m_strong_driver || if( candidate->m_hier_pins.empty() ||
candidate->m_hier_pins.empty() || visited.count( candidate ) ||
visited.count( candidate ) ) ( candidate->m_driver_connection->Type() !=
aParent->m_driver_connection->Type() ) )
continue; continue;
for( SCH_SHEET_PIN* pin : candidate->m_hier_pins ) for( SCH_SHEET_PIN* pin : candidate->m_hier_pins )
@ -1503,8 +1505,9 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph )
if( label->GetShownText() == pin->GetShownText() ) if( label->GetShownText() == pin->GetShownText() )
{ {
wxLogTrace( "CONN", "Found additional parent %lu (%s)", wxLogTrace( "CONN", "%lu: found additional parent %lu (%s)",
candidate->m_code, candidate->m_driver_connection->Name() ); aParent->m_code, candidate->m_code,
candidate->m_driver_connection->Name() );
search_list.push_back( candidate ); search_list.push_back( candidate );
break; break;