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

Don't merge subgraphs by matching sheet pin names

This commit is contained in:
Jon Evans 2019-05-12 18:41:04 -04:00
parent 924a5e68f0
commit 019f63cd95
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eeschema/connection_graph.cpp
View File

@ -1176,6 +1176,10 @@ void CONNECTION_GRAPH::buildConnectionGraph()
if( driver == candidate->m_driver ) if( driver == candidate->m_driver )
continue; continue;
// Sheet pins are not candidates for merging
if( driver->Type() == SCH_SHEET_PIN_T )
continue;
if( driver->Type() == SCH_PIN_T ) if( driver->Type() == SCH_PIN_T )
{ {
if( static_cast<SCH_PIN*>( driver )->GetName() == test_name ) if( static_cast<SCH_PIN*>( driver )->GetName() == test_name )
@ -1188,8 +1192,7 @@ void CONNECTION_GRAPH::buildConnectionGraph()
{ {
wxASSERT( driver->Type() == SCH_LABEL_T || wxASSERT( driver->Type() == SCH_LABEL_T ||
driver->Type() == SCH_GLOBAL_LABEL_T || driver->Type() == SCH_GLOBAL_LABEL_T ||
driver->Type() == SCH_HIER_LABEL_T || driver->Type() == SCH_HIER_LABEL_T );
driver->Type() == SCH_SHEET_PIN_T );
auto text = static_cast<SCH_TEXT*>( driver ); auto text = static_cast<SCH_TEXT*>( driver );