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

Restore subgraph removal behavior 

Commit 938645b29d had lines commented out
for debugging purposes.  This commit restores the original lines

Fixes https://gitlab.com/kicad/code/kicad/issues/12165

Fixes https://gitlab.com/kicad/code/kicad/issues/12814
This commit is contained in:
Seth Hillbrand 2022-11-22 04:49:49 -08:00
parent 3b48f88bec
commit 6625afabb7
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
eeschema/connection_graph.cpp
View File

@ -1133,7 +1133,7 @@ void CONNECTION_GRAPH::processSubGraphs()
wxLogTrace( ConnTrace, "%ld (%s) is weakly driven and not unique. Changing to %s.",
subgraph->m_code, name, new_name );
// alg::delete_matching( *vec, subgraph );
alg::delete_matching( *vec, subgraph );
m_net_name_to_subgraphs_map[new_name].emplace_back( subgraph );
@ -2200,16 +2200,16 @@ SCH_CONNECTION* CONNECTION_GRAPH::matchBusMember( SCH_CONNECTION* aBusConnection
void CONNECTION_GRAPH::recacheSubgraphName( CONNECTION_SUBGRAPH* aSubgraph,
const wxString& aOldName )
{
// auto it = m_net_name_to_subgraphs_map.find( aOldName );
//
// if( it != m_net_name_to_subgraphs_map.end() )
// {
// std::vector<CONNECTION_SUBGRAPH*>& vec = it->second;
// alg::delete_matching( vec, aSubgraph );
// }
//
// wxLogTrace( ConnTrace, "recacheSubgraphName: %s => %s", aOldName,
// aSubgraph->m_driver_connection->Name() );
auto it = m_net_name_to_subgraphs_map.find( aOldName );
if( it != m_net_name_to_subgraphs_map.end() )
{
std::vector<CONNECTION_SUBGRAPH*>& vec = it->second;
alg::delete_matching( vec, aSubgraph );
}
wxLogTrace( ConnTrace, "recacheSubgraphName: %s => %s", aOldName,
aSubgraph->m_driver_connection->Name() );
m_net_name_to_subgraphs_map[aSubgraph->m_driver_connection->Name()].push_back( aSubgraph );
}