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

Fix a few issues with bus member propagation to subsheets 

Fixes #3728
This commit is contained in:
Jon Evans 2020-01-04 10:38:43 -05:00
parent 5707e6eac8
commit 856decc29b
2 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
eeschema/connection_graph.cpp
View File

@ -273,6 +273,8 @@ void CONNECTION_SUBGRAPH::Absorb( CONNECTION_SUBGRAPH* aOther )
m_bus_neighbors.insert( aOther->m_bus_neighbors.begin(), aOther->m_bus_neighbors.end() ); m_bus_neighbors.insert( aOther->m_bus_neighbors.begin(), aOther->m_bus_neighbors.end() );
m_bus_parents.insert( aOther->m_bus_parents.begin(), aOther->m_bus_parents.end() ); m_bus_parents.insert( aOther->m_bus_parents.begin(), aOther->m_bus_parents.end() );
m_multiple_drivers |= aOther->m_multiple_drivers;
aOther->m_absorbed = true; aOther->m_absorbed = true;
aOther->m_dirty = false; aOther->m_dirty = false;
aOther->m_driver = nullptr; aOther->m_driver = nullptr;
@ -1079,7 +1081,7 @@ void CONNECTION_GRAPH::buildConnectionGraph()
// This is a list of connections on the current subgraph to compare to the // This is a list of connections on the current subgraph to compare to the
// drivers of each candidate subgraph. If the current subgraph is a bus, // drivers of each candidate subgraph. If the current subgraph is a bus,
// we should consider each bus member. // we should consider each bus member.
auto connections_to_check( connection->Members() ); std::vector< std::shared_ptr<SCH_CONNECTION> > connections_to_check;
// Also check the main driving connection // Also check the main driving connection
connections_to_check.push_back( std::make_shared<SCH_CONNECTION>( *connection ) ); connections_to_check.push_back( std::make_shared<SCH_CONNECTION>( *connection ) );
@ -1219,7 +1221,7 @@ void CONNECTION_GRAPH::buildConnectionGraph()
{ {
if( connection->IsBus() && candidate->m_driver_connection->IsNet() ) if( connection->IsBus() && candidate->m_driver_connection->IsNet() )
{ {
wxLogTrace( "CONN", "%lu (%s) has neighbor %lu (%s)", subgraph->m_code, wxLogTrace( "CONN", "%lu (%s) has bus child %lu (%s)", subgraph->m_code,
connection->Name(), candidate->m_code, member->Name() ); connection->Name(), candidate->m_code, member->Name() );
subgraph->m_bus_neighbors[member].insert( candidate ); subgraph->m_bus_neighbors[member].insert( candidate );
@ -1231,11 +1233,11 @@ void CONNECTION_GRAPH::buildConnectionGraph()
subgraph->m_code, connection->Name(), subgraph->m_code, connection->Name(),
candidate->m_code, candidate->m_driver_connection->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 );
} }
} }
} }
@ -1347,6 +1349,8 @@ void CONNECTION_GRAPH::buildConnectionGraph()
SCH_CONNECTION* conn = subgraph->m_driver_connection; SCH_CONNECTION* conn = subgraph->m_driver_connection;
wxLogTrace( "CONN", "%lu (%s) has multiple bus parents", subgraph->m_code, conn->Name() );
wxASSERT( conn->IsNet() ); wxASSERT( conn->IsNet() );
for( const auto& it : subgraph->m_bus_parents ) for( const auto& it : subgraph->m_bus_parents )
@ -1566,22 +1570,26 @@ void CONNECTION_GRAPH::propagateToNeighbors( CONNECTION_SUBGRAPH* aSubgraph )
if( neighbor_name == member->Name() ) if( neighbor_name == member->Name() )
continue; continue;
// Don't override if the priority is higher than a local label anyway wxLogTrace( "CONN", "%lu (%s) connected to bus member %s (local %s)",
neighbor->m_code, neighbor_name, member->Name(), member->LocalName() );
// Take whichever name is higher priority
if( CONNECTION_SUBGRAPH::GetDriverPriority( neighbor->m_driver ) if( CONNECTION_SUBGRAPH::GetDriverPriority( neighbor->m_driver )
>= CONNECTION_SUBGRAPH::PRIORITY::POWER_PIN ) >= CONNECTION_SUBGRAPH::PRIORITY::POWER_PIN )
continue; {
member->Clone( *neighbor_conn );
}
else
{
neighbor_conn->Clone( *member );
neighbor->UpdateItemConnections();
wxLogTrace( "CONN", "%lu (%s) connected to bus member %s", neighbor->m_code, recacheSubgraphName( neighbor, neighbor_name );
neighbor_name, member->Name() );
neighbor_conn->Clone( *member ); // Recurse onto this neighbor in case it needs to re-propagate
neighbor->UpdateItemConnections(); neighbor->m_dirty = true;
propagateToNeighbors( neighbor );
recacheSubgraphName( neighbor, neighbor_name ); }
// Recurse onto this neighbor in case it needs to re-propagate
neighbor->m_dirty = true;
propagateToNeighbors( neighbor );
} }
} }
}; };
@ -1706,14 +1714,14 @@ SCH_CONNECTION* CONNECTION_GRAPH::matchBusMember(
{ {
for( const auto& bus_member : c->Members() ) for( const auto& bus_member : c->Members() )
{ {
if( bus_member->RawName() == aSearch->RawName() ) if( bus_member->LocalName() == aSearch->RawName() )
{ {
match = bus_member.get(); match = bus_member.get();
break; break;
} }
} }
} }
else if( c->RawName() == aSearch->RawName() ) else if( c->LocalName() == aSearch->RawName() )
{ {
match = c.get(); match = c.get();
break; break;

2
eeschema/sch_connection.cpp
View File

@ -214,7 +214,7 @@ void SCH_CONNECTION::Clone( SCH_CONNECTION& aOther )
m_bus_code = aOther.BusCode(); m_bus_code = aOther.BusCode();
m_vector_start = aOther.VectorStart(); m_vector_start = aOther.VectorStart();
m_vector_end = aOther.VectorEnd(); m_vector_end = aOther.VectorEnd();
m_vector_index = aOther.VectorIndex(); // Note: m_vector_index is not cloned
m_vector_prefix = aOther.VectorPrefix(); m_vector_prefix = aOther.VectorPrefix();
// Note: subgraph code isn't cloned, it should remain with the original object // Note: subgraph code isn't cloned, it should remain with the original object