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

Fix neighbor detection candidate logic

This commit is contained in:
Jon Evans 2019-04-10 00:45:41 -04:00
parent a0981d06a7
commit 105520b235
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eeschema/connection_graph.cpp
View File

@ -976,8 +976,8 @@ void CONNECTION_GRAPH::buildConnectionGraph()
std::vector<CONNECTION_SUBGRAPH*> candidate_subgraphs;
std::copy_if( driver_subgraphs.begin(), driver_subgraphs.end(), std::back_inserter( candidate_subgraphs ),
[&] ( CONNECTION_SUBGRAPH* candidate )
{ return ( !( candidate->m_sheet != sheet || candidate == subgraph ||
candidate->m_local_driver ) &&
{ return ( candidate->m_local_driver && candidate != subgraph &&
candidate->m_sheet == sheet &&
candidate->m_driver_connection->IsNet() );
} );
@ -1105,9 +1105,6 @@ void CONNECTION_GRAPH::buildConnectionGraph()
for( auto subgraph_to_update : driver_subgraphs )
{
if( !subgraph_to_update->m_driver )
continue;
auto subsheet = subgraph_to_update->m_sheet;
auto conn = subgraph_to_update->m_driver_connection;
@ -1327,7 +1324,7 @@ void CONNECTION_GRAPH::buildConnectionGraph()
if( !candidate->m_dirty )
continue;
if( candidate->m_sheet == subsheet && candidate->m_driver )
if( candidate->m_sheet == subsheet )
{
SCH_ITEM* hier_label = nullptr;