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

Remove defunct junction code that left some isolated 

Fixes: lp:1828716
* https://bugs.launchpad.net/kicad/+bug/1828716
This commit is contained in:
Jon Evans 2019-05-23 22:58:38 -04:00
parent 8c89847627
commit 4e6c9ac7b1
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
eeschema/connection_graph.cpp
View File

@ -524,20 +524,11 @@ void CONNECTION_GRAPH::updateItemConnectivity( SCH_SHEET_PATH aSheet,
for( const auto& it : connection_map ) for( const auto& it : connection_map )
{ {
auto connection_vec = it.second; auto connection_vec = it.second;
SCH_ITEM* junction = nullptr;
for( auto primary_it = connection_vec.begin(); primary_it != connection_vec.end(); primary_it++ ) for( auto primary_it = connection_vec.begin(); primary_it != connection_vec.end(); primary_it++ )
{ {
auto connected_item = *primary_it; auto connected_item = *primary_it;
// Look for junctions. For points that have a junction, we want all
// items to connect to the junction but not to each other.
if( connected_item->Type() == SCH_JUNCTION_T )
{
junction = connected_item;
}
// Bus entries are special: they can have connection points in the // Bus entries are special: they can have connection points in the
// middle of a wire segment, because the junction algo doesn't split // middle of a wire segment, because the junction algo doesn't split
// the segment in two where you place a bus entry. This means that // the segment in two where you place a bus entry. This means that
@ -590,13 +581,7 @@ void CONNECTION_GRAPH::updateItemConnectivity( SCH_SHEET_PATH aSheet,
{ {
auto test_item = *test_it; auto test_item = *test_it;
if( !junction && test_item->Type() == SCH_JUNCTION_T )
{
junction = test_item;
}
if( connected_item != test_item && if( connected_item != test_item &&
connected_item != junction &&
connected_item->ConnectionPropagatesTo( test_item ) && connected_item->ConnectionPropagatesTo( test_item ) &&
test_item->ConnectionPropagatesTo( connected_item ) ) test_item->ConnectionPropagatesTo( connected_item ) )
{ {